htdocs: standard xhtml/css

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1087 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
10 years ago · a275e3eeff
6 changed files with 20 additions and 24 deletions
--- a/htdocs/cacher/cacher.css
+++ b/htdocs/cacher/cacher.css
@ -11,6 +11,7 @@ td, th { white-space: pre; }

 .hitsgraph { margin: auto; }
 .hitsgraph a { display: block; float: left; border: 0 solid gray; }
+.hitsgraph a { width: 2px; height: 20px; border-top-width: 1px; border-bottom-width: 1px; } /* update this along with index.php */
 .hitsgraph a * { display: block; }
 .hitsgraph a.active { border-top-color: yellow; }
 .hitsgraph a:hover { background: gray; }
--- a/htdocs/cacher/index.php
+++ b/htdocs/cacher/index.php
@ -111,14 +111,6 @@ function get_cache_hits_graph($ci, $key) // {{{
 	$t = (time() / (60 * 60)) % 24;

 	$html = array();
-	static $cssOut = false;
-	if (!$cssOut) {
-		$cssOut = true;
-		$html[] = '<style type="text/css">';
-		$html[] = '.hitsgraph a { width: 2px; height: 20px; border-top-width: 1px; border-bottom-width: 1px; }';
-		$html[] = '</style>';
-	}
-
 	$width = count($ci[$key]) * 2;
 	$html[] = '<div class="hitsgraph" style="width: ' . $width . 'px">';
 	foreach ($ci[$key] as $i => $v) {
--- a/htdocs/common/common.css
+++ b/htdocs/common/common.css
@ -36,9 +36,8 @@ h1, h2, h3, h4, h5, h6 {
 	margin-bottom: 2px;
 }
 #header #banner {
-	font: 32px/51px serif;
+	font: 32px/51px "arial", serif;
 	color: white;
-	font-family: "arial", serif;
 }
 #header #banner a {
 	color: white;
--- a/htdocs/common/common.php
+++ b/htdocs/common/common.php
@ -51,7 +51,7 @@ function mainnav()
 				"http://www.php.net/" => "PHP",
 				"http://www.lighttpd.net/" => "Lighttpd",
 				) as $url => $title) {
-		$html[] = sprintf('<a href="%s" target="_blank">%s</a>', $url, $title);
+		$html[] = sprintf('<a href="%s" rel="external">%s</a>', $url, $title);
 	}
 	return implode('|', $html);
 }
@ -118,20 +118,24 @@ function get_language_file($name)
 			$file = get_language_file_ex($name, $lang);
 		}
 	}
-	else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-		foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $lang) {
-			$lang = strtok($lang, ':;');
-			$file = get_language_file_ex($name, $lang);
-			if (isset($file)) {
-				$config['lang'] = $lang;
-				break;
-			}
-			if (strpos($lang, '-') !== false) {
-				$file = get_language_file_ex($name, strtok($lang, ':-'));
+	else {
+		$config['lang'] = 'en';
+
+		if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+			foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $lang) {
+				$lang = strtok($lang, ':;');
+				$file = get_language_file_ex($name, $lang);
 				if (isset($file)) {
 					$config['lang'] = $lang;
 					break;
 				}
+				if (strpos($lang, '-') !== false) {
+					$file = get_language_file_ex($name, strtok($lang, ':-'));
+					if (isset($file)) {
+						$config['lang'] = $lang;
+						break;
+					}
+				}
 			}
 		}
 	}
--- a/htdocs/common/footer.tpl.php
+++ b/htdocs/common/footer.tpl.php
@ -3,8 +3,8 @@
 	<a href="http://validator.w3.org/check?uri=referer">
 		<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" />
 	</a>
-	<a href="http://feed.w3.org/check.cgi?url=http://<?php echo $_SERVER["HTTP_HOST"], $_SERVER["REQUEST_URI"]; ?>">
-		<img src="http://validator.w3.org/feed/images/valid-rss-rogers.png" alt="Valid RSS" title="Validate my RSS feed" />
+	<a href="http://jigsaw.w3.org/css-validator/check/referer">
+		<img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
 	</a>
 	<div id="poweredBy">
 		<h3>PHP <?php
--- a/htdocs/common/header.tpl.php
+++ b/htdocs/common/header.tpl.php
@ -13,7 +13,7 @@
 <body>
 <div id="header">
 	<div id="banner">
-		<a href="http://xcache.lighttpd.net/" target="_blank"><img src="../common/xcache.png" id="logo" width="175" height="51" />
+		<a href="http://xcache.lighttpd.net/" rel="external"><img src="../common/xcache.png" id="logo" alt="XCache logo" width="175" height="51" />
 			<?php echo $xcache_version; ?> - <?php echo ucfirst($GLOBALS['module']); ?>
 		</a>
 	</div>