Bug 20102: Remove attribute "text/css" for <style> element used in staff client templates

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

index 585a47a..d1b3dc8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -3,6 +3,7 @@
  [% USE Koha %]
  [% USE KohaDates %]
  [% USE Price %]
+[% USE ColumnsSettings %]
  [% SET footerjs = 1 %]
  [% INCLUDE 'doc-head-open.inc' %]
  <title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %]
@@ -10,7 +11,7 @@
  </title>
  [% INCLUDE 'doc-head-close.inc' %]
  [% Asset.css("css/datatables.css") | $raw %]
-<style type="text/css">#enrolmentmessage.hint { display : none; }</style>
+<style>#enrolmentmessage.hint { display : none; }</style>
  </head>
  
  <body id="admin_categorie" class="admin">
@@ -108,7 +109,7 @@
                  </li>
                  <li>
                      <label for="enrolmentfee">Enrollment fee: </label>
-                    <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 | html %]" />
+                    <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 %]" />
                  </li>
                  <li>
                      <label for="overduenoticerequired">Overdue notice required: </label>
@@ -136,7 +137,7 @@
                  </li>
                  <li>
                      <label for="reservefee">Hold fee: </label>
-                    <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 | html %]" />
+                    <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 %]" />
                  </li>
                  <li>
                      <label for="category_type" class="required">Category type: </label>
@@ -279,10 +280,10 @@
                  </tr>
                  <tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired | html %] years</td></tr>
                  <tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit | html %] years</td></tr>
-                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price | html %]</td></tr>
+                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
                  <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
                  <tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
-                <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price | html %]</td></tr>
+                <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price %]</td></tr>
  
                  [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
                    <tr>
@@ -338,7 +339,7 @@
          You Searched for [% searchfield | html %]</span>
      [% END %]
      [% IF categories%]
-        <table id="table_categorie">
+        <table id="patron_categories">
              <thead>
                  <tr>
                      <th scope="col">Code</th>
@@ -397,14 +398,14 @@
                              <td>-</td>
                          [% END %]
                          [% IF (category.enrolmentfee > 0) %]
-                            <td>[% category.enrolmentfee | $Price | html %]</td>
+                            <td>[% category.enrolmentfee | $Price %]</td>
                          [% ELSE %]
                              <td>-</td>
                          [% END %]
                          <td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>
                          <td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>
                          [% IF (category.reservefee > 0) %]
-                            <td>[% category.reservefee | $Price | html %]</td>
+                            <td>[% category.reservefee | $Price %]</td>
                          [% ELSE %]
                              <td>-</td>
                          [% END %]
@@ -435,9 +436,9 @@
                          <td>
                              [% SET branch_limitations = category.branch_limitations %]
                              [% IF branch_limitations.size > 0 %]
-                                [% branches_str = "" | html %]
+                                [% branches_str = "" %]
                                  [% FOREACH branch IN branch_limitations %]
-                                    [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" | html %]
+                                    [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %]
                                  [% END %]
                                  <span title="[% branches_str | html %]">
                                      [% IF branch_limitations.size > 1 %]
@@ -500,9 +501,11 @@
      [% Asset.js("js/messaging-preference-form.js") | $raw %]
      [% INCLUDE 'calendar.inc' %]
      [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'columns_settings.inc' %]
      <script>
          var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _.");
          var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date.");
+        var columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'categories', 'patron_categories', 'json' ) | $raw %];
      </script>
      [% Asset.js("js/categories.js") | $raw %]
  [% END %]