Bug 20051: Invalid markup in staff client's header.inc

This patch corrects markup errors in header.inc which introduced by
Bug 19851. For id attributes on <span>s have been replaced with classes,
eliminating an HTML validator error about duplicate ids.

Minor unrelated change: Updated an element's id with a more descriptive
name.

Test plan the same as Bug 19851's:

 - Log in to the staff client and confirm that the appearance of the
   menu bar at the top of the screen looks correct at various browser
   widths.
 - Confirm that the logged-in user menu label and help link expand and
   collapse according to browser width.

Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Fix for QA: Corrected ID reference in circ/offline.tt

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2018-01-19 19:41:35 +00:00 committed by Jonathan Druart
parent 11515d5f76
commit 320e66b043
2 changed files with 7 additions and 7 deletions

View File

@ -53,7 +53,7 @@
<ul class="nav navbar-nav navbar-right">
[% IF ( loggedinusername ) %]
<li class="dropdown">
<a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
<a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">
<span id="logged-in-info-brief">
<i class="fa fa-user"></i>
</span>
@ -69,15 +69,15 @@
[% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
NO LIBRARY SET
[% ELSE %]
<span id="logged-in-branch-name">[% LoginBranchname %]</span>
<span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
<span class="logged-in-branch-name">[% LoginBranchname %]</span>
<span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
[% END %]
</strong>
[% END %]
</span>
<b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
<ul class="dropdown-menu" role="menu" aria-labelledby="logged-in-menu">
<li class="loggedin-menu-label">
Logged in as:<br />
@ -93,8 +93,8 @@
NO LIBRARY SET
[% ELSE %]
Location: <br />
<span id="logged-in-branch-name">[% LoginBranchname %]</span>
<span id="logged-in-branch-code" class="content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
<span class="logged-in-branch-name">[% LoginBranchname %]</span>
<span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode %]</span>
[% END %]
[% END %]
</li>

View File

@ -651,7 +651,7 @@
kohadb.initialize();
$('#header_search #circ_search .tip').text(_("Enter patron card number:"));
$('ul[aria-labelledby="drop3"]').html('<li><a class="toplinks">You cannot change your branch or logout while using offline circulation</a></li>');
$('ul[aria-labelledby="logged-in-menu"]').html('<li><a class="toplinks">You cannot change your branch or logout while using offline circulation</a></li>');
// Returns code
$('#checkin-form, #checkin_search form').submit(function (event) {