From 3eb50270b1a02fe98cde767ad0240b2943e23321 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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"
. 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 Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/css/staff-global.css | 4 ++++ .../modules/course_reserves/add_items-step1.tt | 6 ++++-- .../modules/course_reserves/add_items-step2.tt | 6 ++++-- .../en/modules/course_reserves/course-details.tt | 7 ++++--- .../modules/course_reserves/course-reserves.tt | 13 +++++-------- .../prog/en/modules/course_reserves/course.tt | 7 +++++-- .../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 78d1d8511e..3ab9d7e1ec 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 daf1602a3d..7cdc9afc8b 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 @@ -
-
+
+
+
[% IF ERROR_ITEM_NOT_FOUND %] [% IF UNKNOWN_BARCODE %] @@ -41,5 +42,6 @@
+
[% 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 7ab45a2b4b..7960ff414f 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 @@ -
-
+
+
+
[% IF course_reserve %]
This course already has this item on reserve.
[% END %] [% IF course_item %]
Number of courses reserving this item: [% course_item.course_reserves.size %]
[% END %] @@ -112,5 +113,6 @@
+
[% 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 bdddeb5756..8052ff0d73 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 @@ -
-
-
+
+
+
+ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
    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 b706fb224f..f46ea909f1 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 @@ -
    -
    -
    -
    -
    +
    +
    +
    + [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
      @@ -93,11 +92,9 @@ [% END %] -
    +
    -
    -
    [% 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 b2ada82d9d..a0978c9c7e 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 ) %] -
    -
    +
    +
    +
    +
    [% IF course_id %][% END %]
    @@ -123,6 +125,7 @@
    +
    [% 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 7b51c47718..eb12031abf 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 @@ -
    -
    -
    -
    -
    -

    Invalid course!

    -
    +
    +
    +
    + +
    +

    Invalid course!

    +
    -
    - [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5