projects / koha-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: cdd956b)
Bug 20650: Switch single-column templates to Bootstrap grid: Various, part 3
authorOwen Leonard <oleonard@myacpl.org>
Tue, 24 Apr 2018 13:37:07 +0000 (13:37 +0000)
committerNick Clemens <nick@bywatersolutions.com>
Fri, 6 Jul 2018 13:47:13 +0000 (13:47 +0000)
This patch updates various unrelated templates to use the Bootstrap
grid. In each case, confirm that the indicated page looks correct.

This patch also corrects a couple of capitalization errors and removes
an unused template: virtualshelves/merge.tt.

 - Tools -> Patron card creator -> Manage -> Card batches
   - Export a batch
   - The pages inside the modal window should look correct: Both the "X
     batch(es) to export" screen and the "download exported batch(es)"
     one.

 - Tools -> Patron lists -> Edit list
   - The patron list add/edit form should look correct.

 - Disable plugins in koha-conf.xml.
   - Tools -> Plugins
   - The "Plugins disabled" page should look correct.

 - Enable plugins in koha-conf.xml
   - Tools -> Plugins -> Upload plugins.
     - This page should look correct.

 - Tools
   - The tools home page should show three columns: Patrons and
     Circulation, Catalog, Additional tools.
   - At viewport width below 768 pixels content should reflow into one
     column.

 - virtualshelves/merge.tt has been removed as it is unused. Search the
   codebase for references to it. There should be none.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
index bf89a4d..570b309 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
@@ -23,8 +23,9 @@
 </div>
 
 
-<div class="yui-t7">
-    <div class="yui-main">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
         <h1>
             [% IF list.patron_list_id %]
                 Modify patron list
@@ -63,7 +64,8 @@
                 <a href="lists.pl" class="cancel">Cancel</a>
             </fieldset>
         </form>
-    </div>
+            </div>
+        </div>
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index fcf1d96..5716e97 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -1,19 +1,11 @@
 [% USE Asset %]
 [% SET footerjs = 1 %]
-<!DOCTYPE html>
-[% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %]
-<head>
     <title>Koha &rsaquo; Tools &rsaquo; Patron cards &rsaquo; Patron card printing/exporting</title>
-    <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
-    [% INCLUDE intranetstylesheet.inc %]
-    [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %]
     [% INCLUDE 'doc-head-close.inc' popup => 1%]
-    <style type="text/css">#custom-doc {width:47.23em; *width:46.04em; min-width:610px; margin:auto; margin-top:0.4em;}</style>
 </head>
 
 <body id="pcard_print" class="tools pcard">
-    <div id="custom-doc">
-        <div id="bd">
+    <div class="container-fluid">
             [% IF ( batches ) %]
             <form>
                 <h3>Click on the following link(s) to download the exported batch(es).</h3>
@@ -112,14 +104,11 @@
                 </fieldset>
             </form>
             [% END %]
-        </div>
     </div>
 
-[% IF ( IntranetUserJS ) %]
-    [% Asset.js("lib/jquery/jquery-2.2.3.min.js") %]
-    [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %]
+[% MACRO jsinclude BLOCK %]
+    [% INCLUDE 'greybox.inc' %]
     <script>
-        [% IntranetUserJS %]
         function Done() {
             window.location = "[% referer %]";
         };
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
index dd42f5c..3b2a3fe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
@@ -14,17 +14,13 @@
 &rsaquo; Plugins disabled
 </div>
 
-<div id="doc3" class="yui-t2">
-    <div id="bd">
-        <div id="yui-main">
-    <div class="yui-b">
-        <div class="yui-g">
-            <div class="yui-u first">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
                 <h1>Plugins disabled!</h1>
 
                 <p>To enable Koha plugins, the system preference UseKohaPlugins must be enabled, and the flag enable_plugins must be set in the Koha configuration file</p>
             </div>
         </div>
-    </div>
-</div>
+
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
index 070c03d..057e9ac 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Tools &rsaquo; Plugins &rsaquo; Upload Plugin
+<title>Koha &rsaquo; Tools &rsaquo; Plugins &rsaquo; Upload plugin
  </title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
@@ -11,16 +11,14 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a>
-&rsaquo; Upload Plugins
+&rsaquo; Upload plugins
 </div>
 
-<div id="doc3" class="yui-t2">
-    <div id="bd">
-        <div id="yui-main">
-    <div class="yui-b">
-        <div class="yui-g">
-            <div class="yui-u first">
-                <h1>Upload Koha Plugin</h1>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
+
+                <h1>Upload Koha plugin</h1>
                 [% IF ( ERRORS ) %]
                 <div class="dialog alert">
                     [% FOREACH ERROR IN ERRORS %]
@@ -50,6 +48,5 @@
 
             </div>
         </div>
-    </div>
-</div>
+
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index 0152389..2b0c0e3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -8,11 +8,9 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Tools</div>
 
-<div id="doc3">
-<div id="bd">
-       <div class="yui-gb">
-
-<div class="yui-u first">
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-4">
 <h3>Patrons and circulation</h3>
 <dl>
     [% IF (CAN_user_tools_manage_patron_lists) %]
@@ -71,7 +69,9 @@
     [% END %]
        </dl>
 </div>
-<div class="yui-u">
+
+
+<div class="col-sm-4 col-sm-push-4">
 <h3>Additional tools</h3>
 <dl>
     [% IF ( CAN_user_tools_edit_calendar ) %]
@@ -122,7 +122,7 @@
 </dl>
 </div>
 
-<div class="yui-u">
+<div class="col-sm-4 col-sm-pull-4">
 <h3>Catalog</h3>
 <dl>
     [% IF ( CAN_user_tools_items_batchdel ) %]
@@ -199,5 +199,5 @@
 </div>
 
 </div>
-</div>
+
 [% INCLUDE 'intranet-bottom.inc' %]
Koha with Equinox developments in process and local tweaks