[or-cvs] r16752: {torstatus} (ticket:115) Fixing remaining issues with icons and images n (in torstatus/trunk/web: . css img)

kasimir at seul.org kasimir at seul.org
Thu Sep 4 15:25:11 UTC 2008


Author: kasimir
Date: 2008-09-04 11:25:11 -0400 (Thu, 04 Sep 2008)
New Revision: 16752

Added:
   torstatus/trunk/web/img/favicon.ico
Removed:
   torstatus/trunk/web/favicon.ico
Modified:
   torstatus/trunk/web/css/main.css
   torstatus/trunk/web/header.php
   torstatus/trunk/web/index.php
Log:
(ticket:115) Fixing remaining issues with icons and images not being references

Modified: torstatus/trunk/web/css/main.css
===================================================================
--- torstatus/trunk/web/css/main.css	2008-09-04 15:22:55 UTC (rev 16751)
+++ torstatus/trunk/web/css/main.css	2008-09-04 15:25:11 UTC (rev 16752)
@@ -552,7 +552,7 @@
 /* Top bar */
 div.topbar
 {
-	background: url(/img/topbargradient.png) top left repeat-x #000072;
+	background: url(../img/topbargradient.png) top left repeat-x #000072;
 	width: 100%;
 	top: 0px;
 	left: 0px;
@@ -629,7 +629,7 @@
 
 div.content
 {
-	background: url(/img/graygradient.png) top left repeat-x #a4a5a9;
+	background: url(../img/graygradient.png) top left repeat-x #a4a5a9;
 	padding: 0;
 	margin: 0;
 }
@@ -641,8 +641,8 @@
 	margin-right: auto;
 }
 .dropshadow2{
-	background: url(/img/middleboxshadow.png) no-repeat bottom right !important;
-	background: url(/img/shadow.gif) no-repeat bottom right;
+	background: url(../img/middleboxshadow.png) no-repeat bottom right !important;
+	background: url(../img/shadow.gif) no-repeat bottom right;
 	margin: 10px 0 10px 10px !important;
 	margin: 10px 0 10px 5px;
 	width: 400px;
@@ -671,7 +671,7 @@
 td.tab
 {
 	height: 100%;
-	background: url(/img/middleboxgreengradient.png) top left repeat-x #59990e;
+	background: url(../img/middleboxgreengradient.png) top left repeat-x #59990e;
 	text-align: center;
 	vertical-align: middle;
 	width: 65px;
@@ -706,11 +706,11 @@
 	margin: 0;
 	margin-bottom: -9px;
 	background: top left no-repeat;
-	background-image: url(/img/search.png);
+	background-image: url(../img/search.png);
 }
 a.searchbox:hover img.searchbox
 {
-	background-image: url(/img/searchhover.png);
+	background-image: url(../img/searchhover.png);
 }
 
 td.TRSB a:hover

Deleted: torstatus/trunk/web/favicon.ico
===================================================================
(Binary files differ)

Modified: torstatus/trunk/web/header.php
===================================================================
--- torstatus/trunk/web/header.php	2008-09-04 15:22:55 UTC (rev 16751)
+++ torstatus/trunk/web/header.php	2008-09-04 15:25:11 UTC (rev 16752)
@@ -38,6 +38,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+	<link rel="shortcut icon" href="img/favicon.ico"/>
 	<title>TorStatus - <?php echo $pageTitle; ?></title>
 	<link rel="stylesheet" type="text/css" href="css/main.css" />
 	<!--[if lt IE 7.]>

Copied: torstatus/trunk/web/img/favicon.ico (from rev 16750, torstatus/trunk/web/favicon.ico)
===================================================================
(Binary files differ)

Modified: torstatus/trunk/web/index.php
===================================================================
--- torstatus/trunk/web/index.php	2008-09-04 15:22:55 UTC (rev 16751)
+++ torstatus/trunk/web/index.php	2008-09-04 15:25:11 UTC (rev 16752)
@@ -793,11 +793,11 @@
 				echo "<td class='TDc'>";
 				if ($record['Running'] == 0 && $record['Hibernating'] == 0)
 				{
-					echo "<img src='/img/routerdown.png' alt=' router is down' title='Router is currently down'/>";
+					echo "<img src='img/routerdown.png' alt=' router is down' title='Router is currently down'/>";
 				}
 				else
 				{
-					echo "<img src='/img/blank.gif' alt=' ' width='12px' />";
+					echo "<img src='img/blank.gif' alt=' ' width='12px' />";
 				}
 				echo $printTimeHours . "</td>";
 			}
@@ -806,11 +806,11 @@
 				echo "<td class='TDcb'>";
 				if ($record['Running'] == 0 && $record['Hibernating'] == 0)
 				{
-					echo "<img src='/img/routerdown.png' alt=' router is down' title='Router is currently down'/>";
+					echo "<img src='img/routerdown.png' alt=' router is down' title='Router is currently down'/>";
 				}
 				else
 				{
-					echo "<img src='/img/blank.gif' alt=' ' width='12px' />";
+					echo "<img src='img/blank.gif' alt=' ' width='12px' />";
 				}
 				echo $printTimeDays . "</td>";
 			}
@@ -818,11 +818,11 @@
 			{
 				if ($record['Running'] == 0 && $record['Hibernating'] == 0)
 				{
-					echo "<td class='TDc'><img src='/img/routerdown.png' alt=' router is down' title='Router is currently down'/>N/A</td>";
+					echo "<td class='TDc'><img src='img/routerdown.png' alt=' router is down' title='Router is currently down'/>N/A</td>";
 				}
 				else
 				{
-					echo "<td class='TDc'><img src='/img/blank.gif' alt=' ' width='12px' />N/A</td>";
+					echo "<td class='TDc'><img src='img/blank.gif' alt=' ' width='12px' />N/A</td>";
 					
 				}
 			}
