Bug 21523: Update two-column templates with Bootstrap grid: Serials part 2

This patch modifies several serials templates to use the
Bootstrap grid instead of YUI.

This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Serials home page
   - Subscription search
     - Subscription details
       - Edit history (under the "Planning" tab. Manual history must be
         enabled for that subscription).
       - Subscribers
 - Serials -> Manage frequencies
 - Serials -> Manage numbering patterns

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index 7673939..d9630b0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -12,16 +12,22 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Serials </div>
 
-<div id="doc3" class="yui-t2">
-<div id="bd">
-  <div id="yui-main">
-    <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
       [% INCLUDE 'serials-toolbar.inc' %]
-    </div>
-  </div>
-  <div class="yui-b">
-    [% INCLUDE 'serials-menu.inc' %]
-  </div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 </div>
 
 [% MACRO jsinclude BLOCK %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 99ca861..2ce4afa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -197,10 +197,11 @@
   </form>
 [% END %]
 
-<div id="doc3" class="yui-t2">
-  <div id="bd">
-    <div id="yui-main">
-      <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
       [% INCLUDE 'serials-toolbar.inc' %]
 
       [% IF ( done_searched ) %]
@@ -313,10 +314,13 @@
             </div>
         [% END %]
       [% END %]
-    </div>
-  </div>
 
-  <div class="yui-b">
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+
     [% INCLUDE 'serials-menu.inc' %]
     [% IF ( done_searched ) %]
     <div id="advsearch">
@@ -395,20 +399,23 @@
           </fieldset>
         </form>
       [% END %]
-  </div>
-</div>
+
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
+
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         var subscriptionid = "[% subscriptionid | html %]";
         var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?");
         var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?");
         var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?");
     </script>
     [% Asset.js("js/serials-toolbar.js") | $raw %]
-    <script type="text/javascript">
+    <script>
 
             function itemSelectionBuildEditLink(div) {
                 var subscription_ids = new Array();

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index d9f1732..3a7dd03 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -23,11 +23,11 @@
     [% UNLESS blocking_error %]› Details for subscription #[% subscriptionid | html %][% END %]
 </div>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
        [% INCLUDE 'serials-toolbar.inc' %]
 
     <h1>Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]</h1>
@@ -68,8 +68,8 @@
 </ul>
 
 <div id="subscription_info">
-    <div class="yui-g">
-    <div class="yui-u first">
+    <div class="row">
+    <div class="col-sm-6">
     <div class="rows">
                <ol>
                <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
@@ -100,7 +100,7 @@
         </ol>
     </div>
     </div>
-    <div class="yui-u">
+    <div class="col-sm-6">
     <div class="rows">
         <ol>
         [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %]
@@ -120,8 +120,8 @@
      </div>
 
      [% IF additional_fields_for_subscription %]
-    <div class="yui-g">
-      <div class="yui-u first">
+    <div class="row">
+      <div class="col-sm-6">
         <div class="rows">
           <legend>Additional fields:</legend>
           <ol>
@@ -143,7 +143,8 @@
 </div>
 
     <div id="subscription_planning">
-    <div class="yui-g">
+    <div class="row">
+    <div class="col-sm-12">
     <div class="rows">
         <ol>
             <li><span class="label">Beginning date:</span> [% startdate | html %]
@@ -201,6 +202,7 @@
     </div>
     </div>
     </div>
+    </div>
     <div id="subscription_numbering" style="display:none;">
         <h3>Numbering calculation</h3>
         <p><label>Numbering formula:</label> [% numberingmethod | html %]</p>
@@ -317,7 +319,8 @@
         </table>
     </div>
     <div id="subscription_summary">
-    <div class="yui-g">
+    <div class="row">
+    <div class="col-sm-12">
     <div class="rows">
         <ol>
             <li><span class="label">Start date:</span> [% startdate | html %] </li>
@@ -412,16 +415,18 @@
           </div>
       [% END %]
 
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript">
+    <script>
         var subscriptionid = "[% subscriptionid | html %]";
         var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?");
         var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?");
@@ -430,7 +435,7 @@
     [% Asset.js("js/serials-toolbar.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
-    <script type="text/javascript">
+    <script>
         // the english words used in display purposes
         var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern",
         "Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"),_("Season"),_("Year"));

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
index cecb67e..ee6230d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
@@ -23,11 +23,11 @@
     <a href="/cgi-bin/koha/serials/subscription-frequencies.pl">Frequencies</a>
 </div>
 
-<div id="doc3" class="yui-t2">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
-<div id="bd">
-  <div id="yui-main">
-    <div class="yui-b">
       [% IF (new or modify) %]
         [% IF (new) %]
           <h1>New frequency</h1>
@@ -157,15 +157,18 @@
         [% END %]
       [% END %]
 
-    </div>
-  </div>
-  <div class="yui-b">
-    [% INCLUDE 'serials-menu.inc' %]
-  </div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript">
+    <script>
         function confirmDelete() {
             return confirm(_("Are you sure you want to delete this subscription frequency?"));
         }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
index 6c34282..c897a00 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
@@ -11,12 +11,13 @@
 
 <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; Subscription history</div>
 
-<div id="doc3" class="yui-t2">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
-<div id="bd">
-  <div id="yui-main">
-    <div class="yui-b">
       <h1>Subscription history for [% title | html %]</h1>
+
         <div id="subscription_form_history">
           <form method="post" action="/cgi-bin/koha/serials/subscription-history.pl">
             <input type="hidden" name="op" value="mod" />
@@ -57,12 +58,16 @@
             <input type="submit" value="Save subscription history"  />
           </form>
         </div>
-    </div>
-  </div>
-  <div class="yui-b">
-    [% INCLUDE 'serials-menu.inc' %]
-  </div>
-</div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
index 53de19d..a089dac 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
@@ -22,13 +22,12 @@
     [% END %]
 </div>
 
-<div id="doc3" class="yui-t2">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
-<div id="bd">
-  <div id="yui-main">
-    <div class="yui-b">
       [% IF (new or modify) %]
-        <div class="yui-g">
           [% IF (new) %]
             <h1>New numbering pattern</h1>
             [% IF (error_existing_numberpattern) %]
@@ -44,8 +43,7 @@
               </div>
             [% END %]
           [% END %]
-        </div>
-        <div class="yui-g">
+
           <form action="/cgi-bin/koha/serials/subscription-numberpatterns.pl" method="post">
             [% IF (new) %]
               <input type="hidden" name="op" value="savenew" />
@@ -162,8 +160,7 @@
               <a class="cancel" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">Cancel</a>
             </fieldset>
           </form>
-        </div>
-        <div class="yui-g">
+
           <form>
             <fieldset class="rows">
               <legend>Test prediction pattern</legend>
@@ -230,7 +227,7 @@
               <div id="predictionpattern"></div>
             </fieldset>
           </form>
-        </div>
+
       [% ELSE %]
         <h1>Numbering patterns</h1>
         [% IF still_used %]
@@ -294,12 +291,16 @@
           <p>There are no existing numbering patterns.</p>
         [% END %]
       [% END %]
-    </div>
-  </div>
-  <div class="yui-b">
-    [% INCLUDE 'serials-menu.inc' %]
-  </div>
-</div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% IF (daily_options) %]
@@ -307,7 +308,7 @@
     [% END %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         function confirmDelete() {
             return confirm(_("Are you sure you want to delete this numbering pattern?"));
         }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
index 2ffc688..2943695 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
@@ -8,10 +8,10 @@
 
 <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; Alert subscribers for <i>[% bibliotitle | html %]</i></div>
 
-<div id="doc3" class="yui-t2">
-    <div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
 <h1>Alert subscribers for <i>[% bibliotitle | html %]</i></h1>
 
@@ -36,11 +36,14 @@
     <p>There are no patrons subscribed to this subscription serial alert.</p>
 [% END %]
 
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
 [% INCLUDE 'intranet-bottom.inc' %]