Revert "make the stats page fit with the rest of the site"
authorHolden Karau <hkarau@csclub.uwaterloo.ca>
Wed, 9 Apr 2008 23:57:45 +0000 (19:57 -0400)
committerHolden Karau <hkarau@csclub.uwaterloo.ca>
Wed, 9 Apr 2008 23:57:45 +0000 (19:57 -0400)
This reverts commit e3492a57690d73dd05fe98bd3c8dc1d8714e136f.

csc.dtd
stats.html [new file with mode: 0644]
stats.xml [deleted file]
xsl/common.xsl

diff --git a/csc.dtd b/csc.dtd
index 6a8d1ea..e199288 100644 (file)
--- a/csc.dtd
+++ b/csc.dtd
@@ -1,12 +1,11 @@
 <!ELEMENT cscpage (biglogo*, section*, header*, footer*)>
 <!ATTLIST cscpage
-  title CDATA #REQUIRED
-  morestyle CDATA "">
+  title CDATA #REQUIRED>
 
 <!ELEMENT biglogo EMPTY>
 <!ELEMENT section (#PCDATA)>
 <!ATTLIST section
-  title CDATA " ">
+  title CDATA #REQUIRED>
 <!ELEMENT header EMPTY>
 <!ELEMENT footer EMPTY>
 
diff --git a/stats.html b/stats.html
new file mode 100644 (file)
index 0000000..5ee8a9c
--- /dev/null
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Network Statistics</title>
+  <style type="text/css">
+    td {
+      padding: 2px 2px 8px 2px;
+      text-align: center;
+    }
+  </style>
+</head>
+<body>
+
+<table>
+  <tr>
+    <td colspan="2">IST:
+      <a href="http://noc.uwaterloo.ca/cn/Stats/intextday">Yesterday's External Stats</a> |
+      <a href="http://noc.uwaterloo.ca/cn/Stats/intextm2d">Month-to-Date External Stats</a> |
+      <a href="http://ist.uwaterloo.ca/cn/Stats/extvol.html">External Volume</a>|
+      <a href="http://noc.uwaterloo.ca/netstats/">More Graphs</a> |
+      <a href="http://noc.uwaterloo.ca/lg">Looking Glass</a>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">CSClub:
+      <a href="http://cacti.csclub.uwaterloo.ca/graph_view.php">More Graphs</a> |
+      <a href="http://bittorrent.csclub.uwaterloo.ca/">BitTorrent Tracker</a>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">ORION:
+      <a href="http://tech.orion.on.ca/orionmap/south.html">"South" Network Map</a> |
+      <a href="http://tech.orion.on.ca/orionmap/north.html">"North" Network Map</a> |
+      <a href="http://tech.orion.on.ca/orionmap/tera.html">"Toronto" Network Map</a> |
+      <a href="http://tech.orion.on.ca/mrtg/DIST1-WTLO.html">Waterloo Graphs</a> |
+      <a href="http://tech.orion.on.ca/cgi/lg.cgi">Looking Glass</a>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Cogent Interface (500 Mbps)</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi1&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="Cogent Interface (500 Mbps)"/>
+    </td>
+    <td>
+      <b>ORION Interface (1 Gbps)</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi2&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="ORION Interface (1 Gbps)" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Campus Interface (1 Gbps)</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi0&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="Campus Interface (1 Gbps)" />
+    </td>
+    <td>
+      <b>External Router Utilization</b><br/>
+      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_cpu&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="External Router Utilization" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>ORION: Waterloo &lt;-&gt; London</b><br/>
+      <img src="http://tech.orion.on.ca/mrtg/DIST1-LOND/10.10.2.1_24-day.png" alt="ORION: Waterloo &lt;-&gt; London" />
+    </td>
+    <td>
+      <b>ORION: Waterloo &lt;-&gt; Guelph</b><br/>
+      <img src="http://tech.orion.on.ca/mrtg/DIST1-WTLO/10.10.3.1_54-day.png" alt="ORION: Waterloo &lt;-&gt; Guelph"/>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=533&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="natural-flavours - Traffic - eth0" />
+    </td>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?local_graph_id=662&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="ginseng - Traffic - e100g0" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=480&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="citric-acid - Traffic - eth0" />
+    </td>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=542&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="taurine - Traffic - eth0" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=538&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="artificial-flavours - Traffic - eth0" />
+    </td>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=482&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="glucose-fructose - Traffic - eth0" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=537&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="staples.cmclub - Traffic - eth0" />
+    </td>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=579&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="caffeine - Traffic - eth0" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=532&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="CSC &lt;-&gt; CS Backbone" />
+    </td>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=541&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="CS &lt;-&gt; IST Backbone" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=583&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="csclub.uwaterloo.ca - Requests" />
+    </td>
+    <td>
+      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=596&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="mirror.csclub.uwaterloo.ca - Requests" />
+    </td>
+  </tr>
+</table>
+
+</body>
+</html>
diff --git a/stats.xml b/stats.xml
deleted file mode 100644 (file)
index f7f301c..0000000
--- a/stats.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE cscpage SYSTEM "csc.dtd">
-
-<cscpage title="Network Statistics" morestyle="td {
-      padding: 2px 2px 8px 2px;
-      text-align: center;
-    }">
-<header/>
-<section >
-<table>
-  <tr>
-    <td colspan="2">IST:
-      <a href="http://noc.uwaterloo.ca/cn/Stats/intextday">Yesterday's External Stats</a> |
-      <a href="http://noc.uwaterloo.ca/cn/Stats/intextm2d">Month-to-Date External Stats</a> |
-      <a href="http://ist.uwaterloo.ca/cn/Stats/extvol.html">External Volume</a>|
-      <a href="http://noc.uwaterloo.ca/netstats/">More Graphs</a> |
-      <a href="http://noc.uwaterloo.ca/lg">Looking Glass</a>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">CSClub:
-      <a href="http://cacti.csclub.uwaterloo.ca/graph_view.php">More Graphs</a> |
-      <a href="http://bittorrent.csclub.uwaterloo.ca/">BitTorrent Tracker</a>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">ORION:
-      <a href="http://tech.orion.on.ca/orionmap/south.html">"South" Network Map</a> |
-      <a href="http://tech.orion.on.ca/orionmap/north.html">"North" Network Map</a> |
-      <a href="http://tech.orion.on.ca/orionmap/tera.html">"Toronto" Network Map</a> |
-      <a href="http://tech.orion.on.ca/mrtg/DIST1-WTLO.html">Waterloo Graphs</a> |
-      <a href="http://tech.orion.on.ca/cgi/lg.cgi">Looking Glass</a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Cogent Interface (500 Mbps)</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi1&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="Cogent Interface (500 Mbps)"/>
-    </td>
-    <td>
-      <b>ORION Interface (1 Gbps)</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi2&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="ORION Interface (1 Gbps)" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Campus Interface (1 Gbps)</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_gi0&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="Campus Interface (1 Gbps)" />
-    </td>
-    <td>
-      <b>External Router Utilization</b><br/>
-      <img src="http://noc.uwaterloo.ca/cgi-bin/14all.cgi?log=cn-rtext_cpu&amp;cfg=cn-rtext.cfg&amp;png=daily" alt="External Router Utilization" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>ORION: Waterloo &lt;-&gt; London</b><br/>
-      <img src="http://tech.orion.on.ca/mrtg/DIST1-LOND/10.10.2.1_24-day.png" alt="ORION: Waterloo &lt;-&gt; London" />
-    </td>
-    <td>
-      <b>ORION: Waterloo &lt;-&gt; Guelph</b><br/>
-      <img src="http://tech.orion.on.ca/mrtg/DIST1-WTLO/10.10.3.1_54-day.png" alt="ORION: Waterloo &lt;-&gt; Guelph"/>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=533&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="natural-flavours - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?local_graph_id=662&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="ginseng - Traffic - e100g0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=480&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="citric-acid - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=542&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="taurine - Traffic - eth0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=538&amp;rra_id=1&amp;graph_height=120&amp;graph_width=440" alt="artificial-flavours - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=482&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="glucose-fructose - Traffic - eth0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=537&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="staples.cmclub - Traffic - eth0" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=579&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="caffeine - Traffic - eth0" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=532&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="CSC &lt;-&gt; CS Backbone" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=541&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="CS &lt;-&gt; IST Backbone" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=583&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="csclub.uwaterloo.ca - Requests" />
-    </td>
-    <td>
-      <img src="http://cacti.csclub.uwaterloo.ca/graph_image.php?action=view&amp;local_graph_id=596&amp;rra_id=0&amp;graph_height=120&amp;graph_width=440" alt="mirror.csclub.uwaterloo.ca - Requests" />
-    </td>
-  </tr>
-</table>
-</section>
-<footer />
-</cscpage>
index 7b1500b..218f65d 100644 (file)
           type="application/rss+xml" />
       <title><xsl:value-of select="@title" /></title>
       <link rel="stylesheet" href="{$g_pre}default.css" type="text/css" />
-      <xsl:if test="@morestyle">
-      <style>
-       <xsl:value-of select="@morestyle" />
-      </style>
-      </xsl:if>
     </head>
     <body><div class="content">
       <a id="pagetop" />
@@ -37,7 +32,7 @@
   <xsl:if test="@anchor">
     <a id="{@anchor}" />
   </xsl:if>
-    <h2><xsl:value-of select="@title" /></h2>
+  <h2><xsl:value-of select="@title" /></h2>
   <xsl:apply-templates />
 </xsl:template>