Change to allow KPAC to display more than one format icon (like OPAC).

Fix for KPAC multi-format items

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Conflicts:

	Open-ILS/src/templates/kpac/record.tt2
	Open-ILS/web/css/skin/default/kpac/style.css

diff --git a/Open-ILS/src/templates/kpac/homedewey.tt2 b/Open-ILS/src/templates/kpac/homedewey.tt2
index b77a43b..feeffea 100644 (file)
--- a/Open-ILS/src/templates/kpac/homedewey.tt2
+++ b/Open-ILS/src/templates/kpac/homedewey.tt2
@@ -7,7 +7,9 @@
 
              <div class="search_wrapper">
                 <h1>Dewey Decimal Guide</h1>
-                <p style="font-style:italic;font-size:large;">Use this chart to learn how the library's books are organized!</p>
+                <p>Use this chart to learn how the library's books are organized on the shelves!</p>
+                <p>Look at the number next to the subject you are interested in below (for example, 560 for Dinosaurs),<br/>
+                   then find that number on the library's shelves to find those books.</p>
                
             </div>
 </div> <!-- this ends the main_header_wrapper div that was started in header.tt2 -->

diff --git a/Open-ILS/src/templates/kpac/parts/record_row.tt2 b/Open-ILS/src/templates/kpac/parts/record_row.tt2
index a0d936d..bc2cda7 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/record_row.tt2
+++ b/Open-ILS/src/templates/kpac/parts/record_row.tt2
@@ -18,6 +18,21 @@
             [% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %] <!-- TODO fix commas, etc. -->
             [% IF attrs.phys_desc %]<br/>[% attrs.phys_desc | html; END %]
         </div>
+               
+        [%- IF attrs.format_label %]
+            [% FOR format IN attrs.all_formats %]
+                       <div class="item_icon_wrapper">
+                               <div class="item_icon">
+                                   <img title="[% format.label | html %]" 
+                    alt="[% format.label | html %]" 
+                    src="[% format.icon %]" /><br/>
+                    [% format.label | html %]
+                               </div>
+                       </div>
+            [% END %]
+                   <div class="clear">&nbsp;</div>
+           [% END %]
+       
         [% IF show_actions %]
         <div class="item_detail_actions">
             <div class="button"><a href="[% mkurl(ctx.kpac_root _ '/record/' _ rec_id) %]"><img 
@@ -28,13 +43,6 @@
         </div>
         [% END %]
     </div>
-    <div class="item_icon_wrapper">
-        <div class="item_icon">
-            &nbsp;<img width="35" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />&nbsp; 
-            <!-- put a single &nbsp; around each side of the image - for vertical centering -->
-        </div>
-        <div class="item_icon_type_text">[% attrs.format_label %]</div>
-    </div>
     <div class="clear">&nbsp;</div>
 </div>
 

diff --git a/Open-ILS/src/templates/kpac/record.tt2 b/Open-ILS/src/templates/kpac/record.tt2
index 878c806..a59705e 100644 (file)
--- a/Open-ILS/src/templates/kpac/record.tt2
+++ b/Open-ILS/src/templates/kpac/record.tt2
@@ -21,13 +21,7 @@
         <div class="item_detail_name">[% attrs.title | html %]</div>
         <div class="item_detail_author">[% l('by [_1]', attrs.author) | html %]</div>
         <div class="item_detail_icon_rate">
-            <div class="item_icon_wrapper">
-                <div class="item_icon">
-                    &nbsp;<img width="35" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />&nbsp; 
-                    <!-- put a single &nbsp; around each side of the image - for vertical centering -->
-                </div>
-                <div class="item_icon_type_text">[% attrs.format_label %]</div>
-            </div>
+            
 
             <div class="item_detail_rate_wrapper">
                 <div class="item_detail_rate_starts">
@@ -55,6 +49,20 @@
                 </div>
             </div>
             <div class="clear">&nbsp;</div>
+
+            [%- IF attrs.format_label %]
+                [% FOR format IN attrs.all_formats %]
+                                   <div class="item_icon_wrapper">
+                                       <div class="item_icon">
+                                           <img title="[% format.label | html %]" 
+                            alt="[% format.label | html %]" 
+                            src="[% format.icon %]" /><br/>
+                            [% format.label | html %]
+                                           </div>
+                                       </div>
+                [% END %]
+            [% END %]
+            </div>
         </div>
     </div>
 

diff --git a/Open-ILS/web/css/skin/default/kpac/style.css b/Open-ILS/web/css/skin/default/kpac/style.css
index ca1635d..d7104e1 100755 (executable)
--- a/Open-ILS/web/css/skin/default/kpac/style.css
+++ b/Open-ILS/web/css/skin/default/kpac/style.css
@@ -350,7 +350,7 @@ input[type=text], input[type=password], textarea {
 }
 
 .footer_wrapper a {
-       color:#fff;
+       color:#b6fcd5;
 }
 
 .footer_wrapper a:hover {
@@ -502,6 +502,8 @@ input[type=text], input[type=password], textarea {
        height:106px;
        overflow:hidden;
        float:left;
+       padding-left:40px;
+       margin-top:10px;
 }
 
 .item_icon {
@@ -510,22 +512,20 @@ input[type=text], input[type=password], textarea {
        background:url('/images/kpac/icon_bg.png') no-repeat;
        text-align:center;
        overflow:hidden;
-       line-height:80px;
 }
 
 .item_icon img {
-       vertical-align:middle;
-       position:relative;
-       top:-1px;
+       width:30px;
+       height:30px;
+       margin:10px;
+       
 }
 
 .item_icon_type_text {
        width:80px;
-       height:24px;
        text-align:center;
        overflow:hidden;
        display:table-cell;
-       vertical-align:middle;
        line-height:12px;
 }
 
@@ -554,6 +554,12 @@ input[type=text], input[type=password], textarea {
        color:#000;
 }
 
+.item_detail_extra_info {
+       margin-left:20px;
+       font-weight:normal;
+       color:#000;
+}
+
 .item_detail_header_buttons {
        float:right;
        margin-top:3px;
@@ -804,7 +810,8 @@ input[type=text], input[type=password], textarea {
 }
 
 .search_results .item_detail_info .item_detail_actions {
-       padding-top:28px;
+       padding-top:0px;
+       margin-left:20px;
 }
 
 .search_results