Bugzilla – Attachment 104893 Details for
Bug 25477
The responsive design in opac-main.tt should be correct
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25477: The responsive design in opac-main.tt should be correct
Bug-25477-The-responsive-design-in-opac-maintt-sho.patch (text/plain), 12.89 KB, created by
Timothy Alexis Vass
on 2020-05-14 15:27:01 UTC
(
hide
)
Description:
Bug 25477: The responsive design in opac-main.tt should be correct
Filename:
MIME Type:
Creator:
Timothy Alexis Vass
Created:
2020-05-14 15:27:01 UTC
Size:
12.89 KB
patch
obsolete
>From 4b3090f9a72bbc1046a268d90a8460473b7abe49 Mon Sep 17 00:00:00 2001 >From: Timothy Alexis Vass <timothy_alexis.vass@ub.lu.se> >Date: Wed, 13 May 2020 11:02:44 +0200 >Subject: [PATCH] Bug 25477: The responsive design in opac-main.tt should be > correct > > @media (min-width:768px) and (max-width:979px): > The layouts with columns are too narrow. > > This patch changes the layout to be span8+span4 and puts OpacNav/OpacNavBottom under Login/OpacNavRight in the right column. > > To test: > 1) Navigate to cgi-bin/koha/opac-main.pl with content in OpacNav/OpacNavBottom and Login/OpacNavRight, or look at the attached screenshots: https://bugs.koha-community.org/bugzilla3/attachment.cgi?bugid=25477&action=viewall&hide_obsolete=1 > 2) Apply patch. > 3) Try different screen widths at 678px and above. > 4) Sign off. > > Sponsored-by: Lunds Universitetsbibliotek >--- > .../opac-tmpl/bootstrap/css/src/opac.scss | 4 + > .../bootstrap/en/modules/opac-main.tt | 138 ++++++++---------- > 2 files changed, 68 insertions(+), 74 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss >index 8babc17b63..86d1cf52b8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss >+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss >@@ -266,6 +266,10 @@ th { > } > } > >+#wrap { >+ padding: 0; >+} >+ > #advsearches, > #booleansearch { > label { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index e9b4e34616..06615b2c33 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -25,7 +25,7 @@ > </li> > </ul> > >- [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >+ [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] > [% IF ( loggedinusername ) %] > <div id="loggedin" class="container-fluid"> > [% ELSE %] >@@ -36,24 +36,11 @@ > [% END %] > > <div class="row-fluid"> >- [% IF ( OpacNav || OpacNavBottom ) %] >- <div class="span2"> >- <div id="navigation"> >- [% INCLUDE 'navigation.inc' %] >- </div> >- </div> >- [% END %] >- >- [% IF ( OpacNav || OpacNavBottom ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %] >- <div class="span7"> >- [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %] >- <div class="span9"> >- [% ELSIF ( OpacNav || OpacNavBottom ) %] >- <div class="span10"> >+ [% IF ( OpacNav || OpacNavBottom || Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %] >+ <div class="span8"> > [% ELSE %] > <div class="span12"> > [% END %] >- > [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] > [% UNLESS news_item %] > <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl"> >@@ -158,70 +145,73 @@ > [% END %] > [% END %] > >- </div> <!-- / .span 7/9 --> >- >- [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %] >- <div class="span3"> >- [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >- [% UNLESS ( loggedinusername ) %] >- [% UNLESS ( casAuthentication || shibbolethAuthentication ) %] >- <div id="login"> >- <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off"> >- <input type="hidden" name="koha_login_context" value="opac" /> >- <fieldset class="brief"> >- <legend>Log in to your account:</legend> >- <label for="userid">Login:</label><input type="text" id="userid" name="userid" /> >- <label for="password">Password:</label><input type="password" id="password" name="password" /> >- <fieldset class="action"> >- <input type="submit" value="Log in" class="btn" /> >- </fieldset> >- [% IF Koha.Preference( 'OpacLoginInstructions' ) %] >- <div id="nologininstructions-main" class="nologininstructions"> >- [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %] >- </div> >- [% END %] >- [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %] >- <div id="forgotpassword-main" class="forgotpassword"> >- <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p> >- </div> >- [% END %] >- [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %] >- <div id="patronregistration-main" class="patronregistration"> >- <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p> >- </div> >- [% END %] >+ </div> <!-- / .span 8/12 --> >+ >+ [% IF ( OpacNav || OpacNavBottom || Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight ) %] >+ <div class="span4"> >+ [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] >+ [% UNLESS ( aloggedinusername ) %] >+ [% UNLESS ( bcasAuthentication || fshibbolethAuthentication ) %] >+ <div id="login"> >+ <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off"> >+ <input type="hidden" name="koha_login_context" value="opac" /> >+ <fieldset class="brief"> >+ <legend>Log in to your account:</legend> >+ <label for="userid">Login:</label><input type="text" id="userid" name="userid" /> >+ <label for="password">Password:</label><input type="password" id="password" name="password" /> >+ <fieldset class="action"> >+ <input type="submit" value="Log in" class="btn" /> > </fieldset> >- </form> >- </div> <!-- /#login --> >- [% END # /casAuthentication %] >- [% ELSE %] >- [% IF Koha.Preference('OPACUserSummary') && dashboard_info %] >- <div id="user_summary"> >- <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></h3> >- <ul id="user_summary_shortcuts"> >- [% IF checkouts && checkouts > 0 %] >- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts | html %]</span> checkout(s)</a></li> >+ [% IF Koha.Preference( 'OpacLoginInstructions' ) %] >+ <div id="nologininstructions-main" class="nologininstructions"> >+ [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %] >+ </div> > [% END %] >- [% IF overdues && overdues > 0 %] >- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues | html %]</span> overdue(s)</a></li> >+ [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %] >+ <div id="forgotpassword-main" class="forgotpassword"> >+ <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p> >+ </div> > [% END %] >- [% IF holds_pending && holds_pending > 0 %] >- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending | html %]</span> hold(s) pending</a></li> >+ [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %] >+ <div id="patronregistration-main" class="patronregistration"> >+ <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p> >+ </div> > [% END %] >- [% IF holds_waiting && holds_waiting > 0 %] >- <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li> >- [% END %] >- [% IF total_owing && total_owing > 0 %] >- <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li> >- [% END %] >- </ul> >- </div> >- [% END %] >- [% END # /loggedinusername %] >+ </fieldset> >+ </form> >+ </div> <!-- /#login --> >+ [% END # /casAuthentication %] >+ [% ELSIF ( OpacNavRight ) %] >+ [% IF Koha.Preference('OPACUserSummary') && dashboard_info %] >+ <div id="user_summary"> >+ <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></h3> >+ <ul id="user_summary_shortcuts"> >+ [% IF checkouts && checkouts > 0 %] >+ <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts | html %]</span> checkout(s)</a></li> >+ [% END %] >+ [% IF overdues && overdues > 0 %] >+ <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues | html %]</span> overdue(s)</a></li> >+ [% END %] >+ [% IF holds_pending && holds_pending > 0 %] >+ <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending | html %]</span> hold(s) pending</a></li> >+ [% END %] >+ [% IF holds_waiting && holds_waiting > 0 %] >+ <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li> >+ [% END %] >+ [% IF total_owing && total_owing > 0 %] >+ <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% END %] > [% END # /opacuserlogin %] > [% PROCESS koha_news_block news => OpacNavRight %] >- </div> <!-- / .span3 --> >- [% END # /opacuserlogin || OpacNavRight %] >+ [% END # /opacuserlogin || OpacNavRight %] >+ <div id="navigation"> >+ [% INCLUDE 'navigation.inc' %] >+ </div> >+ </div> <!-- /.span4 --> >+ [% END %] > > </div> <!-- /.container-fluid --> > </div> <!-- /.row-fluid --> >-- >2.20.1
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 25477
:
104822
|
104823
|
104824
|
104825
|
104827
|
104828
|
104829
|
104889
|
104890
|
104891
| 104893