big CSS/HTML overhaul to make Syrup look okay in IE6 (hopefully IE7 too)

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@313 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/conifer/TODO b/conifer/TODO
index 2f3768a..750637c 100644 (file)
--- a/conifer/TODO
+++ b/conifer/TODO
@@ -2,8 +2,6 @@ CRITICAL:
 
 IMPORTANT:
 
-* does 'move to new heading' show up in the right places? Should be like 'edit'.
-
 * CSS fixes for Internet Explorer. It looks crappy in IE.
 
 * if someone has item checked out, show due date/time on item-about page.

diff --git a/conifer/genshi_support.py b/conifer/genshi_support.py
index da40313..3231fb1 100644 (file)
--- a/conifer/genshi_support.py
+++ b/conifer/genshi_support.py
@@ -7,6 +7,7 @@ import genshi.output
 from django.conf import settings
 import gettext
 from conifer.middleware.genshi_locals import get_request
+import genshi
 
 #------------------------------------------------------------
 # set up internationalization
@@ -47,5 +48,5 @@ def _inject_django_things_into_namespace(request, ns):
 def render(tname, _django_type=HttpResponse, _serialization='xhtml', **kwargs):
     request = get_request()
     _inject_django_things_into_namespace(request, kwargs)
-    return _django_type(template(tname).generate(**kwargs).render(_serialization))
+    return _django_type(template(tname).generate(**kwargs).render(_serialization, doctype='xhtml'))
 

diff --git a/conifer/static/main.css b/conifer/static/main.css
index cda24f4..07644e9 100644 (file)
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -1,6 +1,53 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+       margin: 0;
+       padding: 0;
+       border: 0;
+       outline: 0;
+       font-weight: inherit;
+       font-style: inherit;
+       font-size: 100%;
+       font-family: inherit;
+       vertical-align: baseline;
+}
+/* remember to define focus styles! */
+:focus {
+       outline: 0;
+}
+body {
+       line-height: 1;
+       color: black;
+       background: white;
+}
+ol, ul {
+       list-style: none;
+}
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+       border-collapse: separate;
+       border-spacing: 0;
+}
+caption, th, td {
+       text-align: left;
+       font-weight: normal;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+       content: "";
+}
+blockquote, q {
+       quotes: "" "";
+}
+
 /* General look and feel */
 
-* {  font-family: sans-serif; }
+body * {  font-family: Verdana, sans-serif; }
 pre, code { font-family: monospace; }
 
 body, html { margin: 0; padding: 0; }
@@ -12,40 +59,41 @@ body {
 
 div#outer {
     background-color: white; 
-    width: 960; margin-bottom: 50;
+    width: 960px; margin-bottom: 50px;
     margin-left: auto; margin-right: auto;
 }
-#mainpanel {  background-color: white; padding: 0 12 24 12; 
-min-height: 300; 
+#mainpanel {  background-color: white; padding: 0 12px 24px 12px; 
+min-height: 300px; 
 }
 
 /* General headers and footers */
 
 #header, #footer {
-    color: white; padding: 8 8 8 8;
+    color: white; padding: 8px 4px 12px 8px;
     background-color: #448;
 }
 
 #header div#search {
-    position: relative;
-    top: -5px;
     float: right;
-    margin: 0.2em 0 0 0;
-    padding:0 0.2em 0 0.5em;
+    margin: 0;
     color: #ccc;
 }
 
-#brandheader { background-color: white; padding: 8; }
+#header #welcome {
+    margin-top: 4px;
+}
 
-#header a { color: #fff; font-weight: bold;  padding: 8 6; }
-#header a.loginbutton { background-color: #a44; padding: 8 16; }
+#brandheader { background-color: white; padding: 8px; }
+
+#header a { color: #fff; font-weight: bold;  padding: 8px 6px; }
+#header a.loginbutton { background-color: #a44; padding: 8px 16px; }
 #header a:hover { background-color: #fb7; color: black; text-decoration: none; }
 
 tbody td, tbody th { vertical-align: top; }
 
 #footer {  
-    margin: 12;
-    padding-bottom: 12;
+    margin: 12px;
+    padding-bottom: 12px;
     background-color: #ddf; 
     color: black;
     border-bottom: white 10px solid;
@@ -53,12 +101,12 @@ tbody td, tbody th { vertical-align: top; }
 
 /* heading sizes and colours. */
 
