[pypy-svn] r40776 - in pypy/dist/pypy/tool/build/web: templates theme

guido at codespeak.net guido at codespeak.net
Mon Mar 19 16:17:50 CET 2007


Author: guido
Date: Mon Mar 19 16:17:48 2007
New Revision: 40776

Modified:
   pypy/dist/pypy/tool/build/web/templates/build.html
   pypy/dist/pypy/tool/build/web/templates/buildersinfo.html
   pypy/dist/pypy/tool/build/web/templates/builds.html
   pypy/dist/pypy/tool/build/web/templates/metaserverstatus.html
   pypy/dist/pypy/tool/build/web/templates/nav.html
   pypy/dist/pypy/tool/build/web/theme/style.css
Log:
Applied some CSS and made some small changes in the HTML to be able to do so.


Modified: pypy/dist/pypy/tool/build/web/templates/build.html
==============================================================================
--- pypy/dist/pypy/tool/build/web/templates/build.html	(original)
+++ pypy/dist/pypy/tool/build/web/templates/build.html	Mon Mar 19 16:17:48 2007
@@ -4,9 +4,12 @@
     <link rel="stylesheet" type="text/css" href="%(vhostroot)s/style" />
   </head>
   <body>
-    %(nav)s
+    <div id="logo">
+      <img alt="PyPy" height="110" id="pyimg" src="http://codespeak.net/pypy/img/py-web1.png" width="149"/>
+    </div>
     <h2>Build %(id)s</h2>
