[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r15015: (ticket:91) Adding remaining hidden service specific items (in torstatus/trunk/web: . css)



Author: kasimir
Date: 2008-06-07 16:34:56 -0400 (Sat, 07 Jun 2008)
New Revision: 15015

Removed:
   torstatus/trunk/web/css/style.css
Modified:
   torstatus/trunk/web/config_template.php
   torstatus/trunk/web/css/main.css
   torstatus/trunk/web/header.php
   torstatus/trunk/web/index.php
Log:
(ticket:91) Adding remaining hidden service specific items

Modified: torstatus/trunk/web/config_template.php
===================================================================
--- torstatus/trunk/web/config_template.php	2008-06-07 19:54:12 UTC (rev 15014)
+++ torstatus/trunk/web/config_template.php	2008-06-07 20:34:56 UTC (rev 15015)
@@ -130,14 +130,29 @@
 
 // }}}
 
-// ++++++++++ Other ++++++++++ {{{
-$LocalTimeZone = "GMT";
-$OffsetFromGMT = 0;
+// ++++++++++ Hidden service options ++++++++++ {{{
 
-$Hidden_Service_URL = null;
+// Detect whether or not TorStatus is running as a hidden service
+$DetectHiddenService = 1;
 
+// Manually set whether this is a hidden service
+// (overrides auto detection)
+$IsAHiddenService = 0;
+
+// Change to 1 to truncate the output by default
+// (recommended for hidden services)
 $Fast = 0;
 
+// This should be set if you provide a hidden service and do not
+// mind breaking the anonymity of your server
+$Hidden_Service_URL = null;
+
 // }}}
 
+// ++++++++++ Other ++++++++++ {{{
+$LocalTimeZone = "GMT";
+$OffsetFromGMT = 0;
+
+// }}}
+
 ?>

Modified: torstatus/trunk/web/css/main.css
===================================================================
--- torstatus/trunk/web/css/main.css	2008-06-07 19:54:12 UTC (rev 15014)
+++ torstatus/trunk/web/css/main.css	2008-06-07 20:34:56 UTC (rev 15015)
@@ -1,524 +1,700 @@
-a:link 
-{
-	text-decoration:none; 
-	color:#000000;
-}
-
-a:visited 
-{
-	text-decoration:none; 
-	color:#000000;
-}
-
-a:hover 
-{
-	text-decoration:none;
-}
-
-a.who:link,a.who:active,a.who:visited
-{
-	text-decoration: none;
-	color: black;
-}
-a.who:hover
-{
-	text-decoration: underline;
-}
-
-a.plain,a.collapseinfobar,a.plainbox
-{
-	text-decoration:none; 
-	color: #FFFFFF;
-}
-
-a.plain:hover,a.collapseinfobar:hover,a.plainbox:hover
-{
-	text-decoration: underline;
-}
-
-a.plainbox
-{
-	color: #000000;
-}
-
-.BOD 
-{
-	background-color:#ffffff;
-}
-
-.PT
-{
-	background-color: #13A200; 
-	text-align:center; 
-	font:bold 16pt Arial; 
-	color:#000000;
-	border-style: solid;
-	border-color: black;
-	border-width: 1px;
-}
-
-td.mirrors
-{
-	background-color: #13A200;
-	border-style: solid;
-	border-color: black;
-	border-width: 1px;
-	text-align: center;
-	font-size: .9em;
-	color: #000000;
-}
-
-.links
-{
-	background-color: #13A200;
-	border-style: solid;
-	border-color: black;
-	border-width: 1px;
-	text-align: center;
-	font-size: .7em;
-	color: #000000;
-}
-
-.THN 
-{
-	background-color: #FFF368; /*TOPBAR*/
-	text-align:left; 
-	text-decoration:none; 
-	font:bold 10pt Arial; 
-	color: #000000; 
-	white-space:nowrap;
-/*	border-top: 2px solid black;
-	border-bottom: 2px solid black; */
-}
-
-.HRN,.HRNtop
-{
-	background-color: #FFF368; /*TOPBAR*/
-	text-align:left; 
-	text-decoration:none; 
-	font:bold 10pt Arial; 
-	color:#000000; 
-	padding-top: 5px;
-	padding-left: 5px;
-	white-space:nowrap;
-	border-top: 1px solid #000072;
-	border-bottom: 1px solid #59990e;
-}
-
-.HRS,.HRStop 
-{
-	background-color: #FFF368; /*TOPBAR*/
-	text-align:left; 
-	text-decoration:none;
-	font:bold 10pt Arial;
-	font-style:italic; 
-	color:#000000; 
-	white-space:nowrap;
-	padding-top: 5px;
-	border-top: 1px solid #000072;
-	border-bottom: 1px solid #59990e;
-	padding-left: 1px;
-}
-.HRNtop,.HRStop
-{
-	border-top-style: none;
-}
-
-a.header
-{
-	color: #000000;
-}
-a.header:hover
-{
-	text-decoration: underline;
-}
-  
-.HRFNO
-{
-	background-image:url(../img/bg_red.gif); 
-	text-align:left; 
-	text-decoration:none; 
-	font:bold 10pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-}
-
-.HRFNOS 
-{
-	background-image:url(../img/bg_red.gif); 
-	text-align:left; 
-	text-decoration:none; 
-	font:bold 10pt Arial; 
-	font-style:italic; 
-	color:#000000; 
-	white-space:nowrap;
-}
-        
-.HRFYES
-{
-	background-color: #C7FFBF; 
-	text-align:left; 
-	text-decoration:none; 
-	font:bold 10pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-}
-
-.HRFYESS 
-{
-	background-color: #C7FFBF; 
-	text-align:left; 
-	text-decoration:none; 
-	font:bold 10pt Arial; 
-	font-style:italic; 
-	color:#000000; 
-	white-space:nowrap;
-}
-
-.TRr 
-{
-	text-align: left; 
-	text-decoration: none; 
-	color: #000000;
-	font-size: 10pt;
-	padding-left: 1px;
-}
-
-.TRR 
-{
-/*	background-color: #C7FFBF;*/
-	text-align: left; 
-	text-decoration: none; 
-	font-weight: bold;
-	font-size: 10pt;
-	padding-left: 1px;
-	color: #000000;
-}
-
-.TRS 
-{
-	background-color:#ffffff; 
-	text-align:left; 
-	font:normal 10pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-	padding: 5px;
-}
-
-.TRSCN
-{
-	background-color:#ffffff; 
-	text-align:center; 
-	font:normal 10pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-}
-
-.TRSC
-{
-	background-color:#ffffff; 
-	text-align:center; 
-	font:normal 11pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-}
-
-.TRSB 
-{
-	background-color:#ffffff; 
-	text-align:left; 
-	font:normal 10pt Arial; 
-	color:#000000;
-	padding: 5px;
-}
-.TRSBcenter
-{
-	background-color: #ffffff;
-	text-align: center;
-	font: normal 10pt Arial;
-	color: #000000;
-}
-
-.TRSM 
-{
-	font:normal 7pt Arial; 
-	white-space:nowrap;
-}
-
-.F1
-{
-	background-image: url(../img/bg_yes.png); 
-	background-repeat: no-repeat; 
-	background-position: center center; 
-	width: 40px;
-}
-
-.F0 
-{
-	background-image: url(../img/routerdown.png); 
-	background-repeat: no-repeat; 
-	background-position: center center; 
-	width: 40px;
-}
-
-.TRAR 
-{
-	background-color:#ffffff; 
-	text-align:right; 
-	font:normal 10pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-	padding-right: 10px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-
-.TRC 
-{
-	text-align:center; 
-	font:normal 10pt Arial; 
-	color:#000000;
-}
-
-.TDBLACK 
-{
-	background-color:#000000;
-}
-
-.TDS 
-{
-	text-align:left; 
-	font:normal 10pt Arial; 
-	color:#000000; 
-	white-space:nowrap;
-}
-
-.TDc
-{
-	text-align: center;
-	font:normal 10pt Arial;
-	color:#000000;
-	white-space:nowrap;
-}
-
-.TDcb
-{
-	text-align: center;
-	font:normal 10pt Arial;
-	color:#000000;
-	white-space:nowrap;
-	font-weight: bold;
-}
-
-.TDb
-{
-	text-align: left;
-	font: normal 10pt Arial;
-	color: #000000;
-	white-space:nowrap;
-	width: 95px;
-}
-
-tr.r 
-{
-	background-color: #FBFAE0;
-}
-
-tr.R
-{
-	background-color: #FFECBF;
-}
-
-tr.d
-{
-/*	background-color: #FFE000;
-	background: url(/img/routerdown.png) top left repeat #FFE000; */
-	background-color: #FBFAE0;
-}
-
-tr.B
-{
-	background-color: red;
-}
-
-tr.r:hover,tr.R:hover,tr.d:hover
-{
-/*	background-color: #BFFFDC; */
-	background-color: #f1f1f1;
-}
-
-tr.nr 
-{
-	background-color:#ffffff;
-}
-
-.BOX
-{
-	background-color:#ccddff;
-}
-
-.BOXCOLSEL
-{
-	background-color:#ccddff;
-   	width: 200px;
-}
-
-.BTNCOLSEL
-{
-   	width: 200px;
-}
-
-.BTNUPDOWN
-{
-   	width: 80px;
-}
-
-span.usingTor
-{
-	color: #00dd00;
-}
-span.notUsingTor
-{
-	color: #ff0000;
-}
-table.notUsingTor
-{
-	border-style: solid;
-	border-color: black;
-	border-width: 3px;
-	margin-left: auto;
-	margin-right: auto;
-	background-color: white;
-}
-td.notUsingTor
-{
-	vertical-align: middle;
-	font-weight: bold;
-}
-td.imgTor
-{
-	padding: 3px;
-	padding-right: 7px;
-	font-weight: bold;
-}
-
-table.legend
-{
-	border-style: solid;
-	border-color: black;
-	border-width: 3px;
-	margin-left: auto;
-	margin-right: auto;
-	width: 250px;
-	text-align: left;
-}
-th.legend
-{
-	text-align: center;
-}
-table.body
-{
-	width: 100%;
-	border-style: none;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-td.flag {
-	background-color: #C7FFBF;
-}
-
-table.iT
-{
-	width: 100%;
-}
-td.iT
-{
-	width: 100%;
-}
-
-table.bwb
-{
-	border: 0;
-}
-td.bwr
-{
-	background-color: #DDDDDD;
-	width: 85px;
-}
-td.bwr1
-{
-	background-color: #a2a2a2;
-	width: 85px;
-}
-td.bwr2
-{
-	background-color: #747474;
-	width: 85px;
-}
-td.bwr3
-{
-	background-color: #414141;
-	width: 85px;
-}
-td.bwr4
-{
-	background-color: #232323;
-	width: 85px;
-}
-td.bwr5
-{
-	background-color: black;
-	width: 85px;
-}
-table.displayTable
-{
-	border-style: solid;
-	border-width: 1px;
-	border-color: #000072;
-	border-top-style: none;
-	padding: 0px;
-	padding-top: 0px;
-}
-
-div.version
-{
-	float: right;
-	font-weight: normal;
-	font-size: .7em;
-}
-a.LegendLink
-{
-	font-size: .9em;
-	text-decoration: none;
-	font-weight: bold;
-	color: black;
-}
-a.LegendLink:hover
-{
-	text-decoration: underline;
-}
-
-table.infobox
-{
-	background-color: white;
-	border-color: #000072;
-	border-style: solid;
-	border-width: 1px;
-}
-img.sorting
-{
-	border-style: none;
-	margin-left: 2px;
-}
-
-td.truncated
-{
-	padding: 10px;
-	text-align: center;
-	background-color: white;
-}
-td.truncated a:hover
-{
-	text-decoration: underline;
-}
+a:link 
+{
+	text-decoration:none; 
+	color:#000000;
+}
+
+a:visited 
+{
+	text-decoration:none; 
+	color:#000000;
+}
+
+a:hover 
+{
+	text-decoration:none;
+}
+
+a.who:link,a.who:active,a.who:visited
+{
+	text-decoration: none;
+	color: black;
+}
+a.who:hover
+{
+	text-decoration: underline;
+}
+
+a.plain,a.collapseinfobar,a.plainbox
+{
+	text-decoration:none; 
+	color: #FFFFFF;
+}
+
+a.plain:hover,a.collapseinfobar:hover,a.plainbox:hover
+{
+	text-decoration: underline;
+}
+
+a.plainbox
+{
+	color: #000000;
+}
+
+.BOD 
+{
+	background-color:#ffffff;
+}
+
+.PT
+{
+	background-color: #13A200; 
+	text-align:center; 
+	font:bold 16pt Arial; 
+	color:#000000;
+	border-style: solid;
+	border-color: black;
+	border-width: 1px;
+}
+
+td.mirrors
+{
+	background-color: #13A200;
+	border-style: solid;
+	border-color: black;
+	border-width: 1px;
+	text-align: center;
+	font-size: .9em;
+	color: #000000;
+}
+
+.links
+{
+	background-color: #13A200;
+	border-style: solid;
+	border-color: black;
+	border-width: 1px;
+	text-align: center;
+	font-size: .7em;
+	color: #000000;
+}
+
+.THN 
+{
+	background-color: #FFF368; /*TOPBAR*/
+	text-align:left; 
+	text-decoration:none; 
+	font:bold 10pt Arial; 
+	color: #000000; 
+	white-space:nowrap;
+/*	border-top: 2px solid black;
+	border-bottom: 2px solid black; */
+}
+
+.HRN,.HRNtop
+{
+	background-color: #FFF368; /*TOPBAR*/
+	text-align:left; 
+	text-decoration:none; 
+	font:bold 10pt Arial; 
+	color:#000000; 
+	padding-top: 5px;
+	padding-left: 5px;
+	white-space:nowrap;
+	border-top: 1px solid #000072;
+	border-bottom: 1px solid #59990e;
+}
+
+.HRS,.HRStop 
+{
+	background-color: #FFF368; /*TOPBAR*/
+	text-align:left; 
+	text-decoration:none;
+	font:bold 10pt Arial;
+	font-style:italic; 
+	color:#000000; 
+	white-space:nowrap;
+	padding-top: 5px;
+	border-top: 1px solid #000072;
+	border-bottom: 1px solid #59990e;
+	padding-left: 1px;
+}
+.HRNtop,.HRStop
+{
+	border-top-style: none;
+}
+
+a.header
+{
+	color: #000000;
+}
+a.header:hover
+{
+	text-decoration: underline;
+}
+  
+.HRFNO
+{
+	background-image:url(../img/bg_red.gif); 
+	text-align:left; 
+	text-decoration:none; 
+	font:bold 10pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+}
+
+.HRFNOS 
+{
+	background-image:url(../img/bg_red.gif); 
+	text-align:left; 
+	text-decoration:none; 
+	font:bold 10pt Arial; 
+	font-style:italic; 
+	color:#000000; 
+	white-space:nowrap;
+}
+        
+.HRFYES
+{
+	background-color: #C7FFBF; 
+	text-align:left; 
+	text-decoration:none; 
+	font:bold 10pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+}
+
+.HRFYESS 
+{
+	background-color: #C7FFBF; 
+	text-align:left; 
+	text-decoration:none; 
+	font:bold 10pt Arial; 
+	font-style:italic; 
+	color:#000000; 
+	white-space:nowrap;
+}
+
+.TRr 
+{
+	text-align: left; 
+	text-decoration: none; 
+	color: #000000;
+	font-size: 10pt;
+	padding-left: 1px;
+}
+
+.TRR 
+{
+/*	background-color: #C7FFBF;*/
+	text-align: left; 
+	text-decoration: none; 
+	font-weight: bold;
+	font-size: 10pt;
+	padding-left: 1px;
+	color: #000000;
+}
+
+.TRS 
+{
+	background-color:#ffffff; 
+	text-align:left; 
+	font:normal 10pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+	padding: 5px;
+}
+
+.TRSCN
+{
+	background-color:#ffffff; 
+	text-align:center; 
+	font:normal 10pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+}
+
+.TRSC
+{
+	background-color:#ffffff; 
+	text-align:center; 
+	font:normal 11pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+}
+
+.TRSB 
+{
+	background-color:#ffffff; 
+	text-align:left; 
+	font:normal 10pt Arial; 
+	color:#000000;
+	padding: 5px;
+}
+.TRSBcenter
+{
+	background-color: #ffffff;
+	text-align: center;
+	font: normal 10pt Arial;
+	color: #000000;
+}
+
+.TRSM 
+{
+	font:normal 7pt Arial; 
+	white-space:nowrap;
+}
+
+.F1
+{
+	background-image: url(../img/bg_yes.png); 
+	background-repeat: no-repeat; 
+	background-position: center center; 
+	width: 40px;
+}
+
+.F0 
+{
+	background-image: url(../img/routerdown.png); 
+	background-repeat: no-repeat; 
+	background-position: center center; 
+	width: 40px;
+}
+
+.TRAR 
+{
+	background-color:#ffffff; 
+	text-align:right; 
+	font:normal 10pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+	padding-right: 10px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+}
+
+.TRC 
+{
+	text-align:center; 
+	font:normal 10pt Arial; 
+	color:#000000;
+}
+
+.TDBLACK 
+{
+	background-color:#000000;
+}
+
+.TDS 
+{
+	text-align:left; 
+	font:normal 10pt Arial; 
+	color:#000000; 
+	white-space:nowrap;
+}
+
+.TDc
+{
+	text-align: center;
+	font:normal 10pt Arial;
+	color:#000000;
+	white-space:nowrap;
+}
+
+.TDcb
+{
+	text-align: center;
+	font:normal 10pt Arial;
+	color:#000000;
+	white-space:nowrap;
+	font-weight: bold;
+}
+
+.TDb
+{
+	text-align: left;
+	font: normal 10pt Arial;
+	color: #000000;
+	white-space:nowrap;
+	width: 95px;
+}
+
+tr.r 
+{
+	background-color: #FBFAE0;
+}
+
+tr.R
+{
+	background-color: #FFECBF;
+}
+
+tr.d
+{
+/*	background-color: #FFE000;
+	background: url(/img/routerdown.png) top left repeat #FFE000; */
+	background-color: #FBFAE0;
+}
+
+tr.B
+{
+	background-color: red;
+}
+
+tr.r:hover,tr.R:hover,tr.d:hover
+{
+/*	background-color: #BFFFDC; */
+	background-color: #f1f1f1;
+}
+
+tr.nr 
+{
+	background-color:#ffffff;
+}
+
+.BOX
+{
+	background-color:#ccddff;
+}
+
+.BOXCOLSEL
+{
+	background-color:#ccddff;
+   	width: 200px;
+}
+
+.BTNCOLSEL
+{
+   	width: 200px;
+}
+
+.BTNUPDOWN
+{
+   	width: 80px;
+}
+
+span.usingTor
+{
+	color: #00dd00;
+}
+span.notUsingTor
+{
+	color: #ff0000;
+}
+table.notUsingTor
+{
+	border-style: solid;
+	border-color: black;
+	border-width: 3px;
+	margin-left: auto;
+	margin-right: auto;
+	background-color: white;
+}
+td.notUsingTor
+{
+	vertical-align: middle;
+	font-weight: bold;
+}
+td.imgTor
+{
+	padding: 3px;
+	padding-right: 7px;
+	font-weight: bold;
+}
+
+table.legend
+{
+	border-style: solid;
+	border-color: black;
+	border-width: 3px;
+	margin-left: auto;
+	margin-right: auto;
+	width: 250px;
+	text-align: left;
+}
+th.legend
+{
+	text-align: center;
+}
+table.body
+{
+	width: 100%;
+	border-style: none;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+td.flag {
+	background-color: #C7FFBF;
+}
+
+table.iT
+{
+	width: 100%;
+}
+td.iT
+{
+	width: 100%;
+}
+
+table.bwb
+{
+	border: 0;
+}
+td.bwr
+{
+	background-color: #DDDDDD;
+	width: 85px;
+}
+td.bwr1
+{
+	background-color: #a2a2a2;
+	width: 85px;
+}
+td.bwr2
+{
+	background-color: #747474;
+	width: 85px;
+}
+td.bwr3
+{
+	background-color: #414141;
+	width: 85px;
+}
+td.bwr4
+{
+	background-color: #232323;
+	width: 85px;
+}
+td.bwr5
+{
+	background-color: black;
+	width: 85px;
+}
+table.displayTable
+{
+	border-style: solid;
+	border-width: 1px;
+	border-color: #000072;
+	border-top-style: none;
+	padding: 0px;
+	padding-top: 0px;
+}
+
+div.version
+{
+	float: right;
+	font-weight: normal;
+	font-size: .7em;
+}
+a.LegendLink
+{
+	font-size: .9em;
+	text-decoration: none;
+	font-weight: bold;
+	color: black;
+}
+a.LegendLink:hover
+{
+	text-decoration: underline;
+}
+
+table.infobox
+{
+	background-color: white;
+	border-color: #000072;
+	border-style: solid;
+	border-width: 1px;
+}
+img.sorting
+{
+	border-style: none;
+	margin-left: 2px;
+}
+
+td.truncated
+{
+	padding: 10px;
+	text-align: center;
+	background-color: white;
+}
+td.truncated a:hover
+{
+	text-decoration: underline;
+}
+
+/* Body */
+body
+{
+	margin: 0;
+	padding: 0;
+	background: #a4a5a9;
+}
+
+/* Top bar */
+div.topbar
+{
+	background: url(/img/topbargradient.png) top left repeat-x #000072;
+	width: 100%;
+	top: 0px;
+	left: 0px;
+	text-align: left;
+}
+img.topbarlogo
+{
+	margin-left: 10px;
+	margin-right: auto;
+	border: 0;
+	vertical-align: bottom;
+}
+a.logoimage
+{
+	text-decoration: none;
+}
+span.logotext
+{
+	color: white;
+	font-size: .8em;
+	text-align: right;
+	width: 100%;
+}
+a.logotext:link,a.logotext:active,a.logotext:visited
+{
+	color: white;
+	text-decoration: none;
+}
+a.logotext:hover
+{
+	text-decoration: underline;
+}
+div.separator
+{
+	background-color: #59990e;
+	height: 1px;
+}
+div.mirrorbar,div.infobar
+{
+	color: white;
+	font-size: 0.8em;
+	background-color: #000072;
+	padding-top: 4px;
+	padding-bottom: 4px;
+}
+
+div.closedinfobar
+{
+	color: white;
+	background-color: #000072;
+	padding: 0px;
+	text-align: center;
+	padding-top: 4px;
+}
+
+div.infobar
+{
+	text-align: center;
+}
+
+img.infobarbutton
+{
+	border-style: none;
+	vertical-align: middle;
+}
+
+span.collapseinfobar
+{
+	float: right;
+	position: absolute;
+}
+
+/* Content */
+
+div.content
+{
+	background: url(/img/graygradient.png) top left repeat-x #a4a5a9;
+	padding: 0;
+	margin: 0;
+}
+
+.dropcontainer
+{
+	width: 400px;
+	margin-left: auto;
+	margin-right: auto;
+}
+.dropshadow2{
+	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;
+	padding: 0px;
+}
+.innerbox{
+	position:relative;
+	bottom:6px;
+	right: 6px;
+	/*border: 1px solid #999999;*/
+	margin: 0px 0px 0px 0px;
+}
+
+/* Torcheck section */
+table.torcheck
+{
+	border-style: solid;
+	border-color: #000072; /*#959595;*/
+	border-width: 1px;
+	margin: 0px;
+	padding: 0px;
+	background: white;
+	width: 400px;
+	height: 65px;
+}
+td.tab
+{
+	height: 100%;
+	background: url(/img/middleboxgreengradient.png) top left repeat-x #59990e;
+	text-align: center;
+	vertical-align: middle;
+	width: 65px;
+	border-right-style: solid;
+	border-right-color: #000072;
+	border-right-width: 1px;
+}
+a.tab:hover
+{
+	text-decoration: underline;
+}
+td.content
+{
+	padding: 10px;
+}
+
+/* Search box */
+input.searchbox
+{
+	width: 15em;
+	height: 1.5em;
+	border: 2px #59990e solid;
+	margin: 0;
+	padding: .38em .5em 0 .5em;
+}
+a.searchbox img.searchbox
+{
+	border: 2px #59990e solid;
+	height: 25px;
+	width: 21px;
+	margin: 0;
+	margin-bottom: -9px;
+	background: top left no-repeat;
+	background-image: url(/img/search.png);
+}
+a.searchbox:hover img.searchbox
+{
+	background-image: url(/img/searchhover.png);
+}
+
+td.TRSB a:hover
+{
+	text-decoration: underline;
+}

Deleted: torstatus/trunk/web/css/style.css
===================================================================
--- torstatus/trunk/web/css/style.css	2008-06-07 19:54:12 UTC (rev 15014)
+++ torstatus/trunk/web/css/style.css	2008-06-07 20:34:56 UTC (rev 15015)
@@ -1,176 +0,0 @@
-
-/* Body */
-body
-{
-	margin: 0;
-	padding: 0;
-	background: #a4a5a9;
-}
-
-/* Top bar */
-div.topbar
-{
-	background: url(/img/topbargradient.png) top left repeat-x #000072;
-	width: 100%;
-	top: 0px;
-	left: 0px;
-	text-align: left;
-}
-img.topbarlogo
-{
-	margin-left: 10px;
-	margin-right: auto;
-	border: 0;
-	vertical-align: bottom;
-}
-a.logoimage
-{
-	text-decoration: none;
-}
-span.logotext
-{
-	color: white;
-	font-size: .8em;
-	text-align: right;
-	width: 100%;
-}
-a.logotext:link,a.logotext:active,a.logotext:visited
-{
-	color: white;
-	text-decoration: none;
-}
-a.logotext:hover
-{
-	text-decoration: underline;
-}
-div.separator
-{
-	background-color: #59990e;
-	height: 1px;
-}
-div.mirrorbar,div.infobar
-{
-	color: white;
-	font-size: 0.8em;
-	background-color: #000072;
-	padding-top: 4px;
-	padding-bottom: 4px;
-}
-
-div.closedinfobar
-{
-	color: white;
-	background-color: #000072;
-	padding: 0px;
-	text-align: center;
-	padding-top: 4px;
-}
-
-div.infobar
-{
-	text-align: center;
-}
-
-img.infobarbutton
-{
-	border-style: none;
-	vertical-align: middle;
-}
-
-span.collapseinfobar
-{
-	float: right;
-	position: absolute;
-}
-
-/* Content */
-
-div.content
-{
-	background: url(/img/graygradient.png) top left repeat-x #a4a5a9;
-	padding: 0;
-	margin: 0;
-}
-
-.dropcontainer
-{
-	width: 400px;
-	margin-left: auto;
-	margin-right: auto;
-}
-.dropshadow2{
-	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;
-	padding: 0px;
-}
-.innerbox{
-	position:relative;
-	bottom:6px;
-	right: 6px;
-	/*border: 1px solid #999999;*/
-	margin: 0px 0px 0px 0px;
-}
-
-/* Torcheck section */
-table.torcheck
-{
-	border-style: solid;
-	border-color: #000072; /*#959595;*/
-	border-width: 1px;
-	margin: 0px;
-	padding: 0px;
-	background: white;
-	width: 400px;
-	height: 65px;
-}
-td.tab
-{
-	height: 100%;
-	background: url(/img/middleboxgreengradient.png) top left repeat-x #59990e;
-	text-align: center;
-	vertical-align: middle;
-	width: 65px;
-	border-right-style: solid;
-	border-right-color: #000072;
-	border-right-width: 1px;
-}
-a.tab:hover
-{
-	text-decoration: underline;
-}
-td.content
-{
-	padding: 10px;
-}
-
-/* Search box */
-input.searchbox
-{
-	width: 15em;
-	height: 1.5em;
-	border: 2px #59990e solid;
-	margin: 0;
-	padding: .38em .5em 0 .5em;
-}
-a.searchbox img.searchbox
-{
-	border: 2px #59990e solid;
-	height: 25px;
-	width: 21px;
-	margin: 0;
-	margin-bottom: -9px;
-	background: top left no-repeat;
-	background-image: url(/img/search.png);
-}
-a.searchbox:hover img.searchbox
-{
-	background-image: url(/img/searchhover.png);
-}
-
-td.TRSB a:hover
-{
-	text-decoration: underline;
-}

Modified: torstatus/trunk/web/header.php
===================================================================
--- torstatus/trunk/web/header.php	2008-06-07 19:54:12 UTC (rev 15014)
+++ torstatus/trunk/web/header.php	2008-06-07 20:34:56 UTC (rev 15015)
@@ -40,7 +40,6 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	<title>TorStatus - <?php echo $pageTitle; ?></title>
 	<link rel="stylesheet" type="text/css" href="css/main.css" />
-	<link rel="stylesheet" type="text/css" href="css/style.css" />
 	<!--[if lt IE 7.]>
 	<script defer type="text/javascript" src="/js/pngfix.js"></script>
 	<![endif]-->

Modified: torstatus/trunk/web/index.php
===================================================================
--- torstatus/trunk/web/index.php	2008-06-07 19:54:12 UTC (rev 15014)
+++ torstatus/trunk/web/index.php	2008-06-07 20:34:56 UTC (rev 15015)
@@ -70,6 +70,19 @@
 {
 	$ServerIP = $RealServerIP;
 }
+
+// Determine if the host indicated this to be a hidden service
+$DetectedHiddenService = 0;
+if ($IsAHiddenService == 1)
+{
+	$DetectedHiddenService = 1;
+}
+if(substr($Host,-6) == ".onion" && $DetectHiddenService == 1)
+{
+	$DetectedHiddenService = 1;
+}
+
+
 $ServerPort = $_SERVER['SERVER_PORT'];
 $RemoteIPDBCount = null;
 $PositiveMatch_IP = 0;
@@ -2125,7 +2138,6 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	<title>TorStatus - Tor Network Status</title>
 	<link rel="stylesheet" type="text/css" href="css/main.css" />
-	<link rel="stylesheet" type="text/css" href="css/style.css" />
 	<!--[if lt IE 7.]>
 	<script defer type="text/javascript" src="/js/pngfix.js"></script>
 	<![endif]-->
@@ -2180,8 +2192,10 @@
 </div>
 <div class="infobar" id="infobar">
 <a class="plain" href="tor_exit_query.php">Tor Exit Node Query</a> |
+<?php if ($DetectedHiddenService == 0) { ?>
 <a class='plain' href='#AppServer' onclick='javascript:asdToggle = 0;toggleASD();'>TorStatus Server Details</a> |
 <a class='plain' href='#TorServer' onclick='javascript:nsosToggle = 0;toggleNSOS();'>Opinion Source</a> |
+<?php } ?>
 <a class='plain' href='#CustomQuery' onclick='javascript:caqoToggle = 0;toggleCAQO();'>Advanced Query Options</a> |
 <a class='plain' href='column_set.php'>Advanced Display Options</a> |
 <a class='plain' href='#Stats' onclick='javascript:anssToggle = 0;toggleANSS();'>Network Statistic Summary</a> |
@@ -2224,9 +2238,11 @@
 
 <?php
 
-if(!(false === strpos($Hidden_Service_URL, $Host)))
+if($DetectedHiddenService == 1)
 {
-	echo "<font class='usingTor'>-You appear to be accessing this server through the Tor network as a hidden service-</span><br/><br/>";
+	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 onion network service through the Tor network.</span><br/>";
+	echo '</td></tr>';
 }
 else if ($PositiveMatch_IP == 1)
 {
@@ -2254,20 +2270,35 @@
 	echo "<span class='notUsingTor'>You do not appear to be using Tor</span><br/>Your IP Address is: $RemoteIP";
 	echo "</td></tr>";
 }
+?>
+</table>
 
-if($Hidden_Service_URL != null)
+</div></div></div>
+
+<?php
+
+// Provide a link to the hidden service if defined
+if($Hidden_Service_URL != null && $DetectedHiddenService == 0)
 {
-	echo "<tr>\n";
-	echo "<td class='TRC'><b>";
-	echo "<font color='#3344ee'>This site is available as a Tor Hidden Service at:</font><br/><a class='plain' href='$Hidden_Service_URL'>$Hidden_Service_URL</a><br/><br/>";
-	echo "</b></td>\n";
-	echo "</tr>\n";
-}
-?>
+	?>
+<br/>
+<div class="dropcontainer">
+<div class="dropshadow2">
+<div class="innerbox">
 
+<table class="torcheck" cellpadding="0" cellspacing="0">
+<tr><td>
+<div style="padding: 3px; color: blue; text-align: center;">
+This site is available as a Tor Hidden Service at:
+<br/><a href='http://<?php echo $Hidden_Service_URL; ?>'><?php echo $Hidden_Service_URL; ?></a>
+</div>
+</td></tr>
 </table>
 
 </div></div></div>
+	<?php
+}
+?>
 
 <?php
 
@@ -2550,6 +2581,7 @@
 
 <br/>
 
+<?php if ($DetectedHiddenService == 0) { ?>
 <a name='TorServer'></a>
 
 <a href="javascript:toggleNSOS();" class="LegendLink" id='nsosTableLink'>Network Status Opinion Source</a>
@@ -2603,7 +2635,7 @@
 </script>
 
 <br/>
-
+<?php } ?>
 <a name='CustomDisplay' href="column_set.php" class="LegendLink">Custom / Advanced Display Options</a>
 
 <br/>
@@ -2854,6 +2886,7 @@
 
 <br/>
 
+<?php if ($DetectedHiddenService == 0) { ?>
 <a name="AppServer"></a>
 
 <a href="javascript:toggleASD();" class="LegendLink" id='asdTableLink'>Application Server Details</a>
@@ -2924,7 +2957,7 @@
 }
 // -->
 </script>
-
+<?php } ?>
 </td></tr>
 </table>