@@ -2165,6 +2165,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+	<link rel="shortcut icon" href="img/favicon.ico"/>
 	<title>TorStatus - Tor Network Status</title>
 	<link rel="stylesheet" type="text/css" href="css/main.css" />
 	<!--[if lt IE 7.]>
@@ -2191,7 +2192,7 @@
 </script>
 <?php } ?>
 <script type="text/javascript">
-	document.getElementById('searchbutton').innerHTML = '<img class="searchbox" alt="Search" src="/img/blank.gif" />';
+	document.getElementById('searchbutton').innerHTML = '<img class="searchbox" alt="Search" src="img/blank.gif" />';
 	function submitSearch()
 	{
 		if (document.getElementById('searchbox').value == "search by name or fingerprint")
@@ -2210,7 +2211,7 @@
 <div style="width: 100%; text-align: right;" id="expandcollapse">
 <script type="text/javascript">
 <!--
-document.write('<a href="javascript:;" onclick="javascript:expand_infobar();"><img src="/img/infobarexpand.png" class="infobarbutton"/></a> <a href="javascript:;" onclick="javascript:expand_infobar();" class="plain">Show Advanced Options</a>');
+document.write('<a href="javascript:;" onclick="javascript:expand_infobar();"><img src="img/infobarexpand.png" class="infobarbutton"/></a> <a href="javascript:;" onclick="javascript:expand_infobar();" class="plain">Show Advanced Options</a>');
 // -->
 </script>
 <noscript>
@@ -2236,8 +2237,8 @@
 <script type="text/javascript">
 	<!--
 	var closetextstart = '<div class="infobar" style="display: none;" id="expandcollapse">';
-	var closetexthide = '<a href="javascript:;" onclick="javascript:collapse_infobar();"><img src="/img/infobarcollapse.png" class="infobarbutton"/></a> <a href="javascript:;" onclick="javascript:collapse_infobar();" class="plain">Hide Advanced Options</a>';
-	var closetextshow = '<a href="javascript:;" onclick="javascript:expand_infobar();"><img src="/img/infobarexpand.png" class="infobarbutton"/></a> <a href="javascript:;" onclick="javascript:expand_infobar();" class="plain">Show Advanced Options</a>';
+	var closetexthide = '<a href="javascript:;" onclick="javascript:collapse_infobar();"><img src="img/infobarcollapse.png" class="infobarbutton"/></a> <a href="javascript:;" onclick="javascript:collapse_infobar();" class="plain">Hide Advanced Options</a>';
+	var closetextshow = '<a href="javascript:;" onclick="javascript:expand_infobar();"><img src="img/infobarexpand.png" class="infobarbutton"/></a> <a href="javascript:;" onclick="javascript:expand_infobar();" class="plain">Show Advanced Options</a>';
 	var closetextend = '</div>';
 	document.write(closetextstart + closetextshow + closetextend);
 	function expand_infobar()
@@ -2269,13 +2270,13 @@
 
 if($DetectedHiddenService == 1)
 {
-	echo '<tr><td class="tab"><img src="/img/usingtor.png" alt="You are using Tor" /></td><td class="content">';
+	echo '<tr><td class="tab"><img src="img/usingtor.png" alt="You are using Tor" /></td><td class="content">';
 	echo "<span class='usingTor'>You appear to be accessing this hidden service through the Tor network.</span><br/>";
 	echo '</td></tr>';
 }
 else if ($PositiveMatch_IP == 1)
 {
-	echo '<tr><td class="tab"><img src="/img/usingtor.png" alt="You are using Tor" /></td><td class="content">';
+	echo '<tr><td class="tab"><img src="img/usingtor.png" alt="You are using Tor" /></td><td class="content">';
 	echo "<span class='usingTor'>It appears that you are using the Tor network</span><br/>Your OR is: ";
 	echo "<img src=\"img/flags/".strtolower($TorNodeCC).".gif\" class=\"flag\" title=\"".$country_codes[strtolower($TorNodeCC)]."\" />";
 	if (defined("WHOISPath"))
@@ -2303,7 +2304,7 @@
 else
 {
 	echo "<tr><td class='tab'>";
-	echo "<img alt='You are not using Tor' src='/img/notusingtor.png'/>";
+	echo "<img alt='You are not using Tor' src='img/notusingtor.png'/>";
 	echo "</td><td class='content'>";
 	echo "<span class='notUsingTor'>You do not appear to be using Tor</span><br/>Your IP Address is: ";
 	// Find the country code associated with this IP
@@ -2911,7 +2912,7 @@
 <tr><td class='HRN'>Legend:</td></tr>
 <tr class='r'><td style='padding: 1px;'>Router is okay</td></tr>
 <tr class='R'><td style='padding: 1px;'>Router is hibernating</td></tr>
-<tr class='d'><td style='padding: 1px;'><img src='/img/routerdown.png' alt=' router is down' title='Router is currently down'/>Router is currently down</td></tr>
+<tr class='d'><td style='padding: 1px;'><img src='img/routerdown.png' alt=' router is down' title='Router is currently down'/>Router is currently down</td></tr>
 <tr class='B'><td style='padding: 1px;'>Router is a bad exit node</td></tr>
 </table>
 



More information about the tor-commits mailing list