-h1 { font-size: 150%;  }
-h2 { font-size: 125%; }
-h3 { font-size: 120%; }
-
-h1 { color: navy; }
-h2 { color: #336; }
+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; }
+h1 { color: navy; margin: 36px 0 18px 0; }
+h2 { color: #336; margin: 24px 0 12px 0; }
 h3, h4 { color: darkgreen; }
 h1 a, h2 a { color: navy; }
 
@@ -73,9 +121,9 @@ a:hover {  text-decoration: underline;  }
 /* actions (e.g. "edit user" link) */
 .action a { font-weight: bold; }
 
-#tabbar { margin: 18 0; padding: 0; clear: both; }
+#tabbar { margin: 18px 0; padding: 0; clear: both; }
 #tabbar li { display: inline; }
-#tabbar li a { padding: 18 18 4 18; background-color: #ddf; color: black; text-decoration: none; }
+#tabbar li a { padding: 16px 18px 5px 18px; background-color: #ddf; color: black; text-decoration: none; }
 #tabbar li a:hover { background-color: #fc8; }
 
 /* 
@@ -87,96 +135,97 @@ a:hover {  text-decoration: underline;  }
 }
 
 .pagination_controls .nums {
-    padding: 0 24; 
+    padding: 0 24px; 
 }
 
-.pagetable td { border: #ddd 1px solid; padding: 4 8; }
+.pagetable td { border: #ddd 1px solid; padding: 4px 8px; }
 .pagetable .odd {
     background-color: #F8F8F8;
 }
-.pagetable thead th { font-size: smaller; text-align: left; padding: 2 8; }
+.pagetable thead th { font-size: smaller; text-align: left; padding: 2px 8px; }
 
 
 /* nested titles: like breadcrumbs when drilling into an itemtree */
 
-.nestedtitle h2 { margin-top: 8; }
+.nestedtitle h2 { margin-top: 8px; }
 .nestedtitle a { color: navy; }
 
 span.final_item { font-weight: bold; font-size: 110%; }
 
 /* item trees (tree of headings and items in a course */
 
-#treepanel { width: 750px; }
+#sidepanel { width: 183px; float: right; text-align: right;}
+#sidepanel div { margin: 6px 0; }
+
+#treepanel { width: 740px; }
 
 .itemtree { 
-padding-left: 15;
+    margin-left: 20px;
+    padding-left: 20px;
     list-style-type: none; 
-    list-style-position: inside;
 }
 
-.itemtree .itemtree li { 
-    padding-left: 25;
-}
+.itemtree .itemtree { margin-left: 30px; padding-left: 0; }
 
-.itemtree .itemtree { margin-left: 0;}
+.itemtree li { padding-left: 0; margin-left: 0; } 
 
-/* .itemtree li { width: 400; } */
+.itemtree li { margin: 12px 8px; }
+.itemtree li .mainline { padding-left: 8px; }
 
-.itemtree .metalink { padding-left: 8; color: gray; }
+.itemtree .metalink { padding-left: 8px; color: gray; }
 .itemtree .metalink a {
     color: gray; 
 }
 
-.itemtree .editlinks   { padding-left: 12; color: gray; 
+.itemtree .editlinks   { padding-left: 12px; color: gray; 
                         font-size: small;
                     }
 .itemtree .editlinks a { color: navy; }
 
 .itemadd { 
-    margin-top: 30; font-size: 90%;
-    padding: 10; background-color: #eef; 
+    margin-top: 30px; font-size: 90%;
+    padding: 10px; 
+    background-color: #eef; 
     clear: both;
 }
-.itemadd a { color: navy; }
+.itemadd li {     
+    margin: 10px; 
+}
 
-.itemtree li .mainline { margin-left: 24; }
+.itemadd a { color: navy; }
 
 /* specialized display of items in tree, by type */
 
 .itemtree li.item_HEADING { 
     list-style-image: url(tango/folder.png);
-    margin: 9 0; 
 }
 .itemtree li.item_HEADING > a { 
     color: navy; 
 }
 
-li.item_HEADING > .mainline {
-    margin-bottom: 12;
+li.item_HEADING .headingmainline {
+    margin-bottom: 12px;
 }
 
-li.item_HEADING > div.mainline  a.mainlink {
+li.item_HEADING .headingmainline  a.mainlink {
     border-bottom: #aaa 1px solid; 
 }
 
-li.item_HEADING > .mainline a.mainlink:hover {
+li.item_HEADING  .headingmainline a.mainlink:hover {
     border-bottom: none;
 }
 
 .itemtree li.item_ELEC { 
     list-style-image: url(tango/document.png);
-    margin-top: 4;
 }
 
 .itemtree li.item_URL { 
     list-style-image: url(tango/applications-internet.png);
-    margin-top: 4;
 }
 
 .itemtree li.item_PHYS { 
     /* fixme: need a better icon */
     list-style-image: url(tango/x-office-address-book.png);
-    margin-top: 4;
 }
 
 
@@ -203,33 +252,29 @@ li.item_HEADING > .mainline a.mainlink:hover {
 }
 
 
-p.todo, div.todo { background-color: #fdd; padding: 6; margin: 12; border-left: #d99 6px solid; }
+p.todo, div.todo { background-color: #fdd; padding: 6px; margin: 12px; border-left: #d99 6px solid; }
 
 
 .newsitem { 
-    max-width: 600;
+    max-width: 600px;
 }
 .newsitem .newsdate { 
-    margin: 4 0 8 0; text-align: right; 
+    margin: 4px 0 8px 0; text-align: right; 
     font-size: 80%; color: navy;
 }
 
 .menublockopener { margin-left: 0.25em; color: #bbb !important; font-weight: normal !important; }
-.menublock { background-color: #f2e4cc; font-size: 95%; padding: 1 4; }
-
-#coursebanner { background-color: #f2e4cc; margin: -12 -12 0 -12; padding: 8; }
-
-#coursebanner h1 { padding: 0; font-size: 125%; }
+.menublock { background-color: #f2e4cc; font-size: 95%; padding: 1px 4px; }
 
-#edit_course_link { margin: 8 0 8 0; font-size: 95%; }
+#coursebanner { background-color: #f2e4cc; margin: -12px -12px 12px -12px; padding: 8px; }
+#coursesearch { float: right; }
+#coursebanner h1 { margin: 12px 0; font-size: 125%; }
 
-#feeds_panel,
-.little_action_panel
-{ float: right; font-size: 95%; margin: 8 0; clear: both; text-align: right; }
+#edit_course_link { margin: 8px 0 8px 0; font-size: 95%; }
 
 
-.breadcrumbs { margin: 8 8 8 0; width: 800; 
-            text-indent: -24; padding-left: 24; }
+#breadcrumbs { margin: 8px 0px 16px 0; width: 716px;  
+            text-indent: -24px; padding-left: 24px; }
 
 .errorlist { float: right; }
 .errorlist li { color: red; font-size: 90%; }
@@ -237,43 +282,45 @@ p.todo, div.todo { background-color: #fdd; padding: 6; margin: 12; border-left:
 
 /* a nice table-style for forms. */
 .formtable tbody th { 
-    padding: 0 8 16 0;
-    width: 200; 
+    padding: 0 8px 16px 0;
+    width: 200px; 
     text-align: left; 
     font-size: 90%;
     font-weight: normal; 
 }
 
+thead th { padding: 8px; font-weight: bold; font-size: 90%; }
 .metadata_table tbody th,
 .metadata_table tbody td {
-    padding: 8; border: #ddd 1px solid;
+    padding: 8px; border: #ddd 1px solid;
 }
-.metadata_table input { width: 600; }
+.metadata_table input { width: 600px; }
+.metadata_table .meta3 input { width: 10px; }
 
 .metadata_table tbody th {
     background-color: #eee;
 }
    
-.metadata_table a.bigdownload { padding: 8 58; font-weight: bold; font-size: 105%; }
+.metadata_table a.bigdownload { padding: 8px 58px; font-weight: bold; font-size: 105%; }
 .metadata_table a.bigdownload:hover { background-color: #dfd; color: black; }
 
-h2.metadata_subhead {font-size: 105%; padding: 0; margin: 18 0 9 0;}
+h2.metadata_subhead {font-size: 105%; padding: 0; margin: 18px 0 9px 0;}
 
 .metadata_table tbody th {
-    text-align: left; width: 120;
+    text-align: left; width: 120px;
 }
-.gap { height: 24; }
+.gap { height: 24px; }
 
 /* panels that appear when specific OPTIONs or radio-buttons are selected. */
-.specific { padding: 8; margin: 0 16; background-color: #eef; }
+.specific { padding: 8px; margin: 0 16px; background-color: #eef; }
 
 
 li.sort_item { margin-top: 20px !important;
-            border: gray 1px dotted; width: 400; }
+            border: gray 1px dotted; width: 400px; }
 
 li.sort_item:hover { background-color: #eee; }
 
 ul.heading_tree li  { list-style: none; }
 ul.heading_tree { margin: 0; padding-left: 0; }
-ul.heading_tree ul { margin: 0; padding-left: 25; }
+ul.heading_tree ul { margin: 0; padding-left: 25px; }
 

diff --git a/conifer/templates/admin/index.xhtml b/conifer/templates/admin/index.xhtml
index 295f37a..2d7c4aa 100644 (file)
--- a/conifer/templates/admin/index.xhtml
+++ b/conifer/templates/admin/index.xhtml
@@ -10,6 +10,7 @@ title = _('Administrative Options')
 </head>
 <body>
   <h1>${title}</h1>
+  <div class="itemadd">
   <ul>
     <li><a href="terms/">Terms</a></li>
     <li><a href="depts/">Departments</a></li>
@@ -22,5 +23,6 @@ title = _('Administrative Options')
   <ul>
     <li><a href="../djadmin/">Django Administrative UI</a></li>
   </ul>
+  </div>
 </body>
 </html>

diff --git a/conifer/templates/browse_index.xhtml b/conifer/templates/browse_index.xhtml
index 64df7ba..a47de56 100644 (file)
--- a/conifer/templates/browse_index.xhtml
+++ b/conifer/templates/browse_index.xhtml
@@ -13,6 +13,7 @@ title = _('Browse the Reserves')
   (Note: some course materials may require you
     to <a href="${ROOT}/accounts/login/?next=${ROOT}/">log in</a>)
     <h2>Choose from one of the options below:</h2>
+    <div class="itemadd">
     <ul>
         <li><a href="courses">Browse by Course Name</a></li>
         <li><a 
@@ -20,6 +21,7 @@ title = _('Browse the Reserves')
         <li><a  
                href="departments">Browse by Department</a></li>
     </ul>
+    </div>
   <div class="gap"/>
 </body>
 </html>

diff --git a/conifer/templates/components/course.xhtml b/conifer/templates/components/course.xhtml
index 64e45e7..0ff52da 100644 (file)
--- a/conifer/templates/components/course.xhtml
+++ b/conifer/templates/components/course.xhtml
@@ -6,8 +6,7 @@ searchtext = _('search this course...')
       xmlns:xi="http://www.w3.org/2001/XInclude"
       py:strip="">
   
-  <div py:def="course_search(course)"
-       id="coursesearch" style="float: right;">
+  <div py:def="course_search(course)" id="coursesearch" style="float: right;">
     <form method="get" action="${course.course_url('search')}" 
          onsubmit="if(q.value.replace(/^\s*/, '').replace(/\s*$/, '') =='') return false;">
       <input id="q" name="q" maxlength="100" size="25" type="text" 
@@ -18,11 +17,10 @@ searchtext = _('search this course...')
   
   <div py:def="course_banner(course)" py:strip="True">
     <div id="coursebanner">
-      <div class="deptident">${course.department}</div>
       ${course_search(course)}
+      <div class="deptident">${course.department}</div>
       <h1><a href="${course.course_url()}"><span py:if="course.code">${course.code}: </span>${course.title}</a></h1>
     </div>
-      <div id="feeds_panel"><a href="${course.course_url('feeds/')}">Feeds</a></div>
   </div>
   
   <!-- !show_tree: display a tree of items in a hierarchical style. -->
@@ -31,7 +29,7 @@ searchtext = _('search this course...')
       class="itemtree">
     <li py:for="item, subs in tree" class="item_${item.item_type} an_item"
        id="item_${item.id}">
-      <div class="mainline">
+      <div class="mainline ${item.item_type=='HEADING' and 'headingmainline' or ''}">
        <a href="${item.item_url()}" class="mainlink">${item}</a> 
        <span class="menublock" py:if="not (item.item_type=='HEADING' and not edit)">
 
@@ -62,7 +60,7 @@ searchtext = _('search this course...')
        py:if="item"
        py:with="hier=item.hierarchy()[:-1]; lastnum=len(hier)"
        class="nestedtitle">
-    <div class="breadcrumbs">
+    <div id="breadcrumbs">
       <span><a href="${item.course.course_url()}">Top</a></span> &raquo;
       <span py:for="n, x in enumerate(hier)"><a href="${x.item_url()}">${x.title}</a> &raquo; </span>
       <span class="final_item">${item.title}</span>
@@ -99,8 +97,7 @@ searchtext = _('search this course...')
        </thead>
        <tbody>
        <tr py:for="form in metadata_formset.forms">
-         <!-- <td style="border: gray 1px solid; padding: 4; ">${Markup(form.as_p())}</td> -->
-         <td py:for="cell in form">${Markup(cell)}</td>
+         <td py:if="cell" class="meta${n}" py:for="n, cell in enumerate(form)">${Markup(cell)}</td>
        </tr>
        </tbody>
       </table>

diff --git a/conifer/templates/course_detail.xhtml b/conifer/templates/course_detail.xhtml
index 9a1047b..11dcaaf 100644 (file)
--- a/conifer/templates/course_detail.xhtml
+++ b/conifer/templates/course_detail.xhtml
@@ -17,13 +17,15 @@ is_editor = course.can_edit(request.user)
     <p py:if="not item_tree">
       There are no items associated with this course yet.
     </p>
-    <div py:if="is_editor" id="edit_course" class="little_action_panel">
-      <a href="${course.course_url()}edit/">Edit course details</a>
+    <div id="sidepanel">
+      <div py:if="is_editor" id="edit_course" class="little_action_panel">
+       <a href="${course.course_url()}edit/">Edit course details</a>
+      </div>
+      <div id="showtree_panel" class="little_action_panel">
+       <a href="javascript:doToggleItemTree();">Show/hide tree</a>
+      </div>
+      <div py:if="is_editor">${item_resequence_panel()}</div>
     </div>
-    <div id="showtree_panel" class="little_action_panel">
-      <a href="javascript:doToggleItemTree();">Show/hide tree</a>
-    </div>
-    <div py:if="is_editor">${item_resequence_panel()}</div>
     <div id="treepanel">
       ${show_tree(item_tree, edit=is_editor)}
     </div>

diff --git a/conifer/templates/generic/delete.xhtml b/conifer/templates/generic/delete.xhtml
index fb681f7..f3d5ce9 100644 (file)
--- a/conifer/templates/generic/delete.xhtml
+++ b/conifer/templates/generic/delete.xhtml
@@ -11,7 +11,7 @@ title = _('Delete %s?') % form.Meta.model.__name__
 <body>
   <h1>${title}</h1>
   <form action="delete" method="POST">
-  <table>
+  <table class="metadata_table">
     <tr>
       <th>${form.Meta.model.__name__}</th>
       <td>${instance}</td>

diff --git a/conifer/templates/generic/edit.xhtml b/conifer/templates/generic/edit.xhtml
index f99ed1a..79fdecd 100644 (file)
--- a/conifer/templates/generic/edit.xhtml
+++ b/conifer/templates/generic/edit.xhtml
@@ -14,7 +14,7 @@ else:
 <body>
   <h1>${title}</h1>
   <form action="." method="POST">
-  <table>${Markup(form.as_table())}</table>
+  <table class="metadata_table">${Markup(form.as_table())}</table>
   <p><input type="submit" value="Save changes"/></p>
   <p><a href="../">Cancel changes</a></p>
   <p><a href="delete">Delete this record</a></p>

diff --git a/conifer/templates/item_add_phys.xhtml b/conifer/templates/item_add_phys.xhtml
new file mode 100644 (file)
index 0000000..b575d9d
--- /dev/null
+++ b/conifer/templates/item_add_phys.xhtml
@@ -0,0 +1,39 @@
+<?python
+is_edit = bool(item.id)
+title = is_edit and _('Edit a physical-item request') or _('Add a physical-item request')
+course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+  <xi:include href="master.xhtml"/>
+  <xi:include href="components/course.xhtml"/>
+  <head>
+    <title>${title}</title>
+    <script type="text/javascript">
+      $(function() {$('input[name="title"]').focus();});
+    </script>
+  </head>
+  <body>
+    ${course_banner(course)}
+    ${nested_title(parent_item)}
+    <div id="sidepanel">${offer_to_delete(item)}</div>
+    <h2>${title}</h2>
+
+    <form action=".?item_type=${item_type}" method="POST">
+      <table class="metadata_table">
+       <tr>
+         <th>Display name</th>
+         <td><input type="text" name="title" value="${item.title}"/></td>
+       </tr>
+      </table>
+      <h2>Metadata</h2>
+      ${item_metadata_formset(show_more=False)}
+      <p>
+       <input py:if="not is_edit" type="submit" value="Add heading"/>
+       <input py:if="is_edit" type="submit" value="Update physical-item request"/>
+      </p>
+
+    </form>
+</body>
+</html>

diff --git a/conifer/templates/item_heading_detail.xhtml b/conifer/templates/item_heading_detail.xhtml
index 80cc60a..8e9f5a0 100644 (file)
--- a/conifer/templates/item_heading_detail.xhtml
+++ b/conifer/templates/item_heading_detail.xhtml
@@ -16,8 +16,7 @@ item_tree = course.item_tree(subtree=item)
   </head>
   <body>
     ${course_banner(course)}
-    ${nested_title(item)}
-    <div py:if="is_editor" class="little_action_panel">
+    <div py:if="is_editor" id="sidepanel" class="little_action_panel">
       <div>
        <a href="edit/">Edit this heading</a>
       </div>
@@ -27,11 +26,13 @@ item_tree = course.item_tree(subtree=item)
       <div>
        <a href="relocate/">Relocate this heading</a>
       </div>
+      <div>${item_resequence_panel()}</div>
     </div>
+    ${nested_title(item)}
+
     <p py:if="not item_tree">
       There are no items in this section.
     </p>
-    <div py:if="is_editor">${item_resequence_panel()}</div>
     <div id="treepanel">
       ${show_tree(item_tree, edit=is_editor)}
     </div>

diff --git a/conifer/templates/item_metadata.xhtml b/conifer/templates/item_metadata.xhtml
index d35f681..44f6c91 100644 (file)
--- a/conifer/templates/item_metadata.xhtml
+++ b/conifer/templates/item_metadata.xhtml
@@ -22,7 +22,7 @@ is_editor = course.can_edit(request.user)
   <body>
     ${course_banner(course)}
     ${nested_title(item)}
-    <div py:if="is_editor" class="little_action_panel">
+    <div py:if="is_editor" id="sidepanel">
       <div>
        <a href="edit/">Edit this item</a>
       </div>

diff --git a/conifer/templates/master.xhtml b/conifer/templates/master.xhtml
index 8947b00..b65dc24 100644 (file)
--- a/conifer/templates/master.xhtml
+++ b/conifer/templates/master.xhtml
@@ -22,11 +22,11 @@ import os
     <body py:attrs="select('@*')">
       <div id="outer">
       <div id="brandheader">
-       <div style="float: right; font-size: x-large; padding: 12; color: #888;">
+       <div style="float: right; font-size: x-large; padding: 12px; color: #888;">
          ${os.getpid()}
          ${app_name}
        </div>
-       <img src="${ROOT}/static/institution-logo.png" style="height: 50;"/>
+       <img src="${ROOT}/static/institution-logo.png" style="height: 50px;"/>
       </div>
         <!--
       <div id="header" py:if="user.is_authenticated()">
@@ -42,13 +42,13 @@ import os
                 onfocus="if(this.value=='${search}') this.value='';"/>
             </form>
         </div>
-      <span py:if="user.is_authenticated()">
-       <strong style="padding-right: 18;">Welcome, ${user.first_name or user.username}!</strong>
+      <div id="welcome" py:if="user.is_authenticated()">
+       <strong style="padding-right: 18px;">Welcome, ${user.first_name or user.username}!</strong>
        <a href="${ROOT}/accounts/logout">Log Out</a>
        &bull; <a href="${ROOT}/prefs/">Preferences</a>
-      </span>
+      </div>
       <span py:if="not user.is_authenticated()">
-       <strong style="padding-right: 18;">Welcome!</strong>
+       <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>

diff --git a/conifer/templates/welcome.xhtml b/conifer/templates/welcome.xhtml
index edc8482..7d2827b 100644 (file)
--- a/conifer/templates/welcome.xhtml
+++ b/conifer/templates/welcome.xhtml
@@ -10,6 +10,7 @@ news_items = models.NewsItem.objects.all().order_by('-published','-id')[0:5]
   <title>${title}</title>
 </head>
 <body>
+  <div id="treepanel">
   <p>Welcome! Please use the links above to browse the reserves, or to join and visit your course sites.</p>
   <div class="newsitem" py:for="news in news_items">
     <h2>${news.subject}</h2>
@@ -18,5 +19,6 @@ news_items = models.NewsItem.objects.all().order_by('-published','-id')[0:5]
     <span py:if="user.has_perm('change_newsitem')">&bull; <a href="admin/news/${news.id}/">edit</a></span></div>
   </div>
   <p py:if="user.has_perm('add_newsitem')"><a href="admin/news/0/">Add a news item</a></p>
+  </div>
 </body>
 </html>