Bugzilla – Attachment 133490 Details for
Bug 30489
Convert MARC and authority subfield edit tabs to Bootstrap
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30489: Convert MARC and authority subfield edit tabs to Bootstrap
Bug-30489-Convert-MARC-and-authority-subfield-edit.patch (text/plain), 73.00 KB, created by
Martin Renvoize (ashimema)
on 2022-04-20 16:15:09 UTC
(
hide
)
Description:
Bug 30489: Convert MARC and authority subfield edit tabs to Bootstrap
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-04-20 16:15:09 UTC
Size:
73.00 KB
patch
obsolete
>From ff9850712942c2f5eab0357574a48e28caa1ae19 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 11 Apr 2022 12:00:38 +0000 >Subject: [PATCH] Bug 30489: Convert MARC and authority subfield edit tabs to > Bootstrap > >This patch updates the MARC and authority subfield edit interface to >replace jQueryUI tabs with Bootstrap. The code for handling >drag-to-reorder tabs is updated to accommodate the new markup. > >To test, apply the patch and restart_all. > >- Go to Administration -> MARC bibliographic framework -> Default > framework and choose "MARC structure" from the Actions menu. >- In the row for 000 LEADER, click Actions -> View subfields. >- Click "Edit." On the edit page the tabs should look correct and work > correctly. >- Return to the list of tags and click "View subfields" for the 245 tag. >- Click one of the "Edit" buttons for any but the first subfield, e.g. > "a". >- On the "Tag 245 Subfield constraints" page the "a" tab should be > pre-selected. >- Click any of the subfield tabs and drag it to re-order it in the > sequence of tags. >- It should stay in the correct slot when you release it. >- Save and confirm that the new sequence of subfields has been saved. > >Perform all the same tests under Administration -> Authority types. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > admin/auth_subfields_structure.pl | 2 +- > admin/marc_subfields_structure.pl | 1 + > .../modules/admin/auth_subfields_structure.tt | 337 ++++++++-------- > .../modules/admin/marc_subfields_structure.tt | 369 +++++++++--------- > .../prog/js/marc_subfields_structure.js | 21 +- > 5 files changed, 387 insertions(+), 343 deletions(-) > >diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl >index aec16d3f22..2198561752 100755 >--- a/admin/auth_subfields_structure.pl >+++ b/admin/auth_subfields_structure.pl >@@ -138,7 +138,7 @@ if ($op eq 'add_form') { > $template->param('heading_edit_subfields_p' => 1); > $template->param(action => "Edit subfields", > tagfield => $tagfield, >- tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />", >+ tagsubfield => $tagsubfield, > loop => \@loop_data, > more_tag => $tagfield); > >diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl >index cf8e16462f..a2117eb912 100755 >--- a/admin/marc_subfields_structure.pl >+++ b/admin/marc_subfields_structure.pl >@@ -199,6 +199,7 @@ if ( $op eq 'add_form' ) { > $template->param( > action => "Edit subfields", > tagfield => $tagfield, >+ tagsubfield => $tagsubfield, > loop => \@loop_data, > more_tag => $tagfield > ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 67eee4f1ab..e7a4045c0b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -87,182 +87,195 @@ > <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> > <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" /> > <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset> >+ >+ [% BLOCK outputsubfield %][% FILTER collapse %] >+ [% SWITCH ( subfieldanchor ) %] >+ [% CASE "@" %] >+ AT >+ [% CASE "%" %] >+ % >+ [% CASE %] >+ [% subfieldanchor | html %] >+ [% END %] >+ [% END %][% END %] >+ > <div id="subfieldtabs" class="toptabs numbered"> >- <ul> >+ <ul class="nav nav-tabs" role="tablist"> > [% FOREACH loo IN loop %] >- <li id="tab_subfield_[% loo.tagsubfield | html %]"> >+ <li role="presentation" id="tab_subfield_[%- PROCESS outputsubfield subfieldanchor = loo.tagsubfield -%]"> > [% IF ( loo.new_subfield ) %] >- <a href="#sub[% loo.tagsubfield | html_entity %]field" title="[% loo.liblibrarian | html_entity %]">New</a> >+ <a href="#sub[%- PROCESS outputsubfield subfieldanchor = loo.tagsubfield -%]field" aria-controls="sub[%- PROCESS outputsubfield subfieldanchor = loo.tagsubfield -%]field" role="tab" data-toggle="tab" title="[% loo.liblibrarian | html %]">New</a> > [% ELSE %] >- <a href="#sub[% loo.tagsubfield | html_entity %]field" title="[% loo.liblibrarian | html_entity %]">[% loo.tagsubfield | html %]</a> >+ <a href="#sub[%- PROCESS outputsubfield subfieldanchor = loo.tagsubfield -%]field" aria-controls="sub[%- PROCESS outputsubfield subfieldanchor = loo.tagsubfield -%]field" role="tab" data-toggle="tab" title="[% loo.liblibrarian | html %]">[% loo.tagsubfield | html %]</a> > [% END %] > </li> > [% END %] > </ul> >+ <div class="tab-content"> >+ [% FOREACH loo IN loop %] >+ <div role="tabpanel" class="tab-pane" id="sub[%- PROCESS outputsubfield subfieldanchor = loo.tagsubfield -%]field"> >+ <fieldset class="rows"><ol> > >- [% FOREACH loo IN loop %] >- <div id="sub[% loo.tagsubfield | html %]field"> >- <fieldset class="rows"><ol> >- >- [% IF ( loo.new_subfield ) %] >- <li> >- <label for="tagsubfieldinput[% loo.row | html %]">Subfield code: </label> >- <input type="text" name="tagsubfield" value="[% loo.tagsubfield | html %]" size="1" id="tagsubfield" maxlength="1" /> >- </li> >- [% ELSE %] >- <li> >- <input type="hidden" name="tagsubfield" value="[% loo.tagsubfield | html %]" /> >- </li> >- [% END %] >- <li> >- <label for="repeatable[% loo.row | html %]">Repeatable: </label> >- [% IF loo.repeatable %] >- <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" checked="checked" value="1" /> >- [% ELSE %] >- <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" value="1" /> >- [% END %] >- </li> >- <li> >- <label for="mandatory[% loo.row | html %]">Mandatory: </label> >- [% IF loo.mandatory %] >- <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" checked="checked" value="1" /> >- [% ELSE %] >- <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" value="1" /> >- [% END %] >- </li> >- <li><label for="liblibrarian[% loo.row | html %]">Text for librarian: </label><input id="liblibrarian[% loo.row | html %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li> >- <li><label for="libopac[% loo.row | html %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row | html %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li> >- <li><label for="tab[% loo.row | html %]">Managed in tab: </label> >- <select name="tab" id="tab[% loo.row | html %]"> >- [%- IF ( loo.tab == -1 ) -%] >- <option value="-1" selected="selected">ignore</option> >- [%- ELSE -%] >- <option value="-1">ignore</option> >- [%- END -%] >- [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] -%] >- [%- IF ( loo.tab == t && t.length>0 ) -%] >- <option value="[%- t | html -%]" selected="selected">[%- t | html -%]</option> >- [%- ELSIF ( loo.tab == t ) -%] >- <option value="[%- t | html -%]" selected="selected"> </option> >- [%- ELSE -%] >- <option value="[%- t | html -%]">[%- t | html -%]</option> >- [%- END -%] >- [%- END -%] >- </select> >- <div class="hint">Ignore means that the subfield does not display in the record editor</div> >- </li> >- <li> >- <fieldset> >- <legend>Display</legend> >- <ol> >- <li><label for="ohidden[% loo.row | html %]">Select to display or not:</label> >- <select name="ohidden" id="ohidden[% loo.row | html %]"> >- [%- IF ( loo.hidden == 0 ) -%] >- <option value= "0" selected="selected">Show all</option> >- <option value="1">Hide all</option> >- [%- ELSE -%] >- [%# All other non-zero values mean: Hide %] >- <option value= "0">Show all</option> >- <option value="1" selected="selected">Hide all</option> >- [%- END -%] >- </select> >- </li> >- </ol> >- </fieldset> >- </li> >- <li> >- <fieldset class="rows"> >- <legend>Advanced constraints:</legend> >- <ol> >+ [% IF ( loo.new_subfield ) %] >+ <li> >+ <label for="tagsubfieldinput[% loo.row | html %]">Subfield code: </label> >+ <input type="text" name="tagsubfield" value="[% loo.tagsubfield | html %]" size="1" id="tagsubfield" maxlength="1" /> >+ </li> >+ [% ELSE %] >+ <li> >+ <input type="hidden" name="tagsubfield" value="[% loo.tagsubfield | html %]" /> >+ </li> >+ [% END %] > <li> >- <label for="isurl[% loo.row | html %]">Is a URL:</label> >- [% IF loo.isurl %] >- <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" checked="checked" value="1" /> >+ <label for="repeatable[% loo.row | html %]">Repeatable: </label> >+ [% IF loo.repeatable %] >+ <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" checked="checked" value="1" /> > [% ELSE %] >- <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" /> >+ <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" value="1" /> > [% END %] >- <span class="hint">If checked, it means that the subfield is a URL and can be clicked.</span> > </li> > <li> >- <label for="defaultvalue[% loo.row | html %]">Default value:</label> >- <input type="text" name="defaultvalue" id="defaultvalue[% loo.row | html %]" value="[% loo.defaultvalue | html %]" /> >+ <label for="mandatory[% loo.row | html %]">Mandatory: </label> >+ [% IF loo.mandatory %] >+ <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" checked="checked" value="1" /> >+ [% ELSE %] >+ <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" value="1" /> >+ [% END %] > </li> >- </ol> >- </fieldset> >- </li> >- <li> >- <fieldset><legend>Help input</legend> >- <ol> >- <li> >- <label for="kohafield[% loo.row | html %]">Koha field:</label> >- <select name="kohafield" id="kohafield[% loo.row | html %]"> >- [%- FOREACH value IN loo.kohafields %] >- [% IF ( value == loo.kohafield && value.length>0 ) -%] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >- [%- ELSIF ( value == loo.kohafield ) -%] >- <option value="[% value | html %]" selected="selected"> </option> >- [%- ELSIF ( value.length==0 ) -%] >- <option value="[% value | html %]"> </option> >+ <li><label for="liblibrarian[% loo.row | html %]">Text for librarian: </label><input id="liblibrarian[% loo.row | html %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /></li> >+ <li><label for="libopac[% loo.row | html %]">Text for OPAC: </label><input type="text" id="libopac[% loo.row | html %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /></li> >+ <li><label for="tab[% loo.row | html %]">Managed in tab: </label> >+ <select name="tab" id="tab[% loo.row | html %]"> >+ [%- IF ( loo.tab == -1 ) -%] >+ <option value="-1" selected="selected">ignore</option> > [%- ELSE -%] >- <option value="[% value | html %]">[% value | html %]</option> >+ <option value="-1">ignore</option> > [%- END -%] >- [%- END %] >- </select> >- </li> >- <li> >- <label for="authorised_value[% loo.row | html %]">Authorized value:</label> >- <select name="authorised_value" id="authorised_value[% loo.row | html %]"> >- [%- FOREACH value IN loo.authorised_values %] >- [% IF ( value == loo.authorised_value && value.length>0 ) -%] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >- [%- ELSIF ( value == loo.authorised_value ) -%] >- <option value="[% value | html %]" selected> </option> >- [%- ELSIF ( value.length==0 ) -%] >- <option value="[% value | html %]"> </option> >+ [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] -%] >+ [%- IF ( loo.tab == t && t.length>0 ) -%] >+ <option value="[%- t | html -%]" selected="selected">[%- t | html -%]</option> >+ [%- ELSIF ( loo.tab == t ) -%] >+ <option value="[%- t | html -%]" selected="selected"> </option> > [%- ELSE -%] >- <option value="[% value | html %]">[% value | html %]</option> >+ <option value="[%- t | html -%]">[%- t | html -%]</option> > [%- END -%] >- [%- END %] >+ [%- END -%] > </select> >+ <div class="hint">Ignore means that the subfield does not display in the record editor</div> > </li> > <li> >- <label for="frameworkcode[% loo.row | html %]">Thesaurus:</label> >- <select name="frameworkcode" id="frameworkcode[% loo.row | html %]"> >- [%- FOREACH value IN loo.frameworkcodes %] >- [% IF ( value == loo.frameworkcode && value.length>0 ) -%] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >- [%- ELSIF ( value == loo.frameworkcode ) -%] >- <option value="[% value | html %]" selected="selected"> </option> >- [%- ELSIF ( value.length==0 ) -%] >- <option value="[% value | html %]"> </option> >- [%- ELSE -%] >- <option value="[% value | html %]">[% value | html %]</option> >- [%- END -%] >- [%- END %] >- </select> >+ <fieldset> >+ <legend>Display</legend> >+ <ol> >+ <li><label for="ohidden[% loo.row | html %]">Select to display or not:</label> >+ <select name="ohidden" id="ohidden[% loo.row | html %]"> >+ [%- IF ( loo.hidden == 0 ) -%] >+ <option value= "0" selected="selected">Show all</option> >+ <option value="1">Hide all</option> >+ [%- ELSE -%] >+ [%# All other non-zero values mean: Hide %] >+ <option value= "0">Show all</option> >+ <option value="1" selected="selected">Hide all</option> >+ [%- END -%] >+ </select> >+ </li> >+ </ol> >+ </fieldset> > </li> > <li> >- <label for="value_builder[% loo.row | html %]">Plugin:</label> >- <select name="value_builder" id="value_builder[% loo.row | html %]"> >- [%- FOREACH value IN loo.value_builders %] >- [% IF ( value == loo.value_builder && value.length>0 ) -%] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >- [%- ELSIF ( value == loo.value_builder ) -%] >- <option value="[% value | html %]" selected="selected"> </option> >- [%- ELSIF ( value.length==0 ) -%] >- <option value="[% value | html %]"> </option> >- [%- ELSE -%] >- <option value="[% value | html %]">[% value | html %]</option> >- [%- END -%] >- [%- END %] >- </select> >+ <fieldset class="rows"> >+ <legend>Advanced constraints:</legend> >+ <ol> >+ <li> >+ <label for="isurl[% loo.row | html %]">Is a URL:</label> >+ [% IF loo.isurl %] >+ <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" checked="checked" value="1" /> >+ [% ELSE %] >+ <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" /> >+ [% END %] >+ <span class="hint">If checked, it means that the subfield is a URL and can be clicked.</span> >+ </li> >+ <li> >+ <label for="defaultvalue[% loo.row | html %]">Default value:</label> >+ <input type="text" name="defaultvalue" id="defaultvalue[% loo.row | html %]" value="[% loo.defaultvalue | html %]" /> >+ </li> >+ </ol> >+ </fieldset> > </li> >- </ol> >- </fieldset> >- </li> >- </ol></fieldset><br class="clear" /> >- </div> >- [% END %] >+ <li> >+ <fieldset><legend>Help input</legend> >+ <ol> >+ <li> >+ <label for="kohafield[% loo.row | html %]">Koha field:</label> >+ <select name="kohafield" id="kohafield[% loo.row | html %]"> >+ [%- FOREACH value IN loo.kohafields %] >+ [% IF ( value == loo.kohafield && value.length>0 ) -%] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [%- ELSIF ( value == loo.kohafield ) -%] >+ <option value="[% value | html %]" selected="selected"> </option> >+ [%- ELSIF ( value.length==0 ) -%] >+ <option value="[% value | html %]"> </option> >+ [%- ELSE -%] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [%- END -%] >+ [%- END %] >+ </select> >+ </li> >+ <li> >+ <label for="authorised_value[% loo.row | html %]">Authorized value:</label> >+ <select name="authorised_value" id="authorised_value[% loo.row | html %]"> >+ [%- FOREACH value IN loo.authorised_values %] >+ [% IF ( value == loo.authorised_value && value.length>0 ) -%] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [%- ELSIF ( value == loo.authorised_value ) -%] >+ <option value="[% value | html %]" selected> </option> >+ [%- ELSIF ( value.length==0 ) -%] >+ <option value="[% value | html %]"> </option> >+ [%- ELSE -%] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [%- END -%] >+ [%- END %] >+ </select> >+ </li> >+ <li> >+ <label for="frameworkcode[% loo.row | html %]">Thesaurus:</label> >+ <select name="frameworkcode" id="frameworkcode[% loo.row | html %]"> >+ [%- FOREACH value IN loo.frameworkcodes %] >+ [% IF ( value == loo.frameworkcode && value.length>0 ) -%] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [%- ELSIF ( value == loo.frameworkcode ) -%] >+ <option value="[% value | html %]" selected="selected"> </option> >+ [%- ELSIF ( value.length==0 ) -%] >+ <option value="[% value | html %]"> </option> >+ [%- ELSE -%] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [%- END -%] >+ [%- END %] >+ </select> >+ </li> >+ <li> >+ <label for="value_builder[% loo.row | html %]">Plugin:</label> >+ <select name="value_builder" id="value_builder[% loo.row | html %]"> >+ [%- FOREACH value IN loo.value_builders %] >+ [% IF ( value == loo.value_builder && value.length>0 ) -%] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [%- ELSIF ( value == loo.value_builder ) -%] >+ <option value="[% value | html %]" selected="selected"> </option> >+ [%- ELSIF ( value.length==0 ) -%] >+ <option value="[% value | html %]"> </option> >+ [%- ELSE -%] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [%- END -%] >+ [%- END %] >+ </select> >+ </li> >+ </ol> >+ </fieldset> >+ </li> >+ </ol></fieldset><br class="clear" /> >+ </div> >+ [% END %] >+ </div> <!-- /.tab-content --> > </div> > </form> > [% END %] >@@ -310,7 +323,7 @@ > [% FOREACH loo IN loop %] > <tr> > <td> >- <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?op=add_form&tagfield=[% tagfield | uri %]&authtypecode=[% authtypecode | uri %]#sub[% loo.tagsubfield | uri %]field">[% loo.tagsubfield | html %]</a> >+ <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?op=add_form&tagfield=[% tagfield | uri %]&authtypecode=[% authtypecode | uri %]#sub[% subfieldanchor | uri %]field">[% loo.tagsubfield | html %]</a> > </td> > <td> > [% IF loo.tab == -1 %] >@@ -341,7 +354,7 @@ > [% END %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?op=add_form&tagfield=[% tagfield | uri %]&authtypecode=[% authtypecode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil" aria-hidden="true"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?op=add_form&tagfield=[% tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&authtypecode=[% authtypecode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil" aria-hidden="true"></i> Edit</a> > <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&authtypecode=[% authtypecode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> > </td> > </tr> >@@ -382,9 +395,16 @@ > paginate: false > })); > >- var tabs = $('#subfieldtabs').tabs(); >+ [% IF ( tagsubfield && tagsubfield == "@") %] >+ $("#subfieldtabs a[href='#subATfield']").tab("show"); >+ [% ELSIF ( tagsubfield && tagsubfield != "@") %] >+ $("#subfieldtabs a[href='#sub[% tagsubfield | html %]field']").tab("show"); >+ [% ELSE %] >+ $("#subfieldtabs a:first").tab("show"); >+ [% END %] >+ > var current_index; >- tabs.find( ".ui-tabs-nav" ).sortable({ >+ $("#subfieldtabs > ul").sortable({ > axis: "x", > start: function (e, ui) { > current_index = $(ui.item[0]).index(); >@@ -394,13 +414,12 @@ > if (current_index < new_index) new_index++; > var subfield_code = $(ui.item[0]).attr('id').replace( /^tab_subfield_/, ''); > var content = $('#sub' + subfield_code + 'field'); >- var panels = $("#subfieldtabs > div"); >+ var panels = $("#subfieldtabs .tab-pane"); > if ( new_index < $(panels).size() ){ >- $(content).insertBefore($("#subfieldtabs > div")[new_index]); >+ $(content).insertBefore( panels[new_index]); > } else { >- $(content).insertAfter($("#subfieldtabs > div")[new_index-1]); >+ $(content).insertAfter( panels[new_index-1]); > } >- tabs.tabs("refresh"); > } > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index e4c485ceec..67146fb6ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -124,14 +124,25 @@ > <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> > <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" /> > >+ [% BLOCK outputsubfield %][% FILTER collapse %] >+ [% SWITCH ( subfieldanchor ) %] >+ [% CASE "@" %] >+ AT >+ [% CASE "%" %] >+ % >+ [% CASE %] >+ [% subfieldanchor | html %] >+ [% END %] >+ [% END %][% END %] >+ > <div id="subfieldtabs" class="toptabs numbered"> >- <ul> >+ <ul class="nav nav-tabs" role="tablist"> > [% FOREACH loo IN loop %] >- <li id="tab_subfield_[% loo.urisubfieldcode | html %]"> >+ <li id="tab_subfield_[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="tab-item" role="presentation"> > [% IF ( loo.new_subfield ) %] >- <a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a> >+ <a href="#sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field" aria-controls="sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field" role="tab" data-toggle="tab" title="[% loo.liblibrarian | html_entity %]">New</a> > [% ELSE %] >- <a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]"> >+ <a href="#sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field" aria-controls="sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field" role="tab" data-toggle="tab" title="[% loo.liblibrarian | html_entity %]"> > [% loo.subfieldcode | html %] > </a> > [% END %] >@@ -139,190 +150,193 @@ > [% END %] > </ul> > >- [% FOREACH loo IN loop %] >- <div class="constraints" id="sub[% loo.urisubfieldcode | uri %]field"> >- <div id="basic[% loo.urisubfieldcode | html %]" class="contraints"> >- <fieldset class="rows"> >- <legend>Basic constraints</legend> >- <ol> >- [% IF ( subfieldcode == 0 || subfieldcode ) %] >- <li> >- <span class="label">Subfield code:</span> >- [% loo.subfieldcode | html %] <input type="hidden" name="tagsubfield" value="[% loo.subfieldcode | html %]" /> >- </li> >- [% ELSE %] >- <li> >- <label for="tagsubfield[% loo.row | html %]">Subfield code:</label> >- <input type="text" id="tagsubfield[% loo.row | html %]" name="tagsubfield" value="[% loo.subfieldcode | html %]" /> >+ <div class="tab-content"> >+ >+ [% FOREACH loo IN loop %] >+ <div class="constraints tab-pane" role="tabpanel" id="sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field"> >+ <div id="basic[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="contraints"> >+ <fieldset class="rows"> >+ <legend>Basic constraints</legend> >+ <ol> >+ [% IF ( subfieldcode == 0 || subfieldcode ) %] >+ <li> >+ <span class="label">Subfield code:</span> >+ [% loo.subfieldcode | html %] <input type="hidden" name="tagsubfield" value="[% loo.subfieldcode | html %]" /> > </li> >- [% END %] >- <li> >- <label for="liblibrarian[% loo.row | html %]">Text for librarian: </label> >- <input id="liblibrarian[% loo.row | html %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /> >- </li> >- <li> >- <label for="libopac[% loo.row | html %]">Text for OPAC: </label> >- <input type="text" id="libopac[% loo.row | html %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /> >- </li> >- <li> >- <label for="repeatable[% loo.row | html %]">Repeatable: </label> >- [% IF loo.repeatable %] >- <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" checked="checked" value="1" /> > [% ELSE %] >- <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" value="1" /> >+ <li> >+ <label for="tagsubfield[% loo.row | html %]">Subfield code:</label> >+ <input type="text" id="tagsubfield[% loo.row | html %]" name="tagsubfield" value="[% loo.subfieldcode | html %]" /> >+ </li> > [% END %] >- </li> >- <li> >- <label for="mandatory[% loo.row | html %]">Mandatory: </label> >- [% IF loo.mandatory %] >- <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" checked="checked" value="1" /> >- [% ELSE %] >- <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" value="1" /> >- [% END %] >- </li> >- <li> >- <label for="important[% loo.row | html %]">Important: </label> >- [% IF loo.important %] >- <input type="checkbox" id="important[% loo.row | html %]" name="important[% loo.row | html %]" checked="checked" value="1" /> >- [% ELSE %] >- <input type="checkbox" id="important[% loo.row | html %]" name="important[% loo.row | html %]" value="1" /> >- [% END %] >- </li> >- <li><label for="tab[% loo.row | html %]">Managed in tab: </label> >- <select name="tab" tabindex="" id="tab[% loo.row | html %]"> >- [%- IF ( loo.tab == -1 ) -%] >- <option value="-1" selected="selected">ignore</option> >- [%- ELSE -%] >- <option value="-1">ignore</option> >- [%- END -%] >- [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] -%] >- [%- IF ( loo.tab == t ) -%] >- <option value="[%- t | html -%]" selected="selected">[%- t | html -%]</option> >+ <li> >+ <label for="liblibrarian[% loo.row | html %]">Text for librarian: </label> >+ <input id="liblibrarian[% loo.row | html %]" type="text" name="liblibrarian" value="[% loo.liblibrarian | html_entity %]" size="40" maxlength="80" /> >+ </li> >+ <li> >+ <label for="libopac[% loo.row | html %]">Text for OPAC: </label> >+ <input type="text" id="libopac[% loo.row | html %]" name="libopac" value="[% loo.libopac | html_entity %]" size="40" maxlength="80" /> >+ </li> >+ <li> >+ <label for="repeatable[% loo.row | html %]">Repeatable: </label> >+ [% IF loo.repeatable %] >+ <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" checked="checked" value="1" /> >+ [% ELSE %] >+ <input type="checkbox" id="repeatable[% loo.row | html %]" name="repeatable[% loo.row | html %]" value="1" /> >+ [% END %] >+ </li> >+ <li> >+ <label for="mandatory[% loo.row | html %]">Mandatory: </label> >+ [% IF loo.mandatory %] >+ <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" checked="checked" value="1" /> >+ [% ELSE %] >+ <input type="checkbox" id="mandatory[% loo.row | html %]" name="mandatory[% loo.row | html %]" value="1" /> >+ [% END %] >+ </li> >+ <li> >+ <label for="important[% loo.row | html %]">Important: </label> >+ [% IF loo.important %] >+ <input type="checkbox" id="important[% loo.row | html %]" name="important[% loo.row | html %]" checked="checked" value="1" /> >+ [% ELSE %] >+ <input type="checkbox" id="important[% loo.row | html %]" name="important[% loo.row | html %]" value="1" /> >+ [% END %] >+ </li> >+ <li><label for="tab[% loo.row | html %]">Managed in tab: </label> >+ <select name="tab" tabindex="" id="tab[% loo.row | html %]"> >+ [%- IF ( loo.tab == -1 ) -%] >+ <option value="-1" selected="selected">ignore</option> > [%- ELSE -%] >- <option value="[%- t | html -%]">[%- t | html -%]</option> >+ <option value="-1">ignore</option> > [%- END -%] >- [%- END -%] >- [%- IF ( loo.tab == 10 ) -%] >- <option value="10" selected="selected">items (10)</option> >- [%- ELSE -%] >- <option value="10">items (10)</option> >- [%- END -%] >- </select> >- <div class="hint">Ignore means that the subfield does not display in the record editor</div> >- </li> >- </ol> >- </fieldset> <!-- /.rows --> >- </div> <!-- /#basic[% loo.urisubfieldcode | html %] --> >- >- <div id="advanced[% loo.urisubfieldcode | html %]" class="contraints"> >- <fieldset class="rows"> >- <legend>Advanced constraints</legend> >- <ol> >- <li> >- <label for="defaultvalue[% loo.row | html %]">Default value:</label> >- <input type="text" name="defaultvalue" id="defaultvalue[% loo.row | html %]" value="[% loo.defaultvalue | html %]" /> >- </li> >- <li> >- <label for="maxlength[% loo.row | html %]">Max length:</label> >- <input type="text" id="maxlength[% loo.row | html %]" name="maxlength" value="[% loo.maxlength | html %]" size="4" /> >- </li> >- <li> >- [% IF loo.hidden_protected %] >- <input type="hidden" id="hidden-[% loo.row | html %]" name="hidden" value="[% loo.hidden | html %]" data-koha-protected="1" /> >- [% ELSE %] >- <input type="hidden" id="hidden-[% loo.row | html %]" name="hidden" value="[% loo.hidden | html %]" /> >- [% END %] >- <label for="hidden[% loo.row | html %]">Visibility: </label> >- <input type="checkbox" id="hidden_opac_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_opac_[% loo.row | html %]"/> >- <label for="hidden_opac_[% loo.row | html %]" style="float: none;">OPAC</label> >- <input type="checkbox" id="hidden_intranet_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_intranet_[% loo.row | html %]"/> >- <label for="hidden_intranet_[% loo.row | html %]" style="float: none;">Intranet</label> >- <input type="checkbox" id="hidden_editor_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_editor_[% loo.row | html %]"/> >- <label for="hidden_editor_[% loo.row | html %]" style="float: none;">Editor</label> >- <input type="checkbox" id="hidden_collapsed_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_collapsed_[% loo.row | html %]"/> >- <label for="hidden_collapsed_[% loo.row | html %]" style="float: none;">Collapsed</label> >- <input type="checkbox" id="hidden_flagged_[% loo.row | html %]" name="flagged_[% loo.row | html %]"/> >- <label for="hidden_flagged_[% loo.row | html %]" style="float: none;">Flagged</label> >- </li> >- <li> >- <label for="isurl[% loo.row | html %]">Is a URL:</label> >- [% IF loo.isurl %] >- <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" checked="checked" value="1" /> >- [% ELSE %] >- <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" /> >- [% END %] >- <span class="hint">If checked, it means that the subfield is a URL and can be clicked</span> >- </li> >- <li> >- <label for="link[% loo.row | html %]">Link:</label> >- <input type="text" id="link[% loo.row | html %]" name="link" value="[% loo.link | html %]" size="10" maxlength="80" /> >- <div class="hint">An index name, e.g. title or Local-Number</div> >- </li> >- <li> >- <label for="kohafield[% loo.row | html %]">Koha link:</label> >- <!-- This select should be DISABLED; value is submitted by the following hidden input --> >- <select name="kohafield" id="kohafield[% loo.row | html %]" disabled> >- [% FOREACH value IN loo.kohafields %] >- [% IF ( value == loo.kohafield ) %] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >- [% ELSE %] >- <option value="[% value | html %]">[% value | html %]</option> >- [% END %] >- [% END %] >- </select> >- <!-- Do NOT remove this next hidden input! We need it to save kohafield. --> >- <input type="hidden" name="kohafield" value="[% loo.kohafield | html %]"/> >- </li> >- </ol> >- </fieldset> <!-- /.rows --> >- </div> <!-- /#advanced[% loo.urisubfieldcode | html %] --> >- >- <div id="oth[% loo.urisubfieldcode | html %]" class="constraints"> >- <fieldset class="rows"> >- <legend>Other options (choose one)</legend> >- <ol> >- <li> >- <label for="authorised_value[% loo.row | html %]">Authorized value:</label> >- <select name="authorised_value" id="authorised_value[% loo.row | html %]"> >- <option value=""></option> >- [% FOREACH value IN loo.authorised_values %] >- [% IF ( value == loo.authorised_value ) %] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [%- FOREACH t IN [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] -%] >+ [%- IF ( loo.tab == t ) -%] >+ <option value="[%- t | html -%]" selected="selected">[%- t | html -%]</option> >+ [%- ELSE -%] >+ <option value="[%- t | html -%]">[%- t | html -%]</option> >+ [%- END -%] >+ [%- END -%] >+ [%- IF ( loo.tab == 10 ) -%] >+ <option value="10" selected="selected">items (10)</option> >+ [%- ELSE -%] >+ <option value="10">items (10)</option> >+ [%- END -%] >+ </select> >+ <div class="hint">Ignore means that the subfield does not display in the record editor</div> >+ </li> >+ </ol> >+ </fieldset> <!-- /.rows --> >+ </div> <!-- /#basic[%- PROCESS outputsubfield subfieldanchor = subfieldcode -%] --> >+ >+ <div id="advanced[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="contraints"> >+ <fieldset class="rows"> >+ <legend>Advanced constraints</legend> >+ <ol> >+ <li> >+ <label for="defaultvalue[% loo.row | html %]">Default value:</label> >+ <input type="text" name="defaultvalue" id="defaultvalue[% loo.row | html %]" value="[% loo.defaultvalue | html %]" /> >+ </li> >+ <li> >+ <label for="maxlength[% loo.row | html %]">Max length:</label> >+ <input type="text" id="maxlength[% loo.row | html %]" name="maxlength" value="[% loo.maxlength | html %]" size="4" /> >+ </li> >+ <li> >+ [% IF loo.hidden_protected %] >+ <input type="hidden" id="hidden-[% loo.row | html %]" name="hidden" value="[% loo.hidden | html %]" data-koha-protected="1" /> > [% ELSE %] >- <option value="[% value | html %]">[% value | html %]</option> >+ <input type="hidden" id="hidden-[% loo.row | html %]" name="hidden" value="[% loo.hidden | html %]" /> > [% END %] >- [% END %] >- </select> >- </li> >- <li> >- <label for="authtypecode[% loo.row | html %]">Thesaurus:</label> >- <select name="authtypecode" id="authtypecode[% loo.row | html %]"> >- [% FOREACH value IN loo.authtypes %] >- [% IF ( value == loo.authtypecode ) %] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ <label for="hidden[% loo.row | html %]">Visibility: </label> >+ <input type="checkbox" id="hidden_opac_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_opac_[% loo.row | html %]"/> >+ <label for="hidden_opac_[% loo.row | html %]" style="float: none;">OPAC</label> >+ <input type="checkbox" id="hidden_intranet_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_intranet_[% loo.row | html %]"/> >+ <label for="hidden_intranet_[% loo.row | html %]" style="float: none;">Intranet</label> >+ <input type="checkbox" id="hidden_editor_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_editor_[% loo.row | html %]"/> >+ <label for="hidden_editor_[% loo.row | html %]" style="float: none;">Editor</label> >+ <input type="checkbox" id="hidden_collapsed_[% loo.row | html %]" class="inclusive_[% loo.row | html %]" name="hidden_collapsed_[% loo.row | html %]"/> >+ <label for="hidden_collapsed_[% loo.row | html %]" style="float: none;">Collapsed</label> >+ <input type="checkbox" id="hidden_flagged_[% loo.row | html %]" name="flagged_[% loo.row | html %]"/> >+ <label for="hidden_flagged_[% loo.row | html %]" style="float: none;">Flagged</label> >+ </li> >+ <li> >+ <label for="isurl[% loo.row | html %]">Is a URL:</label> >+ [% IF loo.isurl %] >+ <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" checked="checked" value="1" /> > [% ELSE %] >- <option value="[% value | html %]">[% value | html %]</option> >+ <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" /> > [% END %] >- [% END %] >- </select> >- </li> >- <li> >- <label for="value_builder[% loo.row | html %]">Plugin:</label> >- <select name="value_builder" id="value_builder[% loo.row | html %]"> >- [% FOREACH value IN loo.value_builders %] >- [% IF ( value == loo.value_builder ) %] >+ <span class="hint">If checked, it means that the subfield is a URL and can be clicked</span> >+ </li> >+ <li> >+ <label for="link[% loo.row | html %]">Link:</label> >+ <input type="text" id="link[% loo.row | html %]" name="link" value="[% loo.link | html %]" size="10" maxlength="80" /> >+ <div class="hint">An index name, e.g. title or Local-Number</div> >+ </li> >+ <li> >+ <label for="kohafield[% loo.row | html %]">Koha link:</label> >+ <!-- This select should be DISABLED; value is submitted by the following hidden input --> >+ <select name="kohafield" id="kohafield[% loo.row | html %]" disabled> >+ [% FOREACH value IN loo.kohafields %] >+ [% IF ( value == loo.kohafield ) %] > <option value="[% value | html %]" selected="selected">[% value | html %]</option> > [% ELSE %] > <option value="[% value | html %]">[% value | html %]</option> > [% END %] >- [% END %] >- </select> >- </li> >- </ol> >- </fieldset> <!-- /.rows --> >- </div> <!-- /#oth[% loo.urisubfieldcode | html %] --> >- </div><!-- /constraints --> >- [% END # /FOREACH loo %] >+ [% END %] >+ </select> >+ <!-- Do NOT remove this next hidden input! We need it to save kohafield. --> >+ <input type="hidden" name="kohafield" value="[% loo.kohafield | html %]"/> >+ </li> >+ </ol> >+ </fieldset> <!-- /.rows --> >+ </div> <!-- /#advanced[%- PROCESS outputsubfield subfieldanchor = subfieldcode -%] --> >+ >+ <div id="oth[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="constraints"> >+ <fieldset class="rows"> >+ <legend>Other options (choose one)</legend> >+ <ol> >+ <li> >+ <label for="authorised_value[% loo.row | html %]">Authorized value:</label> >+ <select name="authorised_value" id="authorised_value[% loo.row | html %]"> >+ <option value=""></option> >+ [% FOREACH value IN loo.authorised_values %] >+ [% IF ( value == loo.authorised_value ) %] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [% ELSE %] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="authtypecode[% loo.row | html %]">Thesaurus:</label> >+ <select name="authtypecode" id="authtypecode[% loo.row | html %]"> >+ [% FOREACH value IN loo.authtypes %] >+ [% IF ( value == loo.authtypecode ) %] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [% ELSE %] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="value_builder[% loo.row | html %]">Plugin:</label> >+ <select name="value_builder" id="value_builder[% loo.row | html %]"> >+ [% FOREACH value IN loo.value_builders %] >+ [% IF ( value == loo.value_builder ) %] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [% ELSE %] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> >+ </ol> >+ </fieldset> <!-- /.rows --> >+ </div> <!-- /#oth[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%] --> >+ </div><!-- /constraints --> >+ [% END # /FOREACH loo %] >+ </div> <!-- /.tab-content --> > </div><!-- /subfieldtabs --> > > <fieldset class="action"> >@@ -399,7 +413,7 @@ > [% END %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> > <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> >@@ -431,6 +445,9 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/admin-menu.js") | $raw %] >+ <script> >+ var tagsubfield = "[% tagsubfield | html %]"; >+ </script> > [% Asset.js("js/marc_subfields_structure.js") | $raw %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js >index 2da2eb1461..898c64e3ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js >@@ -1,8 +1,15 @@ >-/* global dataTablesDefaults */ >+/* global dataTablesDefaults tagsubfield */ > $(document).ready(function() { >- var tabs = $('#subfieldtabs').tabs(); >+ if( tagsubfield && tagsubfield == "@"){ >+ $("#subfieldtabs a[href='#subATfield']").tab("show"); >+ } else if ( tagsubfield && tagsubfield != "@"){ >+ $("#subfieldtabs a[href='#sub" + tagsubfield + "field'").tab("show"); >+ } else { >+ $("#subfieldtabs a:first").tab("show"); >+ } >+ > var current_index; >- tabs.find( ".ui-tabs-nav" ).sortable({ >+ $("#subfieldtabs > ul").sortable({ > axis: "x", > start: function (e, ui) { > current_index = $(ui.item[0]).index(); >@@ -12,15 +19,15 @@ $(document).ready(function() { > if (current_index < new_index) new_index++; > var subfield_code = $(ui.item[0]).attr('id').replace( /^tab_subfield_/, ''); > var content = $('#sub' + subfield_code + 'field'); >- var panels = $("#subfieldtabs > div"); >+ var panels = $("#subfieldtabs .tab-pane"); > if ( new_index < $(panels).size() ){ >- $(content).insertBefore($("#subfieldtabs > div")[new_index]); >+ $(content).insertBefore( panels[new_index]); > } else { >- $(content).insertAfter($("#subfieldtabs > div")[new_index-1]); >+ $(content).insertAfter( panels[new_index-1]); > } >- tabs.tabs("refresh"); > } > }); >+ > $("input[id^='hidden_']").click(setHiddenValue); > $("input[id^='hidden-']").each(function() { > populateHiddenCheckboxes($(this).attr('id').split('-')[1]); >-- >2.20.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=133490">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30489
:
133304
| 133490