diff options
| author | Sven Gothel <[email protected]> | 2019-04-22 03:26:32 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-22 03:26:32 +0200 |
| commit | 70ae5ce1b3795edb2f3c6503dcf543a02463727c (patch) | |
| tree | 4bcad85572857189ab2bad45a3b81afe28fa87ef | |
| parent | dabf9596b3318d32bee9f65764cecd6e78dfc7ce (diff) | |
Remove awstat tracker; Fix Featured links (sidebar); Adding style-alt1
| -rw-r--r-- | index.html | 24 | ||||
| -rwxr-xr-x | js/awstats_misc_tracker.js | 161 | ||||
| -rw-r--r-- | style-alt1.css | 5 | ||||
| -rwxr-xr-x | style.css | 60 |
4 files changed, 38 insertions, 212 deletions
@@ -3,9 +3,9 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta content="java, gluegen, jogl, jocl, joal, opengl, opencl, openal, libraries" name="keywords"/> - <meta name="google-site-verification" content="TBm-1bOphAWp2QP205lF0UZCp86gIjQyQOi4Jg7Sb2U" /> <title>JogAmp.org - Java graphics, audio, media and processing libraries exposing OpenGL, OpenCL, OpenAL and OpenMAX</title> <link href="style.css" rel="stylesheet" type="text/css"/> + <link href="/style-alt1.css" rel="alternate stylesheet" title="default sans-serif font" type="text/css"/> <link href="SocialCoding/logo_symbol_finals/website_final_blue_favicon_symbol_16x16pel.ico" rel="shortcut icon"/> </head> @@ -14,7 +14,7 @@ <!-- header --> <div id="header"> <div id="slogan"><img src="images/jogamp_symbols/website_final_sideslogan_jogamp_404x20pel.png" alt="graphics, audio, media and processing libraries"/></div> - <div id="logo"><img src="images/jogamp_symbols/website_final_blue_jogamp_346x70pel.png" alt="JogAmp symbol"/></div> + <div id="logo"><a href="/"><img src="images/jogamp_symbols/website_final_blue_jogamp_346x70pel.png" alt="JogAmp symbol"/></a></div> </div> <div id="menu"> @@ -61,23 +61,23 @@ <h3>Featured</h3> <ul> <li> - <a href="http://www.cctintl.com/solutions/c3d-bim-project-control"> - <img src="jogl/www/media/C3D_Main-160x125.png" width="160" height="125" align="left" alt="C3D"/> + <a href="http://www.cctintl.com/solutions/c3d-bim-project-control" style="padding: 4px 8px"> + <img src="jogl/www/media/C3D_Main-160x125.png" border="0" vspace="0" width="130" alt="C3D"/> </a> </li> <!-- li> <a href="http://projects.hepforge.org/frog/"> - <img src="jogl/www/media/Frog-Craft3_2.160w.png" width="160" height="120" align="left" alt="FROG"/> + <img src="jogl/www/media/Frog-Craft3_2.160w.png" border="0" vspace="0" width="130" alt="FROG"/> </a> </li --> <li> - <a href="http://www3.math.tu-berlin.de/jreality/index.php?article_id=1"> - <img src="jogl/www/media/jreality-logo-discreteksurfaces.png" width="160" height="105" align="left" alt="jReality"/> + <a href="http://www3.math.tu-berlin.de/jreality/index.php?article_id=1" style="padding: 4px"> + <img src="jogl/www/media/jreality-logo-discreteksurfaces.png" border="0" vspace="0" width="130" alt="jReality"/> </a> </li> <li> - <a href="http://processing.org/"> - <img src="jogl/www/media/processing.jpg" width="160" height="158" align="left" alt="Processing"/> + <a href="http://processing.org/" style="padding: 4px"> + <img src="jogl/www/media/processing.jpg" border="0" vspace="0" width="130" alt="Processing"/> </a> </li> </ul> @@ -203,11 +203,5 @@ </div> </div> </div> - - <script type="text/javascript" src="/js/awstats_misc_tracker.js" /> - <noscript> - <img src="/js/awstats_misc_tracker.js?nojs=y" height="0" width="0" border="0" style="display: none" alt=""/> - </noscript> - </body> </html> diff --git a/js/awstats_misc_tracker.js b/js/awstats_misc_tracker.js deleted file mode 100755 index 0ffd5b3..0000000 --- a/js/awstats_misc_tracker.js +++ /dev/null @@ -1,161 +0,0 @@ -// awstats_misc_tracker.js -//------------------------------------------------------------------- -// You can add this file onto some of your web pages (main home page can -// be enough) by adding the following HTML code to your page body: -// -// <script type="text/javascript" src="/js/awstats_misc_tracker.js"></script> -// <noscript><p><img src="/js/awstats_misc_tracker.js?nojs=y" alt="" height="0" width="0" style="display: none" /></p></noscript> - -// -// * This must be added after the <body> tag, not placed within the -// <head> tags, or the resulting tracking <img> tag will not be handled -// correctly by all browsers. Internet explorer will also not report -// screen height and width attributes until it begins to render the -// body. -// -// This allows AWStats to be enhanced with some miscellanous features: -// - Screen size detection (TRKscreen) -// - Browser size detection (TRKwinsize) -// - Screen color depth detection (TRKcdi) -// - Java enabled detection (TRKjava) -// - Macromedia Director plugin detection (TRKshk) -// - Macromedia Shockwave plugin detection (TRKfla) -// - Realplayer G2 plugin detection (TRKrp) -// - QuickTime plugin detection (TRKmov) -// - Mediaplayer plugin detection (TRKwma) -// - Acrobat PDF plugin detection (TRKpdf) -//------------------------------------------------------------------- - -// If you use pslogger.php to generate your log, you can change this line with -// var awstatsmisctrackerurl="pslogger.php?loc=/js/awstats_misc_tracker.js"; -var awstatsmisctrackerurl="/js/awstats_misc_tracker.js"; - -var TRKresult; -var TRKscreen, TRKwinsize, TRKcdi, TRKjava, TRKshk, TRKsvg, TRKfla; -var TRKrp, TRKmov, TRKwma, TRKpdf, TRKpdfver, TRKuserid, TRKsessionid; -var TRKnow, TRKbegin, TRKend; -var TRKnse, TRKn; - -function awstats_setCookie(TRKNameOfCookie, TRKvalue, TRKexpirehours) { - TRKExpireDate = new Date (); - TRKExpireDate.setTime(TRKExpireDate.getTime() + (TRKexpirehours * 3600 * 1000)); - document.cookie = TRKNameOfCookie + "=" + escape(TRKvalue) + "; path=/" + ((TRKexpirehours == null) ? "" : "; expires=" + TRKExpireDate.toGMTString()); -} - -//function awstats_runvbscript() { -// TRKresult = false; -// p=false; -// document.write('<SCRIPT LANGUAGE="VBScript">\non error resume next \n p = IsObject(CreateObject("PDF.PdfCtrl.5")) \n if (p) then \n msgbox("5") \n return true \n end if</SCRIPT>\n'); -// alert(p); -// if (TRKresult) return 'y'; -// else return 'n'; -//} - -function awstats_detectIE(TRKClassID) { - TRKresult = false; // !!! Adding var in front of TRKresult break detection !!! - document.write('<SCR' + 'IPT LANGUAGE="VBScript">\n on error resume next \n TRKresult = IsObject(CreateObject("' + TRKClassID + '")) \n </SCR' + 'IPT>\n'); - if (TRKresult) return 'y'; - else return 'n'; -} - -function awstats_detectNS(TRKClassID) { - TRKn = "n"; - if (TRKnse.indexOf(TRKClassID) != -1) if (navigator.mimeTypes[TRKClassID].enabledPlugin != null) TRKn = "y"; - return TRKn; -} - -function awstats_getCookie(TRKNameOfCookie){ - if (document.cookie.length > 0){ - TRKbegin = document.cookie.indexOf(TRKNameOfCookie+"="); - if (TRKbegin != -1) { - TRKbegin += TRKNameOfCookie.length+1; - TRKend = document.cookie.indexOf(";", TRKbegin); - if (TRKend == -1) TRKend = document.cookie.length; - return unescape(document.cookie.substring(TRKbegin, TRKend)); - } - return null; - } - return null; -} - -if (window.location.search == "" || window.location.search == "?") { - // If no query string - TRKnow = new Date(); - TRKscreen=screen.width+"x"+screen.height; - if (navigator.appName != "Netscape") { TRKcdi=screen.colorDepth; } - else {TRKcdi=screen.pixelDepth}; - TRKjava=navigator.javaEnabled(); - TRKuserid=awstats_getCookie("AWSUSER_ID"); - TRKsessionid=awstats_getCookie("AWSSESSION_ID"); - var TRKrandomnumber=Math.floor(Math.random()*10000); - if (TRKuserid == null || (TRKuserid=="")) { TRKuserid = "awsuser_id" + TRKnow.getTime() +"r"+ TRKrandomnumber; } - if (TRKsessionid == null || (TRKsessionid=="")) { TRKsessionid = "awssession_id" + TRKnow.getTime() +"r"+ TRKrandomnumber; } - awstats_setCookie("AWSUSER_ID", TRKuserid, 10000); - awstats_setCookie("AWSSESSION_ID", TRKsessionid, 1); - TRKuserid=""; TRKuserid=awstats_getCookie("AWSUSER_ID"); - TRKsessionid=""; TRKsessionid=awstats_getCookie("AWSSESSION_ID"); - - var TRKnav=navigator.appName.toLowerCase(); // "internet explorer" or "netscape" - var TRKagt=navigator.userAgent.toLowerCase(); // "msie...", "mozilla...", "firefox..." - //alert(TRKnav); alert(TRKagt); - - var TRKwin = ((TRKagt.indexOf("win")!=-1) || (TRKagt.indexOf("32bit")!=-1)); - var TRKmac = (TRKagt.indexOf("mac")!=-1); - - var TRKns = (TRKnav.indexOf("netscape") != -1); - var TRKopera= (TRKnav.indexOf("opera") != -1); - var TRKie = (TRKagt.indexOf("msie") != -1); - - // Detect the browser internal width and height - var TRKwinsize; - if (document.documentElement && document.documentElement.clientWidth) - TRKwinsize = document.documentElement.clientWidth + 'x' + document.documentElement.clientHeight; - else if (document.body && document.body.clientWidth) - TRKwinsize = document.body.clientWidth + 'x' + document.body.clientHeight; - else - TRKwinsize = window.innerWidth + 'x' + window.innerHeight; - - if (TRKie && TRKwin) { - TRKshk = awstats_detectIE("SWCtl.SWCtl.1"); - TRKsvg = awstats_detectIE("Adobe.SVGCtl"); - TRKfla = awstats_detectIE("ShockwaveFlash.ShockwaveFlash.1"); - TRKrp = awstats_detectIE("rmocx.RealPlayer G2 Control.1"); - TRKmov = awstats_detectIE("Quicktime.Quicktime"); - TRKwma = awstats_detectIE("wmplayer.ocx"); - TRKpdf = 'n'; TRKpdfver=''; - if (awstats_detectIE("PDF.PdfCtrl.1") == 'y') { TRKpdf = 'y'; TRKpdfver='4'; } // Acrobat 4 - if (awstats_detectIE('PDF.PdfCtrl.5') == 'y') { TRKpdf = 'y'; TRKpdfver='5'; } // Acrobat 5 - if (awstats_detectIE('PDF.PdfCtrl.6') == 'y') { TRKpdf = 'y'; TRKpdfver='6'; } // Acrobat 6 - if (awstats_detectIE('AcroPDF.PDF.1') == 'y') { TRKpdf = 'y'; TRKpdfver='7'; } // Acrobat 7 - } - if (TRKns || !TRKwin) { - TRKnse = ""; - for (var TRKi=0;TRKi<navigator.mimeTypes.length;TRKi++) TRKnse += navigator.mimeTypes[TRKi].type.toLowerCase(); - TRKshk = awstats_detectNS("application/x-director",""); - TRKsvg = awstats_detectNS("image/svg+xml",""); - if (document.implementation.hasFeature("org.w3c.dom.svg", "")) {TRKsvg = "y"; } - TRKfla = awstats_detectNS("application/x-shockwave-flash"); // ou lire dans naviagtor.plugins si on trouve "Shockwave Flash" ou "Shockwav Flash 2.0" - TRKrp = awstats_detectNS("audio/x-pn-realaudio-plugin"); - TRKmov = awstats_detectNS("video/quicktime"); - TRKwma = awstats_detectNS("application/x-mplayer2"); - TRKpdf = awstats_detectNS("application/pdf"); - TRKpdfver=''; - } - - var imgsrc1 = awstatsmisctrackerurl+'?screen='+TRKscreen+'&win='+TRKwinsize+'&cdi='+TRKcdi+'&java='+TRKjava; - var imgsrc2 = '&shk='+TRKshk+'&svg='+TRKsvg+'&fla='+TRKfla+'&rp='+TRKrp+'&mov='+TRKmov+'&wma='+TRKwma+'&pdf='+TRKpdf+'&uid='+TRKuserid+'&sid='+TRKsessionid; - //alert(imgsrc1); - //alert(imgsrc2); - var imgsrc=imgsrc1+imgsrc2; - if( document.createElementNS ) { - var l=document.createElementNS("http://www.w3.org/1999/xhtml","img"); - l.setAttribute("src", imgsrc ); - l.setAttribute("height", "0"); - l.setAttribute("width", "0"); - l.setAttribute("border", "0"); - document.getElementsByTagName("body")[0].appendChild(l); - } else { - document.write('<img style="display:none;" src="'+ imgsrc +'" height="0" width="0" border="0" />') - } - -} diff --git a/style-alt1.css b/style-alt1.css new file mode 100644 index 0000000..a614e8b --- /dev/null +++ b/style-alt1.css @@ -0,0 +1,5 @@ +@import url("/style.css"); + +body {padding:0; margin:0; color:#111111; background: #ffffff; font-family: sans-serif; font-weight:normal; font-style:normal; font-size:15px; line-height:1.4;} + + @@ -39,6 +39,11 @@ * Note: 14px = 0.875em = 10.5pt = 3.6898mm = 0.1453inch (1 point = 1pt = 1/72in (cala) = 0.3528 mm) * Note: 16px (1em) is browser/css default. * Note: Wiki also uses 14px (0.875em) + * + * Header Top Margin: 8px + * Header + Text Left Margin: 24px + * Subsequent blocks have zero or collapsable top and left margins, maintaining layout alignment. + * Menu may use whole page width. */ @import url("/style-fonts.css"); @@ -47,22 +52,15 @@ body {padding:0; margin:0; color:#111111; background: #ffffff; font-family: "Luc a {color:#111111; border-style:none; padding: 2px; text-decoration: underline; text-decoration-style: dotted} a:hover {color:#000000; background-color: #c9e2ff; border-radius: 5px 10px; padding: 2px; } -#container {padding:0; margin: 0; color:#111111; background: #ffffff; min-width:350px;} +#container {padding:0; margin:0; color:#111111; background: #ffffff; min-width:350px;} #container img { border-style:none; margin:0; padding:0; } -/** allow slogan within header to overpaint the logo (abs position 80 - 18 = 62) -#header {height:90px; min-width:800px; display:block; } -#logo { height:80px; font-size:40px; padding:16px 0 0 16px; display:inline-block;} -#logo a { text-decoration:none; } -#logo img { margin: -10px 0 0 5px; border-style:none; } -#slogan {float:right; font-size:18px; color:#444444; padding:0 8px 0 0; position: absolute; top:62px; right:0; display:inline-block; } -*/ /** Allow slogan to be invisible to the right space via min-width:560px */ -#header {height:90px; min-width:560px; display:block; } -#logo { height:80px; font-size:40px; padding:16px 0 0 16px; display:inline-block;} -#logo a { text-decoration:none; } -#logo img { margin: -10px 0 0 5px; border-style:none; } -#slogan {float:right; font-size:18px; color:#444444; padding:62px 8px 0 0; right:0; display:inline-block; } +#header {margin:8px 0 0 24px; min-width:560px; display:block; } +#logo { height:80px; font-size:40px; display:inline-block; padding:0} +#logo a { text-decoration:none; padding:0; display:block; } +#logo img { padding: 0; margin: 0; border-style:none; } +#slogan {float:right; font-size:18px; color:#444444; margin: 55px 8px 0 0; right:0; display:inline-block; } /*webside theme colors*/ #menu {background-color:#c9e2ff; background-image: linear-gradient(#f5f5f5, #c9e2ff, #f5f5f5);} @@ -76,54 +74,44 @@ a:hover {color:#000000; background-color: #c9e2ff; border-radius: 5px 10px; padd #menu li {list-style:none; float:left;} #menu a {float:left; height:20px; padding:10px 20px; font-size:15px; font-weight:bold; text-decoration:none;} -#main {float:left; width:100%; height:100%; margin:0;} +#main {float:left; width:100%; height:100%; padding:0; margin:0;} #main br {line-height:8px;} .rss {background:url(images/feed-icon-10x10.png) no-repeat scroll 2px 50% !important; padding:0px 0px 0px 15px;} .fill {margin-right:0 !important;} .centered {margin-left: auto; margin-right: auto; text-align: center;} -.clear {clear: both; padding: 16px 0 0 0} -.clearcentered {clear: both; padding: 16px 0 0 0; margin-left: auto; margin-right: auto; text-align: center;} +.clear {clear: both; margin: 16px 0 0 0} +.clearcentered {clear: both; margin: 16px auto 0 auto; text-align: center;} .codetight {float: left; font-family: monospace; font-size:12px; line-height:normal; text-align: left; display: block; white-space: pre;} .code {float: left; font-family: monospace; font-size:13px; line-height:normal; text-align: left; display: block; white-space: pre;} -.column {float: left; padding: 0 16px 16px 8px; } +.column {float: left; margin: 0 24px 16px 0; } .splash {margin-left: auto; margin-right: auto; font-size:22px; } -#sidebar {font-size:13px; width:150px; height: auto; float: right; text-align: center; margin:16px 16px 16px 16px; padding: 0; } +#sidebar {font-size:13px; width:150px; height: auto; float: right; text-align: center; margin:16px 16px 16px 16px; } #sidebar h3 {font-size:13px; font-weight:bold; font-style:italic; margin:13px 0 5px 0;} #sidebar ul {margin:0; padding:0;} #sidebar li {list-style:none; padding:1px 0; margin:8px 0;} #sidebar li a {text-decoration:none; display:block; border: 1px dotted #3b4d4f; border-radius: 8px 18px; } -#text {margin-right:225px; padding:10px 25px 25px 25px; min-width:350px; } +#text {padding:0; margin:14px 210px 24px 24px; min-width:350px; } #text img { padding: 5px; } #text h1 {font-size:20px; font-weight:normal; margin:18px 0 10px 0;} #text h2 {font-size:18px; font-weight:normal; margin:16px 0 10px 0;} #text h3 {font-size:16px; font-weight:normal; margin:14px 0 10px 0;} #text h4 {font-size:14px; font-weight:bold; margin:14px 0 10px 0;} -#text ul { padding: 0.3em 0em 0.3em 1em; } -#text ul li { background:url(images/bullet.gif) 0em 0.3em no-repeat; padding-left: 0.8em; list-style: none; } +#text ul { padding: 0; margin: 8px 0 8px 8px; } +#text ul li { background:url(images/bullet.gif) 0em 0.3em no-repeat; padding-left: 10px; list-style: none; } #text ul li { background-image:url(images/bullet_child.gif); } -#text ul li { margin-bottom:0.5em; } -#text ol { padding: 0.3em 0em 0.3em 1em; } +#text ul li { margin-bottom: 7px; } +#text ol { padding: 0; margin: 8px 0 8px 8px; } #text ol li { list-style:decimal; background-image:none; padding-left:0em; } -#text ol li { margin-bottom:0.5em; } - -/** -#text ol, #text ul {padding:0; margin:8px 0;} -#text ul {padding: 0 1em; margin:8px 0;} -#text li {margin-left:1em;} -#text li {margin-left:1em;} -#text ol {padding:0; margin:8px 0;} -#text ul {padding: 0.3em 0em; } -*/ +#text ol li { margin-bottom: 7px; } #footer {height:40px; font-size:10px; clear:both;} -#footer_left {float:left; padding: 4px 0 0 5px;} +#footer_left {float:left; margin: 4px 0 0 5px;} #footer_left img {float: left; margin-right: 5px;} - -#footer_right {float:right; padding:14px 30px 0 0;} +#footer_right {float:right; margin:14px 30px 0 0;} td.streams_text { text-align: left; vertical-align: middle; } td.streams_thumbs { width:400px; } |