projects / syrup / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fc07887)
minor HTML adjustments; deleted an old template.
authorgfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Wed, 8 Apr 2009 23:13:41 +0000 (23:13 +0000)
committergfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Wed, 8 Apr 2009 23:13:41 +0000 (23:13 +0000)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@312 6d9bc8c9-1ec2-4278-b937-99fde70a366f

conifer/TODO patch | blob | history
conifer/templates/admin/index.xhtml patch | blob | history
conifer/templates/item_add_elec.xhtml patch | blob | history
conifer/templates/item_add_heading.xhtml patch | blob | history
conifer/templates/item_add_phys.xhtml [deleted file] patch | blob | history
conifer/templates/item_add_url.xhtml patch | blob | history
conifer/templates/item_metadata.xhtml patch | blob | history
conifer/templates/prefs.xhtml patch | blob | history
conifer/templates/search_results.xhtml patch | blob | history

diff --git a/conifer/TODO b/conifer/TODO
index e45827d..2f3768a 100644 (file)
--- a/conifer/TODO
+++ b/conifer/TODO
@@ -17,6 +17,10 @@ IMPORTANT:
 
 * accented characters in z3950 queries seem to fail. More tests needed.
 
+* manage z3950 targets? Search z3950 targets?
+
+* Send me email when my sites change?
+
 MAYBE:
 
 * Generating barcodes in emails, printable screens? (3 of 9 enough?)
diff --git a/conifer/templates/admin/index.xhtml b/conifer/templates/admin/index.xhtml
index 2c09a6e..295f37a 100644 (file)
--- a/conifer/templates/admin/index.xhtml
+++ b/conifer/templates/admin/index.xhtml
@@ -11,21 +11,16 @@ title = _('Administrative Options')
 <body>
   <h1>${title}</h1>
   <ul>
-    <li><a href="../djadmin/">Django Administrative UI</a></li>
-  </ul>
-
-  <ul>
-    <li><a href="checkout/">Charge/Discharge</a></li>
-  </ul>
-  <ul>
     <li><a href="terms/">Terms</a></li>
     <li><a href="depts/">Departments</a></li>
-    <li><a href="courses/">Courses</a></li>
     <li><a href="news/">News Items</a></li>
+    <!-- <li><a href="targets/">Z39.50 Targets</a></li> -->
   </ul>
+  <!-- <ul> -->
+  <!--   <li><a href="../zsearch/">Search Z39.50 Targets</a></li> -->
+  <!-- </ul> -->
   <ul>
-    <li><a href="targets/">Manage Z39.50 Targets</a></li>
-    <li><a href="../zsearch/">Search Z39.50 Targets</a></li>
+    <li><a href="../djadmin/">Django Administrative UI</a></li>
   </ul>
 </body>
 </html>
diff --git a/conifer/templates/item_add_elec.xhtml b/conifer/templates/item_add_elec.xhtml
index f17f03c..a66efc0 100644 (file)
--- a/conifer/templates/item_add_elec.xhtml
+++ b/conifer/templates/item_add_elec.xhtml
@@ -1,6 +1,6 @@
 <?python
 is_edit = bool(item.id)
-title = is_edit and _('Edit (electronic document)') or _('Add a new electronic document')
+title = is_edit and _('Edit an electronic document') or _('Add a new electronic document')
 course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -20,7 +20,6 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
     ${nested_title(parent_item)}
     ${offer_to_delete(item)}
     <h2>${title}</h2>
-    <h3>Metadata</h3>
     <div py:if="not is_edit">
       <form action=".?item_type=${item_type}" method="POST"
            enctype="multipart/form-data">
@@ -37,16 +36,16 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
 
     <div py:if="is_edit">
       <form action="." method="POST">
-       <table>
+       <table class="metadata_table">
          <tr><th>Title of document</th><td><input type="text" name="title"
          value="${item.title}"/></td></tr>
        </table>
        ${item_metadata_formset()}
        <p><input type="submit" value="Update title and metadata"/></p>
       </form>
