Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 19981: Switch single-column templates to Bootstrap grid: Course reserves

Browse source 
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>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2018-01-16 15:03:29 +00:00 committed by Jonathan Druart
parent a418f73cf5
commit 3eb50270b1
7 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/css/staff-global.css
View file

@ -170,6 +170,10 @@ label input[type="radio"],
padding-top : 1em;
}
.main {
margin-top: 1em;
}
#login_controls {
position : absolute;
right : .5em;

6
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
View file

@ -9,8 +9,9 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; 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' %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
View file

@ -11,8 +11,9 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; 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' %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
View file

@ -16,9 +16,10 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; 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">

13
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
View file

@ -14,11 +14,10 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <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' %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
View file

@ -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 %]

16
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
View file

@ -8,17 +8,15 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <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' %]