Bug 21526: Use the 'url' filter when needed

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

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index 15858e2..b84e2b5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -42,14 +42,14 @@
 [%# PARAMS: selected_norm, id, name %]
 [%    UNLESS valid_norms.grep(selected_norm).size %]
 [%#       Fallback to 'none' %]
-[% selected_norm = 'none' | html %]
+[% selected_norm = 'none' %]
 [%    END %]
     <select id="[% id | html %]" name="[% name | html %]">
 [%    PROCESS norms_options selected_norm=selected_norm %]
     </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 ) %]
@@ -434,7 +433,7 @@
 [% IF ( display_list ) %]
 
 <div id="toolbar" class="btn-toolbar">
-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | html %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
 </div>
 
 <h2>Record matching rules</h2>
@@ -460,8 +459,8 @@
     <td>[% available_matching_rule.code | html %]</td>
     <td>[% available_matching_rule.description | html %]</td>
     <td class="actions">
-      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | html %]?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | html %]"><i class="fa fa-pencil"></i> Edit</a>
-      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | html %]?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | html %]"><i class="fa fa-trash"></i> Delete</a>
+      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
+      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash"></i> Delete</a>
     </td>
   </tr>
   [% END %]
@@ -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 %];