display tweaks

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

diff --git a/conifer/templates/components/site.xhtml b/conifer/templates/components/site.xhtml
index fe2d8c3..27b1c25 100644 (file)
--- a/conifer/templates/components/site.xhtml
+++ b/conifer/templates/components/site.xhtml
@@ -105,12 +105,12 @@ searchtext = _('search this site...')
   </div>
   
   <div py:def="add_subs(parent=None)" class="itemadd">
-    <div>Add a new item:</div>
-    <ul py:with="prefix = (not parent) and 'item/0/' or ''">
-      <li><a href="${prefix}add/?item_type=HEADING">Subheading</a></li>
-      <li><a href="${prefix}add/?item_type=URL">URL</a></li>
-      <li><a href="${prefix}add/?item_type=ELEC">Electronic Document</a></li>
-      <li><a href="${prefix}add/?item_type=PHYS">Physical Item or Catalogued Electronic Item</a></li>
+    <div><b>Add a new item</b></div>
+    <ul class="itemtree" py:with="prefix = (not parent) and 'item/0/' or ''">
+      <li class="item_URL"><a href="${prefix}add/?item_type=URL">Link to external resource</a></li>
+      <li class="item_ELEC"><a href="${prefix}add/?item_type=ELEC">Uploaded electronic document</a></li>
+      <li class="item_PHYS"><a href="${prefix}add/?item_type=PHYS">Catalogued item (e.g., book)</a></li>
+      <li style="margin-top: 0;" class="item_HEADING"><a href="${prefix}add/?item_type=HEADING">Subheading</a></li>
     </ul>
   </div>
 

diff --git a/conifer/templates/item/item_add_url.xhtml b/conifer/templates/item/item_add_url.xhtml
index 2f66fb9..9b4b8fc 100644 (file)
--- a/conifer/templates/item/item_add_url.xhtml
+++ b/conifer/templates/item/item_add_url.xhtml
@@ -23,7 +23,7 @@ site.title = '%s: %s (%s)' % (site.course.code, site.course.name, site.term)
     ${nested_title(parent_item)}
     ${offer_to_delete(item)}
     <div py:if="not is_edit" style="float:right;">
-      <a href="javascript:void($('#refworks,.metadata_table').toggle());">Import RefWorks/RIS citation</a>
+      <a href="javascript:void($('#refworks,.metadata_table').toggle());">Import RIS</a>
     </div>
     <h2>${title}</h2>
 
@@ -53,8 +53,7 @@ site.title = '%s: %s (%s)' % (site.course.code, site.course.name, site.term)
       <p>
        <input py:if="not is_edit" type="submit" value="Add URL"/>
        <input py:if="is_edit" type="submit" value="Update URL"/>
-       ${go_back_link('../meta')}
-      </p>
+       ${go_back_link()}</p>
     </form>
 </body>
 </html>

diff --git a/conifer/templates/site_join.xhtml b/conifer/templates/site_join.xhtml
index cb152d3..b2b3df3 100644 (file)
--- a/conifer/templates/site_join.xhtml
+++ b/conifer/templates/site_join.xhtml
@@ -14,7 +14,7 @@ title = _('Join this site?')
     <h2>${title}</h2>
 
     <p>If you choose to join this site, it will be added to your "My
-    Sites" list.</p>
+    Reserves" list.</p>
     <form action="." method="POST">
       <p><input type="submit" value="Yes, join this site"/> ${go_back_link()}</p>
     </form>