Attachment 85579 Details for Bug 22045 – Bug 22045: (follow-up) Revert change to numbering of tabs

[patch] Bug 22045: (follow-up) Revert change to numbering of tabs

Bug-22045-follow-up-Revert-change-to-numbering-of-.patch (text/plain), 3.19 KB, created by Maryse Simard on 2019-02-22 21:33:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maryse Simard

Created: 2019-02-22 21:33:23 UTC

Size: 3.19 KB

patch

obsolete

>From 8be87cb482bbc3a75a463a73b84c6fa7c47a56fb Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <you@example.com>
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
>---
> 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 a57f4f4..20b16a6 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 %]
>     <div class="toolbar-tabs-container">
>         <ul class="toolbar-tabs">
>-            [%- FOREACH BIG_LOO IN BIG_LOOP -%][%- SET tabname = BIG_LOO.number + 1 -%][% IF loop.first %]<li class="selected">[% ELSE %]<li>[% END %]<a data-tabid="[% BIG_LOO.number | html %]" href="#tab[% BIG_LOO.number | html %]XX">[% tabname | html %]</a></li>[%- END -%]
>+            [%- FOREACH BIG_LOO IN BIG_LOOP -%][%- SET tabname = BIG_LOO.number -%][% IF loop.first %]<li class="selected">[% ELSE %]<li>[% END %]<a data-tabid="[% BIG_LOO.number | html %]" href="#tab[% BIG_LOO.number | html %]XX">[% tabname | html %]</a></li>[%- END -%]
>         </ul>
>         <ul class="tag_anchors_list">
>             [% FOREACH BIG_LOO IN BIG_LOOP %]
>@@ -612,13 +611,13 @@ function Changefwk() {
>     </ul>
> 
> [% FOREACH BIG_LOO IN BIG_LOOP %]
>-    [% SET tabname = BIG_LOO.number + 1 %]
>+    [% SET tabname = BIG_LOO.number %]
>     <div id="tab[% BIG_LOO.number | html %]XX">
> 
>-    <h3>Section [% tabname %]</h3>
>+    <h3>Section [% tabname | html %]</h3>
>     [% FOREACH innerloo IN BIG_LOO.innerloop %]
>     [% IF ( innerloo.tag ) %]
>-    <div class="tag clearfix" id="tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]">
>+    <div class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
>         <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
>             [% IF advancedMARCEditor %]
>                 <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a>
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 22045: 83473 | 83770 | 84728 | 84896 | 84984 | 84985 | 84986 | 84993 | 84994 | 84995 | 84996 | 84997 | 84998 | 85567 | 85578 | 85579 | 85580 | 85581 | 85582 | 85583 | 85584 | 85585