From cf58be45a52ceb5992181a4ae133d26fdd3830f6 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 6 Jan 2015 13:30:27 -0500
Subject: [PATCH] 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
---
 Open-ILS/src/templates/kpac/parts/record_row.tt2 | 22 +++++++++++++++-------
 Open-ILS/src/templates/kpac/record.tt2           | 16 ++++++++--------
 Open-ILS/web/css/skin/default/kpac/style.css     | 13 ++++++-------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/src/templates/kpac/parts/record_row.tt2 b/Open-ILS/src/templates/kpac/parts/record_row.tt2
index 38c39adb7f..de10084b70 100644
--- 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 b28cfe2be0..12824e6995 100644
--- a/Open-ILS/src/templates/kpac/record.tt2
+++ b/Open-ILS/src/templates/kpac/record.tt2
@@ -50,19 +50,19 @@
             </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">
-                            &nbsp;<img width="35" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />&nbsp;
-                        </div>
-                    <div class="item_icon_type_text">[% attrs.format_label %]</div>
+				    <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 34904c0ad5..d7104e19f2 100755
--- a/Open-ILS/web/css/skin/default/kpac/style.css
+++ b/Open-ILS/web/css/skin/default/kpac/style.css
@@ -512,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;
 }
 
@@ -812,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
-- 
2.11.0