[open-ils-commits] r310 - in servres/trunk/conifer: . templates templates/components (gfawcett)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Apr 8 19:13:35 EDT 2009
Author: gfawcett
Date: 2009-04-08 19:13:34 -0400 (Wed, 08 Apr 2009)
New Revision: 310
Modified:
servres/trunk/conifer/TODO
servres/trunk/conifer/templates/components/course.xhtml
servres/trunk/conifer/templates/item_metadata.xhtml
servres/trunk/conifer/templates/item_relocate.xhtml
Log:
added 'relocate' to 'about' pages for consistency. Changed 'put under heading' to 'relocate'.
Modified: servres/trunk/conifer/TODO
===================================================================
--- servres/trunk/conifer/TODO 2009-04-08 21:23:24 UTC (rev 309)
+++ servres/trunk/conifer/TODO 2009-04-08 23:13:34 UTC (rev 310)
@@ -2,10 +2,12 @@
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.
-* does 'move to new heading' show up in the right places? Should be like 'edit'.
-
* need more than 10 results on physical-item search results.
* People should be able to register themselves into open courses.
Modified: servres/trunk/conifer/templates/components/course.xhtml
===================================================================
--- servres/trunk/conifer/templates/components/course.xhtml 2009-04-08 21:23:24 UTC (rev 309)
+++ servres/trunk/conifer/templates/components/course.xhtml 2009-04-08 23:13:34 UTC (rev 310)
@@ -38,7 +38,7 @@
<!-- !I'm really sorry, this is ugly, but I want
non-breaking spaces here, so that on long-named items,
the links will stay togeter. A better way? -->
- <span py:if="item.needs_meta_link()"><a href="${item.item_url('meta')}">about</a> </span><span py:if="edit">• <a href="${item.item_url('edit/')}">edit</a></span><span py:if="edit"> • <a href="${item.item_url('relocate/')}">put under heading</a></span>
+ <span py:if="item.needs_meta_link()"><a href="${item.item_url('meta')}">about</a> </span><span py:if="edit">• <a href="${item.item_url('edit/')}">edit</a></span><span py:if="edit"> • <a href="${item.item_url('relocate/')}">relocate</a></span>
</span>
</div>
<!-- !to show a full tree, uncomment the following: -->
Modified: servres/trunk/conifer/templates/item_metadata.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_metadata.xhtml 2009-04-08 21:23:24 UTC (rev 309)
+++ servres/trunk/conifer/templates/item_metadata.xhtml 2009-04-08 23:13:34 UTC (rev 310)
@@ -22,14 +22,17 @@
<body>
${course_banner(course)}
${nested_title(item)}
- <div py:if="is_editor">
- <div class="little_action_panel">
- <a href="edit/">Edit this item</a>
+ <div py:if="is_editor" class="little_action_panel">
+ <div>
+ <a href="edit/">Edit this item</a>
+ </div>
+ <div>
+ <a href="delete/">Delete this item</a>
+ </div>
+ <div>
+ <a href="relocate/">Relocate this item</a>
+ </div>
</div>
- <div class="little_action_panel">
- <a href="delete/">Delete this item</a>
- </div>
- </div>
<table class="metadata_table" style="margin-top: 1em;">
<tr><th>Title</th><td>${item.title}</td></tr>
<tr><th>Type</th><td>${item.get_item_type_display()}</td></tr>
Modified: servres/trunk/conifer/templates/item_relocate.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_relocate.xhtml 2009-04-08 21:23:24 UTC (rev 309)
+++ servres/trunk/conifer/templates/item_relocate.xhtml 2009-04-08 23:13:34 UTC (rev 310)
@@ -16,7 +16,7 @@
<h2>${title}</h2>
<p>Please choose the heading under which this item should be moved:</p>
<form action="." method="POST">
- <table>
+ <table class="metadata_table">
<tbody style="text-align: left;">
<tr><th>Item title:</th><td>${item.title}</td></tr>
<tr><th>Current heading:
More information about the open-ils-commits
mailing list