Attachment 71533 Details for Bug 20135 – Bug 20135: Prevent staff client language choose pop-up from appearing off-screen

[patch] Bug 20135: Prevent staff client language choose pop-up from appearing off-screen

Bug-20135-Prevent-staff-client-language-choose-pop.patch (text/plain), 7.44 KB, created by Katrin Fischer on 2018-02-13 06:34:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-02-13 06:34:01 UTC

Size: 7.44 KB

patch

obsolete

>From 4179bc2aef4fb037e68d9b0f23c62bc33f48cfe6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 5 Feb 2018 15:30:48 +0000
>Subject: [PATCH] Bug 20135: Prevent staff client language choose pop-up from
> appearing off-screen
>
>This patch fixes a bug which was introduced by Bug 19851 ("Improve
>responsive layout handling of staff client menu bar."). The changes in
>that patch did not take into account the effects it would have on the
>language menus in the footer.
>
>This patch adds some additional classes to some menus and adds some CSS
>for those classes so that menus are correctly aligned left or right
>based on their position on the screen.
>
>To test, apply the patch and clear your cache if necessary. You should
>have multiple translations installed and enabled, at least one of which
>should have more than one "sub-language" (e.g. en-GB and en-US).
>
>In the staff client, test the appearance of various drop-down menus with
>the browser width above and below 800 pixels wide:
>
>- Search and More menus in the header
>- User/Library menu in the header
>- Language selection in the footer
>- Language selection in the header
>
>In all cases, menus should look correct and should not be aligned in
>such a way that they disappear off the left or right sides of the
>screen.
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 38 +++++++++++++---------
> .../intranet-tmpl/prog/en/includes/header.inc | 6 ++--
> .../prog/en/includes/intranet-bottom.inc | 2 +-
> .../prog/en/includes/langmenu-staff-top.inc | 4 +--
> 4 files changed, 28 insertions(+), 22 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index 94cc7a6..78d1d85 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>@@ -2913,21 +2913,6 @@ span.browse-button {
> font-weight: bold;
> }
> 
>-#i18nMenu a,
>-#i18nMenu a:link,
>-#i18nMenu a:visited {
>- color : #004d99;
>- font-weight: normal;
>-}
>-
>-#i18nMenu a:hover,
>-#i18nMenu a:active,
>-#i18nMenu .dropdown-menu a:hover,
>-#i18nMenu .dropdown-menu a:focus {
>- color : #538200;
>- font-weight: normal;
>-}
>-
> #i18nMenu a .sublanguage-selected {
> color: #000;
> font-weight: bold;
>@@ -3180,7 +3165,7 @@ table#ill-requests {
> margin: 0;
> }
> 
>- .navbar-nav .open .dropdown-menu {
>+ .navbar-nav .open .dropdown-menu.dropdown-menu-left {
> position: absolute;
> float: left;
> left: auto;
>@@ -3190,6 +3175,27 @@ table#ill-requests {
> border: 1px solid rgba(0,0,0,0.15);
> box-shadow: 0 6px 12px rgba(0,0,0,0.175);
> }
>+
>+ .navbar-nav .open .dropdown-menu.dropdown-menu-right {
>+ position: absolute;
>+ float: left;
>+ left: ;
>+ right: auto;
>+ width: auto;
>+ background-color: #fff;
>+ border: 1px solid rgba(0,0,0,0.15);
>+ box-shadow: 0 6px 12px rgba(0,0,0,0.175);
>+ }
>+
>+ .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
>+ .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
>+ background-color: #0081c2;
>+ background-image: linear-gradient(to bottom, #0088cc, #0077b3);
>+ background-repeat: repeat-x;
>+ color: #ffffff;
>+ text-decoration: none;
>+ }
>+
> }
> 
> @media (min-width: 800px) {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
>index 460ea27..46d8db8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
>@@ -6,7 +6,7 @@
> [% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
> <li class="dropdown">
> <a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown">Search </a>
>- <ul class="dropdown-menu">
>+ <ul class="dropdown-menu dropdown-menu-right">
> [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></li>
> <li><a href="/cgi-bin/koha/catalogue/itemsearch.pl">Item search</a></li>[% END %]
> </ul>
>@@ -19,7 +19,7 @@
> [% IntranetNav %]
> <li class="dropdown">
> <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">More </a>
>- <ul class="dropdown-menu">
>+ <ul class="dropdown-menu dropdown-menu-right">
> <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
> [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
> <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
>@@ -77,7 +77,7 @@
> 
> 
> </a>
>- <ul class="dropdown-menu" role="menu" aria-labelledby="logged-in-menu">
>+ <ul class="dropdown-menu dropdown-menu-left" role="menu" aria-labelledby="logged-in-menu">
> 
> <li class="loggedin-menu-label">
> Logged in as: 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
>index 5361307..cc862a8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
>@@ -23,7 +23,7 @@
> [% END %]
> [% END %]
> </a>
>- <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu">
>+ <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu dropdown-menu-right">
> [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
> [% IF ( sublanguages_loo.enabled ) %]
> [% IF ( sublanguages_loo.sublanguage_current ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
>index 544e341..cf7a5d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc
>@@ -1,8 +1,8 @@
> 
> [% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
> <li class="dropdown">
>- <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"> Languages </a>
>- <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-right">
>+ <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"> Languages </a>
>+ <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">
> [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
> [% IF ( languages_loo.group_enabled ) %]
> [% IF ( languages_loo.plural ) %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20135: 71231 | 71234 | 71479 | 71533