-      <h3>File contents</h3>
+      <h2>File contents</h2>
       <form action="." method="POST" enctype="multipart/form-data">
-       <table>
+       <table class="metadata_table">
          <tr><th>File</th><td><input type="file" name="file"/></td></tr>
        </table>
        <p><input type="submit" value="Upload new file contents"/></p>
diff --git a/conifer/templates/item_add_heading.xhtml b/conifer/templates/item_add_heading.xhtml
index 426c550..88c238a 100644 (file)
--- a/conifer/templates/item_add_heading.xhtml
+++ b/conifer/templates/item_add_heading.xhtml
@@ -19,7 +19,7 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
     ${course_banner(course)}
     ${nested_title(parent_item)}
     ${offer_to_delete(item)}
-    <h3>${title}</h3>
+    <h2>${title}</h2>
     <form action=".?item_type=${item_type}" method="POST">
       <table class="metadata_table">
        <tr><th>Heading</th><td>
diff --git a/conifer/templates/item_add_phys.xhtml b/conifer/templates/item_add_phys.xhtml
deleted file mode 100644 (file)
index febc734..0000000
--- a/conifer/templates/item_add_phys.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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)}
-    ${offer_to_delete(item)}
-    <h3>${title}</h3>
-
-    <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>
-      <h3>Metadata</h3>
-      ${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_add_url.xhtml b/conifer/templates/item_add_url.xhtml
index 513bd8d..22771af 100644 (file)
--- a/conifer/templates/item_add_url.xhtml
+++ b/conifer/templates/item_add_url.xhtml
@@ -19,7 +19,7 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
     ${course_banner(course)}
     ${nested_title(parent_item)}
     ${offer_to_delete(item)}
-    <h3>${title}</h3>
+    <h2>${title}</h2>
     <form action=".?item_type=${item_type}" method="POST">
       <table class="metadata_table">
        <tr><th>Title</th><td><input type="text" name="title" value="${item.title}"/></td></tr>
diff --git a/conifer/templates/item_metadata.xhtml b/conifer/templates/item_metadata.xhtml
index 1740879..d35f681 100644 (file)
--- a/conifer/templates/item_metadata.xhtml
+++ b/conifer/templates/item_metadata.xhtml
@@ -54,7 +54,7 @@ is_editor = course.can_edit(request.user)
       </table>
     </div>
     <div py:if="metadata">
-      <h3>Additional metadata</h3>
+      <h2 class="metadata_subhead">Additional metadata</h2>
       <table class="metadata_table">
        <tr py:for="attr in metadata">
          <th>${attr.get_name_display()}</th>
diff --git a/conifer/templates/prefs.xhtml b/conifer/templates/prefs.xhtml
index 2ad2cd0..b812ea3 100644 (file)
--- a/conifer/templates/prefs.xhtml
+++ b/conifer/templates/prefs.xhtml
@@ -22,6 +22,7 @@ title = _('Preferences')
 <div py:if="user.is_authenticated()">
   <h2>Notification preferences</h2>
   <form action="." method="POST">
+    <p><b>This doesn't work yet.</b></p>
     <input type="checkbox" name="wants_email_notices" id="id_wants_email_notices"
           py:attrs="{'checked':user.get_profile().wants_email_notices or None}"/>
     <label for="id_wants_email_notices">I would like to receive emails when new items are added to my course sites.</label>
diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml
index 80b88c5..fc195a2 100644 (file)
--- a/conifer/templates/search_results.xhtml
+++ b/conifer/templates/search_results.xhtml
@@ -18,9 +18,9 @@ courses = course_list
 <body>
     <h1>${title}</h1>
     
-    <h3 py:if="query_string">
+    <h2 py:if="query_string">
         You searched: <i>${query_string}</i>
-    </h3>
+    </h2>
 
     <!-- not sure if this is the best way to do this -->
     <!-- 
Syrup working repo (MassLNC)