From fc2ed2bb80857bddf08419284e99edbd3c55d008 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
- 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.
---
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++++
.../prog/en/modules/course_reserves/course-details.tt | 7 ++++---
.../prog/en/modules/course_reserves/course-reserves.tt | 13 +++++--------
.../prog/en/modules/course_reserves/invalid-course.tt | 16 +++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index 515c4e3..df39915 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/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
index 9a8ed8c..1930e79 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 8abc0b0..2e6b7a4 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/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