projects / Syrup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 92fa5e3)
added 'relocate' to 'about' pages for consistency. Changed 'put under heading' to...
authorgfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Wed, 8 Apr 2009 23:13:34 +0000 (23:13 +0000)
committergfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Wed, 8 Apr 2009 23:13:34 +0000 (23:13 +0000)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@310 6d9bc8c9-1ec2-4278-b937-99fde70a366f

conifer/TODO patch | blob | history
conifer/templates/components/course.xhtml patch | blob | history
conifer/templates/item_metadata.xhtml patch | blob | history
conifer/templates/item_relocate.xhtml patch | blob | history

diff --git a/conifer/TODO b/conifer/TODO
index cd4c2e4..e45827d 100644 (file)
--- a/conifer/TODO
+++ b/conifer/TODO
@@ -2,10 +2,12 @@ CRITICAL:
 
 IMPORTANT:
 
-* 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'.
 
+* CSS fixes for Internet Explorer. It looks crappy in IE.
+
+* if someone has item checked out, show due date/time on item-about page.
+
 * need more than 10 results on physical-item search results.
 
 * People should be able to register themselves into open courses.
diff --git a/conifer/templates/components/course.xhtml b/conifer/templates/components/course.xhtml
index 712aa8a..64e45e7 100644 (file)
--- a/conifer/templates/components/course.xhtml
+++ b/conifer/templates/components/course.xhtml
@@ -38,7 +38,7 @@ searchtext = _('search this course...')
          <!-- !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>&#160;</span><span py:if="edit">&bull;&#160;<a href="${item.item_url('edit/')}">edit</a></span><span py:if="edit">&#160;&bull;&#160;<a href="${item.item_url('relocate/')}">put&#160;under&#160;heading</a></span>
+         <span py:if="item.needs_meta_link()"><a href="${item.item_url('meta')}">about</a>&#160;</span><span py:if="edit">&bull;&#160;<a href="${item.item_url('edit/')}">edit</a></span><span py:if="edit">&#160;&bull;&#160;<a href="${item.item_url('relocate/')}">relocate</a></span>
        </span>
       </div>
       <!-- !to show a full tree, uncomment the following: -->
diff --git a/conifer/templates/item_metadata.xhtml b/conifer/templates/item_metadata.xhtml
index 1bbe271..1740879 100644 (file)
--- a/conifer/templates/item_metadata.xhtml
+++ b/conifer/templates/item_metadata.xhtml
@@ -22,13 +22,16 @@ is_editor = course.can_edit(request.user)
   <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>
-    <div class="little_action_panel">
-      <a href="delete/">Delete this item</a>
-    </div>
+    <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>
     <table class="metadata_table" style="margin-top: 1em;">
       <tr><th>Title</th><td>${item.title}</td></tr>
diff --git a/conifer/templates/item_relocate.xhtml b/conifer/templates/item_relocate.xhtml
index 8724f48..cc5f068 100644 (file)
--- a/conifer/templates/item_relocate.xhtml
+++ b/conifer/templates/item_relocate.xhtml
@@ -16,7 +16,7 @@ title = 'Move item under a different heading'
     <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:
Syrup