@@ -, +, @@ by Bug 20154 - Without changing tabs, choose "Edit record" from the "Edit" dropdown menu." - The authorities editor should load and display the "Section 0" tab. - Return to the authority detail page and select a tab besides tab 0. - Click back to tab 0. Editing the record at this point should open the editor to Section 0. - Return to the authority detail page. - Click any of the numbered tabs besides tab 0. - Choose "Edit record" from the "Edit" dropdown menu. - When the authorities edit page loads the same tab should be preselected. - Test that when you switch tabs in the authority editor the cursor focus is automatically moved to the first visible input. --- .../en/modules/authorities/authorities.tt | 28 +++++++++++-------- .../prog/en/modules/authorities/detail.tt | 8 ++++++ 2 files changed, 25 insertions(+), 11 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -21,17 +21,21 @@ }); var Sticky; $(document).ready(function() { - var tabs = $('#authoritytabs').tabs().bind('show.ui-tabs', function(e, ui) { - $("#"+ui.panel.id+" input:eq(0)").focus(); - }); - - $( "ul.sortable_field", tabs ).sortable(); - $( "ul.sortable_subfield", tabs ).sortable(); + var tabs = $('#authoritytabs').tabs({ + activate: function(e, ui) { + $("#"+ $(ui.newPanel).attr("id") + " .input_marceditor:visible:eq(0)").focus(); + } + }); + + /* On page load, check for location.hash in the page URL */ + var hash = location.hash; + var hashPieces = hash.split('?'); + if( hashPieces[0] !== "" ){ + var activeTab = $("[href='" + hashPieces[0] + "']"); + selectTab(activeTab); + window.scrollTo( 0, 0 ); + } - [% IF tab %] - link = $("a[href='#[% tab | html %]']"); - selectTab( link ); - [% END %] $( "ul.sortable_field", tabs ).sortable(); $( "ul.sortable_subfield", tabs ).sortable(); Sticky = $("#toolbar"); @@ -362,7 +366,9 @@ [% FOREACH BIG_LOO IN BIG_LOOP %]
- + [% IF ( BIG_LOOP.size > 1 ) %] +

Section [% BIG_LOO.number | html %]

+ [% END %] [% previous = "" %] [% FOREACH innerloo IN BIG_LOO.innerloop %] [% IF ( innerloo.tag ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -134,6 +134,14 @@ $("#authoritiestabs a:first").tab("show"); } + var editAuth = $("#editAuth"); + var editAuthLink = editAuth.attr("href"); + + $("a[data-toggle='tab']").on("shown.bs.tab", function (e) { + var newTabId = $(this).attr("href"); + editAuth.attr("href", editAuthLink + newTabId ); + }); + [% IF ( displayhierarchy ) %] $('#hierarchies').jstree({ "types" : { --