From 5727909b704ba6f4058ec1604d3aaa3474c39fd6 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Wed, 2 Apr 2014 20:22:44 -0400
Subject: [PATCH] Bug 11885: (follow-up) make default styling consistent with
 previous look

Jonathan Druart raised the following three issues:
1/ subtags was bold before patch
2/ 1 dash existed between tag and tag name
3/ A space has been added ("606 #1 - Sujet nom commun"
    becomes "606 # 1 Sujet nom commun",  "101 ## - Langue"
    becomes "101 # # Langue")

This patch addresses them in the following way:
1/ You will note that @ was not bold on the 0 tab.
   Every other tab were bold. By making the similar template
   into a procedure based on the 0XX tab, bolding was lost.
   This patch bolds all subtags including the @, so that
   the visible change is minimized.
2/ The dash was programmatically added in at the code stage
   previously. This bug fix splits the the single concatenation
   mess into parts which can be styled. This puts the dash back
   into the template. However, it should be noted that the
   spacing for the 0 tab's tag and tag description will have an
   extra space after the hypen that was lacking before.
3/ <span>...</span><span>...</span> is different than
   <span>...</span>
   <span>...</span>
   The later puts that extra space. This patch fixes that.

See comment 1 for the test plan.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Work as described.
Small koha-qa errors fixed in followup

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 377dbfc73fb2a06b8a0d50731e2c8ba14968d68e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 86b80a5ba8df5b8e270706b8494311a92819fe78)
---
 .../intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index 17f57ba743..63d6ae9577 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -71,10 +71,9 @@ function Changefwk(FwkList) {
                 <div class="tag_title">
                     <span class="tag_num">[% tab0X.tag %]</span>
 		    [% IF ( tab0X.tag_ind ) %]
-		      <span class="tag_ind1">[% tab0X.tag_ind.substr(0, 1) %]</span>
-		      <span class="tag_ind2">[% tab0X.tag_ind.substr(1, 1) %]</span>
+		      <span class="tag_ind1">[% tab0X.tag_ind.substr(0, 1) %]</span><span class="tag_ind2">[% tab0X.tag_ind.substr(1, 1) %]</span>
 		    [% END %]
-                    [% IF (tab0X.tag_desc) %]<span class="tag_desc">[% tab0X.tag_desc %]</span>[% END %]
+                    [% IF (tab0X.tag_desc) %]<span class="dashwrapper"> -</span> <span class="tag_desc">[% tab0X.tag_desc %]</span>[% END %]
                 </div>
             [% ELSE %]
                 <div class="tag">
@@ -82,7 +81,7 @@ function Changefwk(FwkList) {
             [% FOREACH subfiel IN tab0X.subfield %]
                 <p class="subfield_line">
                     <span class="subfield-label">&nbsp;
-                    [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield %][% END %]
+                    [% UNLESS ( subfiel.hide_marc ) %]<b>[% subfiel.marc_subfield %]</b>[% END %]
                     <span class="desc" title="[% subfiel.long_desc %]">[% subfiel.short_desc %]</span></span>
                     [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %]
                     [% IF ( subfiel.link ) %]
-- 
2.20.1