clarify status for multiple items

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

diff --git a/conifer/static/main.css b/conifer/static/main.css
index 45f8f9a..cf3bf08 100644 (file)
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -179,7 +179,7 @@ span.final_item { font-weight: bold; font-size: 110%; }
 
 .itemtree .itemtree { margin-left: 30px; padding-left: 0; }
 
-.an_item {width: 700px; margin: 0;}
+.an_item {width: 750px; margin: 0;}
 .itemtree li { padding-left: 0; margin-left: 0; } 
 
 .itemtree li { margin: 12px 8px; line-height: 115%; }
@@ -358,7 +358,7 @@ ul.heading_tree ul { margin: 0; padding-left: 25px; }
 
 .availability {
     float: right; color: darkred; background-color: #eee; 
-    width: 150px; margin-left: 8px; 
+    width: 225px; margin-left: 8px; 
     font-size: 80%;
 }
 .availability div { padding: 2px 4px; }
@@ -367,3 +367,4 @@ ul.heading_tree ul { margin: 0; padding-left: 25px; }
 .availability .unavailable { color: darkred; background-color: #edd; }
 .avail_nonphys { background-color: white; }
 .availability .callnumber { margin: 2px 0; }
+.standout { font-weight: bold; }

diff --git a/conifer/templates/components/site.xhtml b/conifer/templates/components/site.xhtml
index 10583f1..13df7f0 100644 (file)
--- a/conifer/templates/components/site.xhtml
+++ b/conifer/templates/components/site.xhtml
@@ -58,18 +58,25 @@ searchtext = _('search this site...')
                 <span py:if="_circmod == 'RESERVE 4 HOUR'">4 Hour Loan</span>
                 <span py:if="_circmod == 'RESERVE 7 DAY'">7 Day Loan</span>
           </div>
-         <div class="callnumber">${_callno}</div>
-          <div py:if="_dueinfo">DUE: ${_dueinfo}</div>
+         <div class="callnumber"><span py:if="_avail &gt; 0">Ask for: </span><span class="standout">${_callno}</span></div>
+          <div py:if="_dueinfo">NEXT DUE: ${_dueinfo}</div>
          </div>
                  
          <div py:if="not valid" class="unavailable">
                Availability unknown.
                <div class="callnumber">${item.call_number()}</div>
-                 
          </div>
-
+               
          </a>
+      <div py:with="(_lib, _desk, _avail, _callno, _dueinfo, _circmod) = stat">
+               <div py:if="_desk &gt; 1 and item.bib_id and gethook('bib_id_to_url')"
+                       py:with="url=callhook('bib_id_to_url', item.bib_id)">
+                       <a py:if="url" href="${url}">View status of all copies in catalogue</a>
+               </div>
       </div>
+      </div>
+         
+
       <div class="availability avail_nonphys" py:if="item.item_type != 'PHYS'">
       </div>
       <div class="mainline ${item.item_type=='HEADING' and 'headingmainline' or ''}">

diff --git a/conifer/templates/item/item_metadata.xhtml b/conifer/templates/item/item_metadata.xhtml
index 6788ded..a81c721 100644 (file)
--- a/conifer/templates/item/item_metadata.xhtml
+++ b/conifer/templates/item/item_metadata.xhtml
@@ -117,6 +117,11 @@ callnum = item.call_number()
        </div>
     </div>
 
+    <div py:if="item.bib_id and gethook('bib_id_to_url')"
+        py:with="url=callhook('bib_id_to_url', item.bib_id)">
+      <a py:if="url" href="${url}">View status of all copies in catalogue</a>
+    </div>
+
     <div py:if="item.marcxml">
       <abbr py:if="item.marcxml" class="unapi-id" title="${item.id}"/>
       <p id="marcdatashow"><a href="javascript:void($('#marcdata').toggle());">Display MARC Record</a></p>
@@ -130,9 +135,5 @@ callnum = item.call_number()
              </table>
            </div>
     </div>
-    <div py:if="item.bib_id and gethook('bib_id_to_url')"
-        py:with="url=callhook('bib_id_to_url', item.bib_id)">
-      <a py:if="url" href="${url}">View catalogue entry</a>
-    </div>
   </body>
 </html>