Bugzilla – Attachment 86023 Details for
Bug 21304
Update two-column templates with Bootstrap grid: Catalog
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21304: (follow-up) Fix style of search results browser
Bug-21304-follow-up-Fix-style-of-search-results-br.patch (text/plain), 6.30 KB, created by
Liz Rea
on 2019-03-04 18:34:04 UTC
(
hide
)
Description:
Bug 21304: (follow-up) Fix style of search results browser
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2019-03-04 18:34:04 UTC
Size:
6.30 KB
patch
obsolete
>From ed892ad60830d1cead622dfa0f32343c61a7a052 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 5 Sep 2018 12:38:33 +0000 >Subject: [PATCH] Bug 21304: (follow-up) Fix style of search results browser > >This follow-up revises the style of the search result browser in the >staff client, making it behave better at smaller browser widths. > >The patch also makes a couple of ESLint-prompted changes to browser.js > >To test, apply the patch and regenerate CSS. > > - Perform a catalog search in the staff client. > - Click on one of the search results. > - On the bibliographic detail page there should be results browsing > controls in the left-hand sidebar. > - Resize the browser window and confirm that the controls work well > at various sizes. > - Test with both the first and last search result. > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >--- > koha-tmpl/intranet-tmpl/js/browser.js | 6 +- > .../intranet-tmpl/prog/css/src/staff-global.scss | 78 ++++++++++++++-------- > .../prog/en/modules/catalogue/results.tt | 2 +- > 3 files changed, 57 insertions(+), 29 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/js/browser.js b/koha-tmpl/intranet-tmpl/js/browser.js >index 173eaa063c..e706833ccc 100644 >--- a/koha-tmpl/intranet-tmpl/js/browser.js >+++ b/koha-tmpl/intranet-tmpl/js/browser.js >@@ -1,3 +1,5 @@ >+/* global BROWSER_PREVIOUS BROWSER_NEXT BROWSER_RETURN_TO_SEARCH */ >+ > if ( KOHA === undefined ) var KOHA = {}; > > KOHA.browser = function (searchid, biblionumber) { >@@ -70,7 +72,7 @@ KOHA.browser = function (searchid, biblionumber) { > if ( ev.which == 2 || ev.which == 1 && ev.ctrlKey ) { > // Middle click or ctrl + click > ev.preventDefault(); >- var newwindow = window.open( $(this).attr('href') + '&searchid=' + me.searchid, '_blank' ) >+ var newwindow = window.open( $(this).attr('href') + '&searchid=' + me.searchid, '_blank' ); > newwindow.blur(); > window.focus(); > } else if ( ev.which == 1 ) { >@@ -102,7 +104,7 @@ KOHA.browser = function (searchid, biblionumber) { > } else { > nextbutton = '<a href="#" id="browse-next" class="browse-button">' + BROWSER_NEXT + ' »</a>'; > } >- $('#menu').before('<div class="browse-controls"><div class="browse-controls-inner"><div class="browse-label"><a href="' + searchURL + '" id="browse-return-to-results" class="browse-button searchwithcontext">' + BROWSER_RETURN_TO_SEARCH + '</a></div><div class="browse-prev-next">' + prevbutton + nextbutton + '</div></div></div>'); >+ $('#menu').before('<div class="browse-controls"><div class="browse-controls-inner"><div class="browse-label"><a href="' + searchURL + '" id="browse-return-to-results" class="searchwithcontext">' + BROWSER_RETURN_TO_SEARCH + '</a></div><div class="browse-prev-next">' + prevbutton + nextbutton + '</div></div></div>'); > $('a#browse-previous').click(function (ev) { > ev.preventDefault(); > browseRecords(-1); >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index ee75489616..cb95a8a125 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -3714,16 +3714,26 @@ progress { > } > > #browse-return-to-results { >- border-top-left-radius: 3px; >- border-top-right-radius: 3px; >+ background-color: #E8F0F6; >+ border: 1px solid #B9D8D9; >+ border-bottom-width: 0; >+ border-top-left-radius: 5px; >+ border-top-right-radius: 5px; > display: block; >+ padding: .5em; > text-align: center; > } > > .browse-button { >+ background-color: #FFF; >+ border: 1px solid #B9D8D9; > color: #004D99; >- display: inline-block; >+ display: block; >+ overflow: hidden; > padding: .4em .6em; >+ text-align: center; >+ white-space: nowrap; >+ width: 100%; > > &:hover { > background: #FAFAFA; >@@ -3777,34 +3787,13 @@ span { > } > } > >-.browse-label, >-.browse-prev-next { >- border: 1px solid #B9D8D9; >-} >- >-.browse-label { >- background-color: #E8F0F6; >- border-top-left-radius: 5px; >- border-top-right-radius: 5px; >-} >- >-.browse-prev-next { >- border-bottom-left-radius: 5px; >- border-bottom-right-radius: 5px; >- border-top-width: 0; >-} >- > #browse-previous { >- border-bottom-left-radius: 5px; >- border-right: 1px solid #B9D8D9; >- padding-right: 1em; >+ border-bottom-width: 0; > } > > #browse-next { > border-bottom-right-radius: 5px; >- border-top-width: 0; >- float: right; >- padding-right: 1em; >+ border-bottom-left-radius: 5px; > } > > .loading-overlay { >@@ -4444,6 +4433,24 @@ span { > } > } > >+@media only screen and ( max-width: 768px ) { >+ .browse-button { >+ display: inline-block; >+ width: 50%; >+ } >+ >+ #browse-previous { >+ border-bottom-left-radius: 5px; >+ border-bottom-width: 1px; >+ border-right-width: 0; >+ } >+ >+ #browse-next { >+ border-bottom-left-radius: 0; >+ border-bottom-right-radius: 5px; >+ } >+} >+ > @media (min-width: 800px) { > #helper { > i { >@@ -4471,3 +4478,22 @@ span { > div#makechart ol li { > list-style: none; > } >+ >+@media only screen and ( min-width: 1200px ) { >+ .browse-button { >+ display: inline-block; >+ width: 50%; >+ } >+ >+ #browse-previous { >+ border-bottom-left-radius: 5px; >+ border-bottom-width: 1px; >+ border-right-width: 0; >+ } >+ >+ #browse-next { >+ border-bottom-left-radius: 0; >+ border-bottom-right-radius: 5px; >+ text-align: right; >+ } >+} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 1cc6193466..506f527db9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -627,7 +627,7 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'admin-menu.inc' %] >+ [% INCLUDE 'facets.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >-- >2.11.0
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 21304
:
78343
|
78375
|
78437
|
78491
|
78494
|
79184
|
80405
|
80406
|
81192
|
81193
|
82179
|
82186
|
82187
|
84704
|
84705
|
85980
|
86015
|
86016
|
86022
|
86023
|
86126
|
86127
|
86753