displaying some picklist metadata. point title links at entry details page

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8411 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
index 0ff783e..a1c14cd 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
@@ -24,7 +24,7 @@
 #oils-acq-search-fields-submit-block { margin: 5px; text-align: center;}
 
 /* bib search results / picklist builder interface */
-#oils-acq-pl_builder-table { width: 100%; }
+#oils-acq-picklist-header { padding: 4px; margin-bottom: 20px; }
 .oils-acq-picklist-records-jacket-td { width: 46px; }
 .oils-acq-picklist-records-jacket { width: 42px; height: 54px; padding-left: 0px; }
 .oils-acq-picklist-records-title-row {}

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
index 8c48e51..61f81f7 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
@@ -11,8 +11,9 @@
 #oils-acq-search-subsources-label { font-weight: bold; }
 #oils-acq-search-fields-submit-block { border: 2px solid #A1A1A1; }
 
-#oils-acq-pl_builder-table thead td { font-weight: bold; }
-/* #oils-acq-pl_builder-table tr { border-bottom: 1px solid #808080;} */
+#oils-acq-picklist-header {border: 1px solid #85C777;}
+#oils-acq-picklist-name { font-weight: bold; font-style: italic; }
+.oils-acq-picklist-attributes { font-size: 90%; margin-left: 15px;}
 .oils-acq-picklist-records-phys_desc-row { border-bottom: 1px solid #6BA160; }
 .oils-acq-picklist-picklist-td { border-style: solid; border-color: #A1A1A1; border-width: 0px 1px 0px 1px; } 
 .oils-acq-picklist-records-service-td { font-size: 85%; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
index b2a828b..7cda9a8 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
@@ -1,3 +1,3 @@
-<span><a href='index'>${_('Acquisitions Home')}</a></span>
-<span><a href='search'>${_('Bib Search')}</a></span>
+<span><a href='${c.oils.core.prefix}/acq/base/index'>${_('Acquisitions Home')}</a></span>
+<span><a href='${c.oils.core.prefix}/acq/picklist/search'>${_('Bib Search')}</a></span>
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
index 4e8a050..7bb1380 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
@@ -1,7 +1,19 @@
-# -*- coding: utf-8 -*-
 <%inherit file='../base.html'/>
 <%def name="page_title()">${_('Evergreen ACQ Picklist')}</%def>
 <%def name="block_content()">
+
+<div id='oils-acq-picklist-header'>
+    ${_('Picklist')} <span id='oils-acq-picklist-name'>${c.oils.acq.picklist.name()}</span>
+    <div class='oils-acq-picklist-attributes'>
+        <%
+        meta = _("Create date %(date)s") % {"date":c.oils.acq.picklist.create_time()}
+        meta2 = _("Last update time %(date)s") % {"date":c.oils.acq.picklist.edit_time()}
+        %>
+        <div>${meta}</div>
+        <div>${meta2}</div>
+    </div>
+</div>
+
 <table id='oils-acq-picklist-table'>
     % for entry in c.oils.acq.picklist.entries():
     <tr class='oils-acq-picklist-records-title-row'>
@@ -12,7 +24,11 @@
         <td>
             <a href='../view_entry/${entry.id()}'>${c.oils.acq.find_entry_attr(entry, "title")}</a>
         </td>
-        <td class='oils-acq-picklist-records-service-td'>${entry.provider()}</td>
+        <td class='oils-acq-picklist-records-service-td'>
+            % if entry.provider():
+                ${entry.provider().name()}
+            % endif
+        </td>
     </tr>
 
     </tr>