From fe7a1b4a477019d9d25d97e0985f2736af4e4359 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 28 Aug 2018 10:45:24 +0300 Subject: [PATCH] Bug 21280: Unify MARC tab HTML generation Bug 11885 improved the MARC detail tab view, so it it easier to style with CSS, but the authority MARC tabs are still in a sorry state. We can unify the code into a single include file, and reuse that from both. Test plan: 1) Apply the patch 2) Look at the biblio MARC detail view, check the tabs look the same as before 3) Look at an authority MARC detail view, check the tabs look the same as the biblio view Signed-off-by: Pasi Kallinen --- authorities/detail.pl | 7 ++- .../prog/en/includes/marc_tab_html.inc | 33 +++++++++++++ .../prog/en/modules/authorities/detail.tt | 30 +----------- .../prog/en/modules/catalogue/MARCdetail.tt | 57 ++++------------------ 4 files changed, 47 insertions(+), 80 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/marc_tab_html.inc diff --git a/authorities/detail.pl b/authorities/detail.pl index 4589c62f83..d5c0abc951 100755 --- a/authorities/detail.pl +++ b/authorities/detail.pl @@ -139,10 +139,9 @@ sub build_tabs { } if ($#subfields_data>=0) { my %tag_data; - $tag_data{tag}=$field->tag(). ' ' - . C4::Koha::display_marc_indicators($field) - . ' - ' - . $tagslib->{$field->tag()}->{lib}; + $tag_data{tag} = $field->tag(); + $tag_data{tag_ind} = C4::Koha::display_marc_indicators($field); + $tag_data{tag_desc} = $tagslib->{$field->tag()}->{lib}; $tag_data{subfield} = \@subfields_data; push (@loop_data, \%tag_data); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/marc_tab_html.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/marc_tab_html.inc new file mode 100644 index 0000000000..2b545a7ffa --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/marc_tab_html.inc @@ -0,0 +1,33 @@ +
+ [% FOREACH tab0X IN tab_data %] + [% IF ( tab0X.tag ) %] +
+
+ [% tab0X.tag | html %] + [% IF ( tab0X.tag_ind ) %] + [% tab0X.tag_ind.substr(0, 1) | html %][% tab0X.tag_ind.substr(1, 1) | html %] + [% END %] + [% IF (tab0X.tag_desc) %] - [% tab0X.tag_desc | html %][% END %] +
+ [% ELSE %] +
+ [% END %] + [% FOREACH subfiel IN tab0X.subfield %] +

+   + [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield | html %][% END %] + [% subfiel.short_desc | html %] + [% IF ( subfiel.is_url ) %][% subfiel.marc_value | html %][% ELSE %][% subfiel.marc_value | html %][% END %] + [% IF ( subfiel.link ) %] + + Search on [% subfiel.marc_value | html %] + + [% END %] + [% IF ( subfiel.authority ) %] + Auth + [% END %] +

+ [% END %] +
+ [% END %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt index ce45987340..ad5b9ac6df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -60,35 +60,7 @@ [% FOREACH BIG_LOO IN BIG_LOOP %] -
- [% FOREACH innerloo IN BIG_LOO.innerloop %] - [% IF ( innerloo.tag ) %] -
-
- [% innerloo.tag | html %] -
- [% ELSE %] -
- [% END %] - [% FOREACH subfiel IN innerloo.subfield %] -

- - [% subfiel.marc_value | html %] - [% IF ( subfiel.link ) %] - - - - [% END %] - [% IF ( subfiel.authority ) %] - Auth - [% END %] -

- [% END %] -
- [% END %] -
+ [% PROCESS 'marc_tab_html.inc' tab_id="tab" _ BIG_LOO.number _ "XX" tab_data=BIG_LOO.innerloop %] [% END %]
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 4b0ef797f5..62da366779 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -57,43 +57,6 @@ [% END %] -[% BLOCK show_tab_html %] -
- [% FOREACH tab0X IN tab_data %] - [% IF ( tab0X.tag ) %] -
-
- [% tab0X.tag | html %] - [% IF ( tab0X.tag_ind ) %] - [% tab0X.tag_ind.substr(0, 1) | html %][% tab0X.tag_ind.substr(1, 1) | html %] - [% END %] - [% IF (tab0X.tag_desc) %] - [% tab0X.tag_desc | html %][% END %] -
- [% ELSE %] -
- [% END %] - [% FOREACH subfiel IN tab0X.subfield %] -

-   - [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield | html %][% END %] - [% subfiel.short_desc | html %] - [% IF ( subfiel.is_url ) %][% subfiel.marc_value | html %][% ELSE %][% subfiel.marc_value | html %][% END %] - [% IF ( subfiel.link ) %] - - Search on [% subfiel.marc_value | html %] - - [% END %] - [% IF ( subfiel.authority ) %] - Auth - [% END %] -

- [% END %] -
- [% END %] -
-[% END %] - -
    [% IF ( tab0XX ) %] @@ -130,25 +93,25 @@
  • Item(s)
  • [% END %]
- [% PROCESS show_tab_html tab_id="tab0XX" tab_data=tab0XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab0XX" tab_data=tab0XX %] - [% PROCESS show_tab_html tab_id="tab1XX" tab_data=tab1XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab1XX" tab_data=tab1XX %] - [% PROCESS show_tab_html tab_id="tab2XX" tab_data=tab2XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab2XX" tab_data=tab2XX %] - [% PROCESS show_tab_html tab_id="tab3XX" tab_data=tab3XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab3XX" tab_data=tab3XX %] - [% PROCESS show_tab_html tab_id="tab4XX" tab_data=tab4XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab4XX" tab_data=tab4XX %] - [% PROCESS show_tab_html tab_id="tab5XX" tab_data=tab5XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab5XX" tab_data=tab5XX %] - [% PROCESS show_tab_html tab_id="tab6XX" tab_data=tab6XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab6XX" tab_data=tab6XX %] - [% PROCESS show_tab_html tab_id="tab7XX" tab_data=tab7XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab7XX" tab_data=tab7XX %] - [% PROCESS show_tab_html tab_id="tab8XX" tab_data=tab8XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab8XX" tab_data=tab8XX %] - [% PROCESS show_tab_html tab_id="tab9XX" tab_data=tab9XX %] + [% PROCESS 'marc_tab_html.inc' tab_id="tab9XX" tab_data=tab9XX %] [% IF ( tab10XX ) %]
-- 2.11.0