From 18fb2f12e70b92de63bd283d7d137ee69aa82a9f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 19 Jan 2018 16:02:46 +0000
Subject: [PATCH] Bug 20045: Switch single-column templates to Bootstrap grid:
 Various

This patch updates various unrelated templates to use the Bootstrap
grid.

- about.tt - The about page
- auth.tt - The login page

  These pages should look correct.

- reports/reports-home.tt - The reports home page
- admin/admin-home.tt - The administration home page

  These pages should look correct, with a single centered column
  with wide margins on either side. At lower browser widths the margins
  should disappear.

- serials/subscription-add.tt - Serials -> Add subscription. The entry
  form should look correct during each step of the add/edit process.

- suggestion/suggestion.tt - Acquisitions -> Suggestions -> New
  suggestion. The page with the new suggestion form should look correct.

Signed-off-by: Roch D'Amour <roch.damour@inlibro.com>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/css/staff-global.css    |  6 +-----
 .../intranet-tmpl/prog/en/modules/about.tt     | 11 ++++++-----
 .../prog/en/modules/admin/admin-home.tt        | 16 +++++++++-------
 .../intranet-tmpl/prog/en/modules/auth.tt      |  4 +---
 .../prog/en/modules/reports/reports-home.tt    | 17 +++++++++--------
 .../en/modules/serials/subscription-add.tt     | 18 ++++++++----------
 .../prog/en/modules/suggestion/suggestion.tt   | 15 +++++++++++----
 7 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index 14004068c4..32a614bd70 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -676,7 +676,7 @@ fieldset.rows legend {
 fieldset.rows label, fieldset.rows span.label {  
 	float: left;  
 	font-weight : bold;
-	width: 6em;  
+    width: 9em;
 	margin-right: 1em;  
 	text-align: right;
 }
@@ -688,10 +688,6 @@ fieldset.rows fieldset {
 	padding : .3em;
 }
 
-.yui-b fieldset.rows label, .yui-b fieldset.rows span.label {  
-	width: 9em;  
-}
-
 .yui-b fieldset.rows td label, .yui-b fieldset.rows td span.label {
         width: auto;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 76099f8aae..cac50024fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -10,11 +10,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; About Koha</div>
 
-<div id="doc3" class="yui-t7">
 
-   <div id="bd">
-    <div id="yui-main">
-    <div class="yui-g">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-12">
+
             <h1>About Koha</h1>
 
     <div id="abouttabs" class="toptabs numbered">
@@ -1041,7 +1041,8 @@
         </div>
 
     </div>
-</div></div></div>
+</div>
+</div>
 
 [% MACRO jsinclude BLOCK %]
     <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index af9a53b43d..c0c1917691 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -10,13 +10,14 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Administration</div>
 
-<div id="doc" class="yui-t7">
-    <div id="bd">
-        <div id="yui-main" class="sysprefs">
-            <div class="yui-g"><h1>Koha administration</h1></div>
-            <div class="yui-g">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
+
+        <h1>Koha administration</h1>
+        <div class="row">
+            <div class="col-md-6 sysprefs">
 
-                <div class="yui-u first">
                 <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
                 <fieldset>
                     <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
@@ -67,7 +68,7 @@
                     </dl>
                 [% END %]
                 </div>
-                <div class="yui-u">
+                <div class="col-md-6 sysprefs">
                 <h3>Catalog</h3>
                 <dl>
                     <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
@@ -134,4 +135,5 @@
         </div>
     </div>
 </div>
+
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 19c5a2bae8..8d5158666e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -14,8 +14,7 @@
 </head>
 <body id="main_auth" class="main_main-auth">
 
-<div id="doc" class="yui-t7">
-   <div id="bd">
+<div class="main container-fluid">
 
 <div id="login">
 <h1><a href="http://koha-community.org">Koha</a></h1>
@@ -108,7 +107,6 @@
 <!--	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password lost and found">Lost your password?</a></li> -->
 <!-- </ul> -->
 
-</div>
 </div>
 
 [% MACRO jsinclude BLOCK %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
index 6b47b70bdd..f8b806714f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
@@ -8,14 +8,15 @@
 [% INCLUDE 'circ-search.inc' %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Reports</div>
-<div id="doc" class="yui-t7">
 
-   <div id="bd">
-    <div id="yui-main">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
+
+        <h2>Guided reports</h2>
+        <div class="row">
+            <div class="col-xs-6">
 
-    <div class="yui-g">
-    <h1>Reports</h1>
-    <div class="yui-u first"><h2>Guided reports</h2>
         <ul>
             <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a></li>
             [% IF ( CAN_user_reports_create_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new</a></li>[% END %]
@@ -48,7 +49,7 @@
 
     </div>
 
-    <div class="yui-u"><h2>Top lists</h2>
+    <div class="col-xs-6"><h2>Top lists</h2>
 	<ul>
         <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
         <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
@@ -73,7 +74,7 @@
 
 
 </div>
-    <div class="yui-g" id="intranet-reports-home-html">
+    <div class="col-md-12" id="intranet-reports-home-html">
         [% Koha.Preference('IntranetReportsHomeHTML') %]
     </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index f8ec0839a0..b986e099fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -18,9 +18,9 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle |html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</div>
 
-<div id="doc3" class="yui-t7">
-    <div id="bd">
-        <div class="yui-g">
+<div class="main container-fluid">
+    <div class="row">
+
             <h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1>
             <form method="post" id="subscription_add_form" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated">
                 [% IF ( modify ) %]
@@ -33,7 +33,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
                 <input type="hidden" name="irreg_check" value="0" />
 
                 <div id="page_1">
-                    <div class="yui-u first">
+                    <div class="col-md-6">
                         <fieldset id="subscription_add_information" class="rows">
                             <legend>Subscription details</legend>
                             <ol>
@@ -203,7 +203,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
                 </div>
 
                 <div id="page_2">
-                    <div class="yui-u first">
+                    <div class="col-md-6">
                         <div id="subscription_form_planning">
                             <fieldset class="rows">
                                 <legend>Serials planning</legend>
@@ -357,7 +357,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
                                         <table id="advancedpredictionpatternt">
                                             <thead>
                                                 <tr>
-                                                    <th colspan="4">Advanced prediction pattern</td>
+                                                    <th colspan="4">Advanced prediction pattern</th>
                                                 </tr>
                                                 <tr>
                                                     <th>&nbsp;</th>
@@ -411,7 +411,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
                                                 </tr>
                                                 <tr>
                                                     [% BLOCK numbering_select %]
-                                                        <select disabled="disabled" id="[% name %]" name="[% name %]" />
+                                                        <select disabled="disabled" id="[% name %]" name="[% name %]">
                                                             <option value=""></option>
                                                             <option value="dayname">Name of day</option>
                                                             <option value="dayabrv">Name of day (abbreviated)</option>
@@ -475,14 +475,12 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
                             </fieldset>
                         </div>
                     </div>
-                    <div class="yui-u">
+                    <div class="col-md-6">
                         <li id="displayexample"></li>
                     </div>
                 </div>
             </form>
         </div>
-    </div>
-</div>
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index c793e2d298..5885912cf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -220,10 +220,17 @@
 </div>
 [% ELSE %]
 
-[% IF ( op_save ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
-<div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
+[% IF ( op_save ) %]
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
+[% ELSE %]
+    <div id="doc3" class="yui-t2">
+        <div id="bd">
+            <div id="yui-main">
+                <div class="yui-b">
+[% END %]
+
 [% IF ( op_save ) %]
     <form id="add_edit" action="suggestion.pl" method="post" class="validated">
     <input type="hidden" name="redirect" id="redirect" value="[% redirect %]" />
-- 
2.39.5