[open-ils-commits] r316 - in servres/trunk/conifer: static templates (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2009-04-08 22:14:54 -0400 (Wed, 08 Apr 2009)
New Revision: 316

Modified:
   servres/trunk/conifer/static/main.css
   servres/trunk/conifer/templates/master.xhtml
   servres/trunk/conifer/templates/search_results.xhtml
Log:
tweak tweak

Modified: servres/trunk/conifer/static/main.css
===================================================================
--- servres/trunk/conifer/static/main.css	2009-04-09 02:02:24 UTC (rev 315)
+++ servres/trunk/conifer/static/main.css	2009-04-09 02:14:54 UTC (rev 316)
@@ -85,7 +85,7 @@
 
 #brandheader { background-color: white; padding: 8px; }
 
-#header a { color: #fff; font-weight: bold;  padding: 6px 12px 11px 12px; }
+#header a { color: #fff; font-weight: bold;  padding: 10px 12px 10px 12px; }
 #header a.loginbutton { background-color: #a44; }
 #header a:hover { background-color: #fb7; color: black; text-decoration: none; }
 
@@ -104,7 +104,7 @@
 h1 { font-size: 150%; font-weight: bold; }
 h2 { font-size: 125%; font-weight: bold; }
 h3 { font-size: 120%; font-weight: bold; }
-p { margin: 12px 0px; }
+p { margin: 24px 0px; }
 h1 { color: navy; margin: 36px 0 18px 0; }
 h2 { color: #336; margin: 24px 0 12px 0; }
 h3, h4 { color: darkgreen; }
@@ -131,14 +131,14 @@
 */
 
 .pagination_controls {
-    text-align: center;
+    text-align: center; margin: 12px 0;
 }
 
 .pagination_controls .nums {
-    padding: 0 24px; 
+    padding: 0 12px; 
 }
 
-.pagetable td { border: #ddd 1px solid; padding: 4px 8px; }
+.pagetable td { border: #ddd 1px solid; padding: 8px; }
 .pagetable .odd {
     background-color: #F8F8F8;
 }
@@ -247,10 +247,14 @@
   text-align: left;
 }
 
+table.topheading { width: 100%; }
 .topheading th {
     background-color: #ddf;
 }
 
+.topheading th, .topheading td {
+padding: 8px;
+}
 
 p.todo, div.todo { background-color: #fdd; padding: 6px; margin: 12px; border-left: #d99 6px solid; }
 

Modified: servres/trunk/conifer/templates/master.xhtml
===================================================================
--- servres/trunk/conifer/templates/master.xhtml	2009-04-09 02:02:24 UTC (rev 315)
+++ servres/trunk/conifer/templates/master.xhtml	2009-04-09 02:14:54 UTC (rev 316)
@@ -47,11 +47,11 @@
 	<a href="${ROOT}/accounts/logout">Log Out</a>
 	&bull; <a href="${ROOT}/prefs/">Preferences</a>
       </div>
-      <span py:if="not user.is_authenticated()">
+      <div id="welcome" py:if="not user.is_authenticated()">
 	<strong style="padding-right: 18px;">Welcome!</strong>
 	<a class="loginbutton" href="${ROOT}/accounts/login/">Log In</a>
 	&bull; <a href="${ROOT}/prefs/}">Preferences</a>
-      </span>
+      </div>
     </div>
       <xi:include py:if="user.is_authenticated()" href="tabbar.xhtml"/>
       <xi:include py:if="not user.is_authenticated()" href="tabbar_anonymous.xhtml"/>

Modified: servres/trunk/conifer/templates/search_results.xhtml
===================================================================
--- servres/trunk/conifer/templates/search_results.xhtml	2009-04-09 02:02:24 UTC (rev 315)
+++ servres/trunk/conifer/templates/search_results.xhtml	2009-04-09 02:14:54 UTC (rev 316)
@@ -49,13 +49,13 @@
         <!-- courses -->
         <td py:if="courses" valign="top" class="topbox">
         <table class="topheading">
-        <tr>
-        <th align="left">Course</th>
-        </tr>
-        <tr py:for="course in courses">
-            <!-- will highlight this, probably pull in dept info -->
-            <td><a href="../course/${course.id}/">${course.title}</a></td>
-        </tr>
+	  <tr>
+	    <th align="left">Course</th>
+	  </tr>
+	  <tr py:for="course in courses">
+	    <!-- will highlight this, probably pull in dept info -->
+	    <td><a href="../course/${course.id}/">${course.title}</a></td>
+	  </tr>
         <tr py:if="course_len > count">
         <td></td>
         <!-- will tap into open list here -->