From 41a6881deef5c6eca7e3f7b621142a74d6c75b6b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 11 Feb 2019 17:13:55 +0000 Subject: [PATCH] Bug 22045: (follow-up) Revert change to numbering of tabs I wanted the tabs to be numbered like humans count, starting from 1. But if the MARC framework setup isn't changed as well it doesn't make sense. This patch removes the change. Also fixed: Some missing template filters, an errant console.log() removed. To test, apply the patch and open a new or existing record for editing. The tabs (now "Sections") should be labeled from 0-9. Signed-off-by: John Doe Signed-off-by: David Nind Signed-off-by: Maryse Simard Signed-off-by: Josef Moravec --- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index a57f4f48fa..20b16a6666 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -29,7 +29,6 @@ [% IF tab %] $('#addbibliotabs').selectTabByID("#[% tab | html %]"); - console.log("[% tab %]"); [% END %] Sticky = $("#toolbar"); @@ -573,7 +572,7 @@ function Changefwk() { [% END %]
    - [%- FOREACH BIG_LOO IN BIG_LOOP -%][%- SET tabname = BIG_LOO.number + 1 -%][% IF loop.first %]
  • [% ELSE %]
  • [% END %][% tabname | html %]
  • [%- END -%] + [%- FOREACH BIG_LOO IN BIG_LOOP -%][%- SET tabname = BIG_LOO.number -%][% IF loop.first %]
  • [% ELSE %]
  • [% END %][% tabname | html %]
  • [%- END -%]
    [% FOREACH BIG_LOO IN BIG_LOOP %] @@ -612,13 +611,13 @@ function Changefwk() {
[% FOREACH BIG_LOO IN BIG_LOOP %] - [% SET tabname = BIG_LOO.number + 1 %] + [% SET tabname = BIG_LOO.number %]
-

Section [% tabname %]

+

Section [% tabname | html %]

[% FOREACH innerloo IN BIG_LOO.innerloop %] [% IF ( innerloo.tag ) %] -
+
[% IF advancedMARCEditor %] [% innerloo.tag | html %] -- 2.11.0