Bugzilla – Attachment 71086 Details for
Bug 20051
Invalid markup in staff client's header.inc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20051: Invalid markup in staff client's header.inc
Bug-20051-Invalid-markup-in-staff-clients-headerin.patch (text/plain), 4.55 KB, created by
Owen Leonard
on 2018-01-31 13:07:53 UTC
(
hide
)
Description:
Bug 20051: Invalid markup in staff client's header.inc
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-01-31 13:07:53 UTC
Size:
4.55 KB
patch
obsolete
>From e36e63695df055fc8a045a84313e540a6c056b05 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 19 Jan 2018 19:41:35 +0000 >Subject: [PATCH] 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 >--- > koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 12 ++++++------ > koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >index ced56a5..8e11080 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >@@ -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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index 257a92d..49efd63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >@@ -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) { >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20051
:
70777
|
70783
|
70973
| 71086