Attachment 83605 Details for Bug 21792 – Bug 21792: Switch two-column templates to Bootstrap grid: Serials part 3

[patch] Bug 21792: Switch two-column templates to Bootstrap grid: Serials part 3

Bug-21792-Switch-two-column-templates-to-Bootstrap.patch (text/plain), 4.51 KB, created by Josef Moravec on 2019-01-02 20:54:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-01-02 20:54:20 UTC

Size: 4.51 KB

patch

obsolete

>From 6c2c800c3c562a5ab89cc66d0df77d3bb6a19438 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 8 Nov 2018 17:10:00 +0000
>Subject: [PATCH] Bug 21792: Switch two-column templates to Bootstrap grid:
> Serials part 3
>
>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 go to Serials.
>
> - Add or edit a new subscription. The "create an item..." and "do not
>   create an item..." labels should look correct.
> - Search for subscriptions
>   - Select two or more subscriptions to batch edit.
>     - The subscription batch edit page should look correct and adjust
>       well to various browser widths.
>   - View a subscription and click the "Renew" button. The subscription
>     renewal pop-up window should look correct.
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> .../prog/en/modules/serials/subscription-add.tt    |  7 ++-----
> .../en/modules/serials/subscription-batchedit.tt   | 24 ++++++++++++++--------
> .../prog/en/modules/serials/subscription-renew.tt  |  2 +-
> 3 files changed, 18 insertions(+), 15 deletions(-)
>
>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 edab9b3..da6ea85 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
>@@ -6,11 +6,8 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle | html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<style type="text/css">
>+<style>
> fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
>-.yui-u li p label.widelabel {
>-    width: 300px;  /* not enough for IE7 apparently */
>-}
> </style>
> </head>
> 
>@@ -493,7 +490,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         var subscriptionid = "[% subscriptionid | html %]";
>         var irregularity = "[% irregularity | html %]";
>         var more_than_one_serial = "[% more_than_one_serial | html %]";
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>index 5876983..327e08f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>@@ -19,10 +19,11 @@
>         Batch edit
>     </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>Subscription batch edit</h1>
> 
>                     <div>
>@@ -158,11 +159,16 @@
>                             <a class="cancel" href="[% referrer | url %]">Cancel</a>
>                         </fieldset>
>                     </form>
>-                </div>
>-            </div>
>-            <div class="yui-b">
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>                 [% INCLUDE 'serials-menu.inc' %]
>-            </div>
>-        </div>
>+            </aside>
>+        </div> 
>+    </div> 
>+
> 
>     [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
>index fcfbd26..9826464 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
>@@ -24,7 +24,7 @@
>         <a class="btn btn-default btn-default close" href="#">Close</a>
>     </div>
> [% ELSE %]
>-      <div id="bd">
>+
> <form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
> 		<input type="hidden" name="op" value="renew" />
> 		<input type="hidden" name="subscriptionid" value="[% subscription.subscriptionid | html %]" />
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21792: 82107 | 83593 | 83605