From 8574906d22a0c7c58fe078231d51cb34565392f3 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Thu, 31 Jul 2014 10:37:48 +0200
Subject: [PATCH] Bug 8296: Display publisheddatetext in OPAC bootstrap theme

and remove modifications for OPAC prog theme
---
 .../opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt     | 8 +++++++-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt    | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
index f0b91c1..5e9a6d6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
@@ -85,7 +85,13 @@
                                             <tr>
                                                 <td>
                                                     [% IF ( serial.publisheddate ) %]
-                                                        <span title="[% serial.publisheddate %]">[% serial.publisheddate | $KohaDates %]</span>
+                                                        <span title="[% serial.publisheddate %]">
+                                                            [% IF serial.publisheddatetext %]
+                                                                [% serial.publisheddatetext %]
+                                                            [% ELSE %]
+                                                                [% serial.publisheddate | $KohaDates %]
+                                                            [% END %]
+                                                        </span>
                                                     [% ELSE %]
                                                         &nbsp;
                                                     [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
index 6e32c56..ab48058 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
@@ -188,7 +188,6 @@ function showlayer(numlayer){
 	    <thead>
 		<tr>
 		    <th>Date</th>
-		    <th>Date (text)</th>
 		    <th>Library</th>
 		    <th>Notes</th>
 		    <th>Date received</th>
@@ -207,7 +206,6 @@ function showlayer(numlayer){
                     &nbsp;
                 [% END %]
             </td>
-            <td>[% serial.publisheddatetext || serial.publisheddate %]</td>
             <td class="libraryfilterclass">    [% serial.branchcode %]
 		    </td>
 		    <td>    [% serial.notes %]
-- 
1.9.1