Bug 10325 - Allow system preferences to be overridable from koha-httpd.conf

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / preferences.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt

index 823a825..9e89538 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -1,11 +1,14 @@
  [% INCLUDE 'doc-head-open.inc' %]
  <title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
  [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" />
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/humanmsg.css" />
-<script src="[% themelang %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script>
-<script src="[% themelang %]/js/ajax.js" type="text/javascript"></script>
+[% IF ( bidi ) %]
+   <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
+[% END %]
  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
  <script type="text/javascript">
  //<![CDATA[
@@ -17,14 +20,22 @@
      var search_jumped = [% IF ( search_jumped ) %]true[% ELSE %]false[% END %];
      var MSG_NOTHING_TO_SAVE = _("Nothing to save");
      var MSG_SAVING = _("Saving...");
+    var MSG_SAVED_PREFERENCE = _("Saved preference");
      var MSG_MODIFIED = _("modified");
      var MSG_MADE_CHANGES = _("You have made changes to system preferences.");
      var MSG_CLICK_TO_EXPAND = _("Click to expand this section");
      var MSG_CLICK_TO_COLLAPSE = _("Click to collapse this section");
+    var MSG_INTERNAL_SERVER_ERROR = _( "Internal Server Error, please reload the page" );
+    var MSG_SESSION_TIMED_OUT = _( "You need to log in again, your session has timed out" );
+    var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
+    var MSG_LOADING = _( "Loading..." );
+
  //]]>
  </script>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/humanmsg.css" />
+<script src="[% themelang %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script>
+<script src="[% themelang %]/js/ajax.js" type="text/javascript"></script>
  <script src="[% themelang %]/js/pages/preferences.js" type="text/javascript"></script>
-<script src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js" type="text/javascript"></script>
  </head>
  <body id="admin_preferences" class="admin">
  [% INCLUDE 'header.inc' %]
@@ -78,6 +89,12 @@
                                                         [% ELSE %]
                                                         [% NAME.name %]
                                                         [% END %]
+
+                            [% IF NAME.overridden %]
+                                <span class="overridden" title="The system preference [% NAME.name %] been overridden from this value by one or more virtual hosts.">
+                                    [Overridden]
+                                </span>
+                            [% END %]
                                                 </label>
                          [% UNLESS ( loop.last ) %]<br />[% END %]
                          [% END %]