[open-ils-commits] r312 - in servres/trunk/conifer: . templates templates/admin (gfawcett)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Apr 8 19:13:41 EDT 2009
Author: gfawcett
Date: 2009-04-08 19:13:41 -0400 (Wed, 08 Apr 2009)
New Revision: 312
Removed:
servres/trunk/conifer/templates/item_add_phys.xhtml
Modified:
servres/trunk/conifer/TODO
servres/trunk/conifer/templates/admin/index.xhtml
servres/trunk/conifer/templates/item_add_elec.xhtml
servres/trunk/conifer/templates/item_add_heading.xhtml
servres/trunk/conifer/templates/item_add_url.xhtml
servres/trunk/conifer/templates/item_metadata.xhtml
servres/trunk/conifer/templates/prefs.xhtml
servres/trunk/conifer/templates/search_results.xhtml
Log:
minor HTML adjustments; deleted an old template.
Modified: servres/trunk/conifer/TODO
===================================================================
--- servres/trunk/conifer/TODO 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/TODO 2009-04-08 23:13:41 UTC (rev 312)
@@ -17,6 +17,10 @@
* 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?)
Modified: servres/trunk/conifer/templates/admin/index.xhtml
===================================================================
--- servres/trunk/conifer/templates/admin/index.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/admin/index.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -11,21 +11,16 @@
<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>
Modified: servres/trunk/conifer/templates/item_add_elec.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_elec.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/item_add_elec.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -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 @@
${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 @@
<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>
Modified: servres/trunk/conifer/templates/item_add_heading.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_heading.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/item_add_heading.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -19,7 +19,7 @@
${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>
Deleted: servres/trunk/conifer/templates/item_add_phys.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_phys.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/item_add_phys.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -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>
Modified: servres/trunk/conifer/templates/item_add_url.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_url.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/item_add_url.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -19,7 +19,7 @@
${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>
Modified: servres/trunk/conifer/templates/item_metadata.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_metadata.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/item_metadata.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -54,7 +54,7 @@
</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>
Modified: servres/trunk/conifer/templates/prefs.xhtml
===================================================================
--- servres/trunk/conifer/templates/prefs.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/prefs.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -22,6 +22,7 @@
<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>
Modified: servres/trunk/conifer/templates/search_results.xhtml
===================================================================
--- servres/trunk/conifer/templates/search_results.xhtml 2009-04-08 23:13:38 UTC (rev 311)
+++ servres/trunk/conifer/templates/search_results.xhtml 2009-04-08 23:13:41 UTC (rev 312)
@@ -18,9 +18,9 @@
<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 -->
<!--
More information about the open-ils-commits
mailing list