From 00b2eadf8e6941a844d974d5f3e43d060318952f Mon Sep 17 00:00:00 2001 From: Manuel Hiebel Date: Wed, 23 Apr 2014 20:48:28 +0000 Subject: sync nav (faster slidedown/css minify/translation workaround) --- _nav/css/all.css | 1 + _nav/css/index.php | 2 +- _nav/html/index.php | 9 +++++---- _nav/js/source.js | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 _nav/css/all.css diff --git a/_nav/css/all.css b/_nav/css/all.css new file mode 100644 index 000000000..c2e5d175d --- /dev/null +++ b/_nav/css/all.css @@ -0,0 +1 @@ +/* mageia.org nav CSS */h1,h2,h3{font-family:"Century Gothic","Trebuchet MS",Arial,sans-serif;font-weight:normal;color:#3494d3}h2 a,h3 a{color:#3494d3;text-decoration:none}#hmgn{margin:0;padding:0}#mgnav{margin:0;padding:0;padding-bottom:4px;background:#2383c2;background:-webkit-linear-gradient(top,#3494d3 0,#2383c2 50%);background:-moz-linear-gradient(top,#3494d3 0,#2383c2 50%);background:-o-linear-gradient(top,#3494d3 0,#2383c2 50%);background:linear-gradient(top,#3494d3 0,#2383c2 50%);font:normal 13px/1.3em "Trebuchet MS","Lucida Grande","Lucida Sans",Verdana,Tahoma,Arial,sans-serif}#nav{margin:0;padding:0;display:table}#nav li{display:table-cell;padding:0;border-right:1px solid #f0f0f0}#nav li:last-child{border:none}#nav a{display:block;height:64px;padding:0 1.4em;text-decoration:none;text-align:center;line-height:75px;min-width:2.5em;color:#444;background:#fff;cursor:pointer}#nav a:hover{color:#2383c2}#nav a.mageia{width:143px;background:#fff url(//nav.mageia.org/css/mageia-logo-nav-3.png) no-repeat 26px 12px;color:transparent;text-shadow:none}.about #mgnav .about,.downloads #mgnav .downloads,.community #mgnav .community,.blog #mgnav .community,.section-index #mgnav .community,.mediawiki #mgnav .wiki,.support #mgnav .support,.contribute #mgnav .contribute,.donate #mgnav .donate,.bugs-mageia-org #mgnav .contribute,.contrib #mgnav .contrib,.you #mgnav .you,.contact #mgnav .contact,.doc #mgnav .doc{font-weight:bold;background:transparent;color:white;text-shadow:0 0 3px #222;border-top:0}h1,h2,h3{font-family:"Century Gothic","Trebuchet MS",Arial,sans-serif;font-weight:normal;color:#3494d3}h2 a,h3 a{color:#3494d3;text-decoration:none}#mgnavtitle,#mgnavt{font-size:24px;margin:0;padding:.5em 1em .8em 30px;color:#fff;text-shadow:0 0 3px #222;background:#2383c2;background:-webkit-linear-gradient(top,#2383c2 0,#1272b1 50%);background:-moz-linear-gradient(top,#2383c2 0,#1272b1 50%);background:-o-linear-gradient(top,#2383c2 0,#1272b1 50%);background:linear-gradient(top,#2383c2 0,#1272b1 50%)}#mgnavt a{color:#fff}header#mgnavt{text-align:left}#mgnavt h1{font-size:24px;color:#fff;margin:0;padding:0;display:inline}#mgnavt ul{font-size:12px;margin:0 0 0 4em;padding:0;display:inline}#mgnavt ul li{display:inline;margin:0 1em;padding:0}#mgnavt ul li a{display:inline-block;text-decoration:none} diff --git a/_nav/css/index.php b/_nav/css/index.php index 36cbc34bd..66604b202 100644 --- a/_nav/css/index.php +++ b/_nav/css/index.php @@ -19,4 +19,4 @@ header('Content-Type: text/css;charset=utf-8'); header(sprintf('Expires: %s', gmdate('r', strtotime('+1 day')))); -echo str_replace('nav.mageia.org', $_SERVER['HTTP_HOST'], file_get_contents('source.css')); +echo str_replace('nav.mageia.org', $_SERVER['HTTP_HOST'], file_get_contents('all.css')); diff --git a/_nav/html/index.php b/_nav/html/index.php index 0450a94c3..8c8ac690c 100644 --- a/_nav/html/index.php +++ b/_nav/html/index.php @@ -27,9 +27,10 @@ $url = isset($_GET['u']) ? trim($_GET['u']) : null; /** html[lang] of the doc. */ $lang = isset($_GET['l']) ? trim($_GET['l']) : null; if ($lang == 'undefined' || - $lang == '') { - - $lang = 'en'; + $lang == '' || + $lang == 'en') { +$lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); +// $lang = 'en'; } /** body[class] of the doc. */ @@ -51,4 +52,4 @@ header(sprintf('Expires: %s', gmdate('r', strtotime('+1 day')))); echo _mgnav_html($wrap, $lang, null, $www_host, NCache::build($cache_path)); -apache_note('navMakeTime', number_format(microtime() - $t0, 6)); \ No newline at end of file +apache_note('navMakeTime', number_format(microtime() - $t0, 6)); diff --git a/_nav/js/source.js b/_nav/js/source.js index 66b4d9f5e..2ffaebb92 100644 --- a/_nav/js/source.js +++ b/_nav/js/source.js @@ -26,6 +26,6 @@ f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3 $("#hmgn") .load("//nav.mageia.org/html/?" + $.param(params)) - .delay(10) - .slideDown(); -})(); \ No newline at end of file + .delay(1) + .slideDown(1); +})(); -- cgit v1.2.1