Bug 17216: Update the admin interface

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / systempreferences.tt

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 bfcab86..b035d00 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
 [% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
@@ -5,7 +6,7 @@
 [%# Add WYSIWYG editor for htmlarea system preferences %]
 [% INCLUDE 'wysiwyg-systempreferences.inc' %]
 [% IF ( else ) %]
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
     //<![CDATA[
@@ -13,7 +14,7 @@
         [% IF ( loop ) %]$("#sysprefst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": '<"top pager"ilf>t',
             "aoColumnDefs": [
-                { "aTargets": [ -1, -2, -3, -4 ], "bSortable": false }
+                { "aTargets": [ -1, -2, -3 ], "bSortable": false }
             ],
             "bPaginate": false
         }));[% END %]
@@ -110,10 +111,12 @@
                     <textarea id="value" name="value" cols="[% fieldlength %]">[% value |html %]</textarea>
                 [% ELSIF ( type_upload ) %]
                     <input type="file" name="value" />
-                [% ELSIF ( type_htmlarea ) %]
-                    <textarea class="mce" name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
-                [% ELSIF ( type_textarea ) %]
+                [% ELSIF ( type_textarea || type_htmlarea ) %]
+                    [% IF ( type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
+                        <textarea class="mce" name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
+                    [% ELSE %]
                     <textarea name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea>
+                    [% END %]
                 [% ELSIF ( type_choice ) %]
                     <select name="value" id="value">
                         [% FOREACH option IN options %]
@@ -230,6 +233,11 @@
         [%- ELSE -%]
             <option value="Textarea">Textarea</option>
         [% END %]
+        [%- IF (preftype && preftype == 'Htmlarea') -%]
+            <option value="Htmlarea" selected>Htmlarea</option>
+        [%- ELSE -%]
+            <option value="Htmlarea">Htmlarea</option>
+        [% END %]
         [%- IF (preftype && preftype == 'Float') -%]
             <option value="Float" selected>Float</option>
         [%- ELSE -%]
@@ -300,7 +308,7 @@
     [% IF ( else ) %]
 
     <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>
+        <a class="btn btn-small" id="newstopword" href="[% script_name %]?op=add_form"><i class="fa fa-plus"></i> New preference</a>
     </div>
 
     [% IF ( tab != 'local_use' ) %]
@@ -313,8 +321,7 @@
         <th>Preference</th>
         <th>Explanation</th>
         <th>Value</th>
-        <th>Edit</th>
-        <th>Delete</th>
+        <th>Actions</th>
         </tr></thead>
     [% END %]
     <tbody>[% FOREACH loo IN loop %]
@@ -337,12 +344,13 @@
                 [% IF ( loo.type_upload ) %]
                 <input type="file" name="value" value="[% loo.value |html %]" />
                 [% END %]
-                [% IF ( loo.type_textarea ) %]
-                <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
-                <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
-                [% END %]
-                [% IF ( loo.type_htmlarea ) %]
-                <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
+                [% IF ( loo.type_textarea ) || ( loo.type_htmlarea ) %]
+                    [% IF ( loo.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
+                        <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
+                    [% ELSE %]
+                        <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
+                        <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
+                    [% END %]
                 [% END %]
                 [% IF ( loo.type_choice ) %]
                 <select name="value">
@@ -424,12 +432,11 @@
                 <input type="hidden" name="prefoptions" value="[% loo.prefoptions |html %]" />
                 <input type="hidden" name="preftype" value="[% loo.type %]" />
                 <input type="hidden" name="explanation" value="[% loo.explanation |html %]" />
-                <input type="submit" value="Save" />
+                <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button>
             </form>
         </td>
 
-        <td><a href="[% loo.edit %]">Edit </a></td>
-        <td><a href="[% loo.delete %]">Delete</a></td>
+        <td class="actions"><a class="btn btn-mini" href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-mini" href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></td>
     </tr>
     [% END %]</tbody>
     </table>