Bugzilla – Attachment 71711 Details for
Bug 19981
Switch single-column templates to Bootstrap grid: Course reserves
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19981: Switch single-column templates to Bootstrap grid: Course reserves
Bug-19981-Switch-single-column-templates-to-Bootst.patch (text/plain), 8.63 KB, created by
Claire Gravely
on 2018-02-16 10:23:44 UTC
(
hide
)
Description:
Bug 19981: Switch single-column templates to Bootstrap grid: Course reserves
Filename:
MIME Type:
Creator:
Claire Gravely
Created:
2018-02-16 10:23:44 UTC
Size:
8.63 KB
patch
obsolete
>From b8781cbc0382efef43e5465e4c4df7155c1e69d8 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 16 Jan 2018 15:03:29 +0000 >Subject: [PATCH] Bug 19981: Switch single-column templates to Bootstrap grid: > Course reserves > >This patch updates three single-column course reserves templates to use >the Bootstrap grid: > >- course-reserves.tt - The main Course Reserves page >- course-details.tt - The detail view of an individual course >- course.tt - Editing a course >- add_items-step1.tt - Adding items to a course, step 1 (scan barcode) >- add_items-step2.tt - Adding items to a course, step 2 >- invalid-course.tt - The error page shown if you try to view > course_reserves/course-details.pl directly without passing a course id > in the URL > - Also changed in this template: Error message has been wrapped in the > standard "dialog alert" <div>. > >Each of these pages should look correct, with a single centered column >with wide margins on either side. At lower browser widths the margins >should disappear. > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> >--- > koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++++ > .../prog/en/modules/course_reserves/add_items-step1.tt | 6 ++++-- > .../prog/en/modules/course_reserves/add_items-step2.tt | 6 ++++-- > .../prog/en/modules/course_reserves/course-details.tt | 7 ++++--- > .../prog/en/modules/course_reserves/course-reserves.tt | 13 +++++-------- > .../prog/en/modules/course_reserves/course.tt | 7 +++++-- > .../prog/en/modules/course_reserves/invalid-course.tt | 16 +++++++--------- > 7 files changed, 33 insertions(+), 26 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >index 78d1d85..3ab9d7e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -170,6 +170,10 @@ label input[type="radio"], > padding-top : 1em; > } > >+.main { >+ margin-top: 1em; >+} >+ > #login_controls { > position : absolute; > right : .5em; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >index daf1602..7cdc9af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >@@ -9,8 +9,9 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> › Add reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div> > >-<div id="doc" class="yui-t7"> >- <div id="bd"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> > > [% IF ERROR_ITEM_NOT_FOUND %] > [% IF UNKNOWN_BARCODE %] >@@ -41,5 +42,6 @@ > </fieldset> > </form> > </div> >+</div> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >index 7ab45a2..7960ff4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >@@ -11,8 +11,9 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> › Reserve <i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div> > >-<div id="doc" class="yui-t7"> >- <div id="bd"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> > > [% IF course_reserve %]<div class="dialog message" id="already_on_reserve_this">This course already has this item on reserve.</div>[% END %] > [% IF course_item %]<div class="dialog message" id="already_on_reserve">Number of courses reserving this item: [% course_item.course_reserves.size %]</div>[% END %] >@@ -112,5 +113,6 @@ > </fieldset> > </form> > </div> >+</div> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index bdddeb5..8052ff0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -16,9 +16,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> › Course details for <i>[% course.course_name %]</i></div> > >-<div id="doc2" class="yui-t7"> >- <div id="bd"> >- <div id="yui-main"> >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> >+ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %] > <div id="toolbar"> > <ul class="toolbar"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index b706fb2..f46ea90 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -14,11 +14,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></div> > >-<div id="doc2" class="yui-t7"> >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >- <div class="yui-g"> >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> >+ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %] > <div id="toolbar"> > <ul class="toolbar"> >@@ -93,11 +92,9 @@ > [% END %] > </tbody> > </table> >- </div> >+ > </div> > </div> >- </div> >-</div> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >index b2ada82..a0978c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >@@ -13,8 +13,10 @@ > > [% IF ( departments ) %] > >- <div id="doc" class="yui-t7"> >- <div id="bd"> >+ <div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> >+ > <form method="post" action="/cgi-bin/koha/course_reserves/mod_course.pl" class="validated"> > [% IF course_id %]<input type="hidden" name="course_id" value="[% course_id %]" />[% END %] > <fieldset class="rows"> >@@ -123,6 +125,7 @@ > </fieldset> > </form> > </div> >+ </div> > > [% ELSE %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >index 7b51c47..eb12031 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >@@ -8,17 +8,15 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></div> > >-<div id="doc2" class="yui-t7"> >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >- <div class="yui-g"> >- <p>Invalid course!</p> >- </div> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-md-8 col-md-offset-2"> >+ >+ <div class="dialog alert"> >+ <p>Invalid course!</p> > </div> >+ > </div> > </div> >-</div> >- > > [% INCLUDE 'intranet-bottom.inc' %] >-- >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 19981
:
70557
|
70559
|
71711
|
71907