projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21bd9d5)
Bug 9637 - Replace YUI button on local use system preferences page with Bootstrap
authorOwen Leonard <oleonard@myacpl.org>
Sun, 3 Feb 2013 14:33:45 +0000 (09:33 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 13:59:41 +0000 (08:59 -0500)
This patch converts the toolbar on the local use system preferences page
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the local use system preferences page (the "local use" tab
on the main System preferences page) and confirm that the "New
preference" button looks correct and works correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works and looks very well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Removed incorrect Javascript comment about YUI.

koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index 8e69259..51e7b8e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -70,8 +70,21 @@
                 return false;
             } ).nextAll( 'textarea, input[type=submit]' ).hide();
         } );
+
         //]]>
 </script>
+[% IF ( else ) %]
+    <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+    <script type="text/javascript">
+    //<![CDATA[
+     $(document).ready(function() {
+        [% IF ( loop ) %]$("#sysprefst").tablesorter({
+            sortList: [[0,0]],
+            headers: { 1: {sorter:false},2: { sorter: false },3: { sorter: false },4: { sorter: false }}
+        });[% END %]
+     });
+    </script>
+[% END %]
 </head>
 <body id="admin_systempreferences" class="admin">
 [% INCLUDE 'header.inc' %]
@@ -240,28 +253,11 @@
     [% END %]
    
     [% IF ( else ) %]
-    
-    <div id="toolbar">
-    <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-    <script type="text/javascript">
-    //<![CDATA[
-    // prepare DOM for YUI Toolbar
-     $(document).ready(function() {
-        yuiToolbar();
-        [% IF ( loop ) %]$("#sysprefst").tablesorter({
-            sortList: [[0,0]],
-            headers: { 1: {sorter:false},2: { sorter: false },3: { sorter: false },4: { sorter: false }}
-        });[% END %]
-     });
-    // YUI Toolbar Functions
-    function yuiToolbar() {
-        new YAHOO.widget.Button("newstopword");
-    }   //]]>
-    </script>
-    <ul class="toolbar">
-        <li><a id="newstopword" href="[% script_name %]?op=add_form">New preference</a></li>
-    </ul></div>
-    
+
+    <div id="toolbar" class="btn-toolbar">
+        <a class="btn btn-small" id="newstopword" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New preference</a>
+    </div>
+
     <h1>System preferences admin</h1>
     <h2>[% tab %] preferences</h2>
     [% searchfield %]
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git