-    <div class="infoblock">
+    %(nav)s
+    <div id="main" class="infoblock">
       %(url)[c
         <div>
           <span class="title">url:</span>

Modified: pypy/dist/pypy/tool/build/web/templates/buildersinfo.html
==============================================================================
--- pypy/dist/pypy/tool/build/web/templates/buildersinfo.html	(original)
+++ pypy/dist/pypy/tool/build/web/templates/buildersinfo.html	Mon Mar 19 16:17:48 2007
@@ -4,9 +4,12 @@
     <link rel="stylesheet" type="text/css" href="%(vhostroot)s/style" />
   </head>
   <body>
-    %(nav)s
+    <div id="logo">
+      <img alt="PyPy" height="110" id="pyimg" src="http://codespeak.net/pypy/img/py-web1.png" width="149"/>
+    </div>
     <h2>Connected build servers</h2>
-    <div class="builders">
+    %(nav)s
+    <div id="main" class="builders">
       %(builders)[b
         <div class="builder">
           <h3>%(hostname)s</h3>

Modified: pypy/dist/pypy/tool/build/web/templates/builds.html
==============================================================================
--- pypy/dist/pypy/tool/build/web/templates/builds.html	(original)
+++ pypy/dist/pypy/tool/build/web/templates/builds.html	Mon Mar 19 16:17:48 2007
@@ -4,35 +4,40 @@
     <link rel="stylesheet" type="text/css" href="%(vhostroot)s/style" />
   </head>
   <body>
-    %(nav)s
+    <div id="logo">
+      <img alt="PyPy" height="110" id="pyimg" src="http://codespeak.net/pypy/img/py-web1.png" width="149"/>
+    </div>
     <h2>Overview of builds</h2>
-    <p>
-      Here you see an overview of all builds, both completed (and available
-      for download) and waiting or in-progress ones, ordered by date. Click
-      on the build to get more information.
-    </p>
-    <table>
-      <thead>
-        <tr>
-          <th>id (link)</th>
-          <th>requested</th>
-          <th>started</th>
-          <th>ended</th>
-          <th>status</th>
-        </tr>
-      </thead>
-      <tbody>
-        %(builds)[b
+    %(nav)s
+    <div id="main">
+      <p>
+        Here you see an overview of all builds, both completed (and available
+        for download) and waiting or in-progress ones, ordered by date. Click
+        on the build to get more information.
+      </p>
+      <table>
+        <thead>
           <tr>
-            <td><a href="%(vhostroot)s%(href)s">%(id)s</a></td>
-            <td>%(request_time)s</td>
-            <td>%(build_start_time)s</td>
-            <td>%(build_end_time)s</td>
-            <td class="%(statusclass)s">%(status)s</td>
+            <th>id (link)</th>
+            <th>requested</th>
+            <th>started</th>
+            <th>ended</th>
+            <th>status</th>
           </tr>
-        %(builds)]b
-      </tbody>
-    </table>
+        </thead>
+        <tbody>
+          %(builds)[b
+            <tr>
+              <td><a href="%(vhostroot)s%(href)s">%(id)s</a></td>
+              <td>%(request_time)s</td>
+              <td>%(build_start_time)s</td>
+              <td>%(build_end_time)s</td>
+              <td class="%(statusclass)s">%(status)s</td>
+            </tr>
+          %(builds)]b
+        </tbody>
+      </table>
+    </div>
   </body>
 </html>
 

Modified: pypy/dist/pypy/tool/build/web/templates/metaserverstatus.html
==============================================================================
--- pypy/dist/pypy/tool/build/web/templates/metaserverstatus.html	(original)
+++ pypy/dist/pypy/tool/build/web/templates/metaserverstatus.html	Mon Mar 19 16:17:48 2007
@@ -4,15 +4,20 @@
     <link rel="stylesheet" type="text/css" href="%(vhostroot)s/style" />
   </head>
   <body>
-    %(nav)s
+    <div id="logo">
+      <img alt="PyPy" height="110" id="pyimg" src="http://codespeak.net/pypy/img/py-web1.png" width="149"/>
+    </div>
     <h2>Server status</h2>
-    <ul>
-      <li>Connected build servers: %(builders)s</li>
-      <li>Currently running builds: %(running)s</li>
-      <li>Builds done: %(done)s</li>
-      <li>Clients waiting for a build: %(waiting)s</li>
-      <li>Builds for which no suitable server is available: %(queued)s</li>
-    </ul>
+    %(nav)s
+    <div id="main">
+      <ul>
+        <li>Connected build servers: %(builders)s</li>
+        <li>Currently running builds: %(running)s</li>
+        <li>Builds done: %(done)s</li>
+        <li>Clients waiting for a build: %(waiting)s</li>
+        <li>Builds for which no suitable server is available: %(queued)s</li>
+      </ul>
+    </div>
   </body>
 </html>
 

Modified: pypy/dist/pypy/tool/build/web/templates/nav.html
==============================================================================
--- pypy/dist/pypy/tool/build/web/templates/nav.html	(original)
+++ pypy/dist/pypy/tool/build/web/templates/nav.html	Mon Mar 19 16:17:48 2007
@@ -1,6 +1,6 @@
 <ul class="sidebar">
   <li><a href="%(vhostroot)s/metaserverstatus">meta server status</a></li>
-  <li><a href="%(vhostroot)s/buildersinfo">connected build servers</a></li>
-  <li><a href="%(vhostroot)s/builds/">builds (both in-progress and done)</a></li>
+  <li><a href="%(vhostroot)s/buildersinfo">build servers</a></li>
+  <li><a href="%(vhostroot)s/builds/">builds</a></li>
 </ul>
 

Modified: pypy/dist/pypy/tool/build/web/theme/style.css
==============================================================================
--- pypy/dist/pypy/tool/build/web/theme/style.css	(original)
+++ pypy/dist/pypy/tool/build/web/theme/style.css	Mon Mar 19 16:17:48 2007
@@ -1,7 +1,22 @@
 body {
+  font: Verdana, Helvetica, Arial, sans-serif;
   background-color: white;
   color: black;
-  font: Times New Roman;
+}
+
+.sidebar {
+  width: 150px;
+  padding: 0px;
+  list-style-type: none;
+  position: absolute;
+}
+
+.sidebar a {
+  text-decoration: none;
+}
+
+#main {
+  padding-left: 170px;
 }
 
 .infoblock {
@@ -18,7 +33,6 @@
 
 .sub div {
   margin-left: 1em;
-  font-size: 0.8em;
 }
 
 td {



More information about the Pypy-commit mailing list