Bug 20742: Update two-column templates with Bootstrap grid: Administration part 6

This patch modifies several administration 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: - Administration -> MARC frameworks -> MARC structure -> Subfields - View and edit subfields - Administration -> Record matching rules - View and edit record matching rules - Administration -> OAI sets configuration - View and edit OAI sets - Define mappings for an OAI set - Administration -> Patron attribute types - View and edit patron attribute types - Administration -> System preferences - Administration -> Z39.50/SRU servers - View and edit servers 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>
6 years ago · b8c1198a79
7 changed files with 102 additions and 86 deletions
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@ -27,11 +27,10 @@
 [% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% 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>

 [% IF ( add_form ) %]
    <h1>
@ -310,14 +309,15 @@

 [% END %]

+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->

-
-</div>
-</div>
-<div class="yui-b noprint">
-    [% INCLUDE 'admin-menu.inc' %]
-</div>
-</div>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% Asset.js("js/admin-menu.js") | $raw %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@ -49,7 +49,7 @@
    </select>
 [% END %]

-<style type="text/css">
+<style>
  fieldset.rows fieldset.rows { border-width : 0; }
  fieldset.rows fieldset.rows fieldset.rows { border-width : 1px; }
  fieldset, fieldset.rows { width : 90%; padding: .3em .6em .3em .6em; }
@ -74,11 +74,10 @@
 [% 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>

 [% IF ( matching_rule_form ) %]
  [% IF ( edit_matching_rule ) %]
@ -573,16 +572,19 @@
 </div>
 [% END %]

-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'admin-menu.inc' %]
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% Asset.js("js/admin-menu.js") | $raw %]
-    <script type="text/javascript">
+    <script>
        var maxMatchPoint = [% max_matchpoint | html %];
        var maxMatchCheck = [% max_matchcheck | html %];

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@ -12,11 +12,11 @@

 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id | html %]">OAI set mappings</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 ( mappings_saved ) %]
        <div class="dialog message">
          <h4>Mappings have been saved</h4>
@ -87,16 +87,19 @@
        </fieldset>
      </form>

-    </div>
-  </div>
-  <div class="yui-b">
-    [% INCLUDE 'admin-menu.inc' %]
-  </div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% Asset.js("js/admin-menu.js") | $raw %]
-    <script type="text/javascript">
+    <script>
        $(document).ready(function() {
            $("#mappingform").submit(function(){
              hideDialogBox();
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@ -12,11 +12,11 @@

 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( op_new ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Add a new OAI set[% ELSIF ( op_mod ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Edit OAI set '[% spec | html %]'[% ELSE %] OAI sets configuration[% 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 ( op_new || op_mod ) %]
            <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated">
            [% IF ( op_new ) %]
@ -107,16 +107,19 @@
        [% END %]
        [% END %]

-    </div>
-  </div>
-  <div class="yui-b">
-    [% INCLUDE 'admin-menu.inc' %]
-  </div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% Asset.js("js/admin-menu.js") | $raw %]
-    <script type="text/javascript">
+    <script>
        function newDescField() {
            $("#adddescription").before(
                '<li><label>' + _("setDescription: ") + '</label>' +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@ -35,11 +35,10 @@
 [% 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>

 [% IF ( WARNING_extended_attributes_off ) %]
 <div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=ExtendedPatronAttributes">here</a> if you wish to enable this feature.</div>
@ -292,17 +291,20 @@
 <div class="pages">[% pagination_bar | $raw %]</div>

 [% END %]
- 
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'admin-menu.inc' %]
-</div>
-</div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% Asset.js("js/admin-menu.js") | $raw %]
-    <script type="text/javascript">
+    <script>
        $(document).ready(function() {
            if ( $("#branches option:selected").length < 1 ) {
                $("#branches option:first").attr("selected", "selected");
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@ -16,11 +16,10 @@

 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; System preferences</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>

    [% IF ( jump_not_found ) %]
    <h2>System preferences</h2>
@ -147,18 +146,22 @@
    </form>
    </div>
    [% END %]
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'prefs-menu.inc' %]
-</div>
-</div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
    [% Asset.js("lib/jquery/plugins/multiple-select/jquery.multiple.select.js") | $raw %]
-    <script type="text/javascript">
+    <script>
        [% UNLESS ( searchfield ) %]$(document).ready(function(){
                $('#toolbar').fixFloat();
            });[% END %]
@ -191,9 +194,9 @@
        var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
        var MSG_LOADING = _( "Loading..." );
    </script>
-    <script src="[% interface | html %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script>
-    <script src="[% interface | html %]/[% theme | html %]/js/ajax.js" type="text/javascript"></script>
-    <script src="[% interface | html %]/[% theme | html %]/js/pages/preferences.js" type="text/javascript"></script>
+    [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
+    [% Asset.js("js/ajax.js") | $raw %]
+    [% Asset.js("js/pages/preferences.js") | $raw %]
    [%# Add WYSIWYG editor for htmlarea system preferences %]
    [% INCLUDE 'wysiwyg-systempreferences.inc' %]
 [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@ -33,10 +33,10 @@
 [% IF op ==  'add' %]&rsaquo; New [% PROCESS ServerType %] server[% 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>

 [% IF msg_deleted %]
    <div class="dialog alert">Z39.50/SRU server deleted ([% msg_add | html %])</div>
@ -193,12 +193,15 @@
    </table>
 [% END %]

-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'admin-menu.inc' %]
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 [% MACRO jsinclude BLOCK %]
    [% Asset.js("js/admin-menu.js") | $raw %]
@ -206,7 +209,7 @@
        [% INCLUDE 'datatables.inc' %]
    [% END %]

-    <script type="text/javascript">
+    <script>
        [% IF ( add_form ) %]
            $(document).ready(function(){
                // Update selects for syntax, encoding and recordtype