projects / koha_ffzg / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 12904: Force browser to load new javascript files after upgrade
[koha_ffzg] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / edifactmsgs.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
index 462d15f..fccd57f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
@@ -1,45 +1,14 @@
 [% USE KohaDates %]
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; EDIFACT messages</title>
-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
-$(document).ready(function() {
-    $('#edi_msgs').dataTable($.extend(true, {}, dataTablesDefaults, {
-        'aaSorting': [[1, "desc" ]],
-        'sPaginationType': "four_button",
-        "aoColumnDefs": [
-            { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
-            { "sType": "title-string", "aTargets" : [ "title-string" ] }
-        ]
-    }));
-
-    var EDIModal = $("#EDI_modal");
-    var EDIModalBody = $("#EDI_modal .modal-body");
-
-    $(".view_message").on("click", function(e){
-        e.preventDefault();
-        var page = $(this).attr("href");
-        EDIModalBody.load(page + " #edimsg");
-        EDIModal.modal("show");
-    });
-    EDIModal.on("click",".closebtn",function(e){
-        e.preventDefault();
-        EDIModal.modal("hide");
-    });
-    EDIModal.on("hidden", function(){
-        EDIModalBody.html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
-    });
-    $(".delete_msg").on("click",function(){
-        return confirm(_("Are you sure you want to delete this message?"));
-    });
-});
-</script>
 <style type="text/css">
-#EDI_modal { width : 80%; margin-left : -40%; } @media (max-width: 767px) { #EDI_modal { margin: 0; width : auto; } }
+#EDI_modal { width : 80%; } @media (max-width: 767px) { #EDI_modal { margin: 0; width : auto; } }
 </style>
 </head>
+
 <body id="acq_edifactmsgs" class="acq">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
@@ -100,8 +69,8 @@ $(document).ready(function() {
 <td>[% msg.filename %]</td>
 
 <td class="actions">
-    <a class="btn btn-mini view_message" target="_blank" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id %]"><i class="fa fa-search"></i> View message</a>
-    <a class="btn btn-mini delete_msg" href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=delete&amp;message_id=[% msg.id %]"><i class="fa fa-trash"></i> Delete</a>
+    <a class="btn btn-default btn-xs view_message" target="_blank" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id %]"><i class="fa fa-search"></i> View message</a>
+    <a class="btn btn-default btn-xs delete_msg" href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=delete&amp;message_id=[% msg.id %]"><i class="fa fa-trash"></i> Delete</a>
 </td>
 </tr>
 [% END %]
@@ -110,7 +79,9 @@ $(document).ready(function() {
 </table>
 
 <!-- Modal to display EDIFACT messages -->
-<div class="modal hide" id="EDI_modal" tabindex="-1" role="dialog" aria-labelledby="EDI_modal_label" aria-hidden="true">
+<div class="modal" id="EDI_modal" tabindex="-1" role="dialog" aria-labelledby="EDI_modal_label" aria-hidden="true">
+    <div class="modal-dialog">
+    <div class="modal-content">
     <div class="modal-header">
         <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h3 id="EDI_modal_label">EDIFACT message</h3>
@@ -119,7 +90,9 @@ $(document).ready(function() {
         <div id="loading"> <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+    </div>
+    </div>
     </div>
 </div>
 
@@ -135,4 +108,42 @@ $(document).ready(function() {
 [% INCLUDE 'acquisitions-menu.inc' %]
 </div>
 </div>
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script>
+    [% INCLUDE 'datatables.inc' %]
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#edi_msgs').dataTable($.extend(true, {}, dataTablesDefaults, {
+                'aaSorting': [[1, "desc" ]],
+                'sPaginationType': "four_button",
+                "aoColumnDefs": [
+                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                ]
+            }));
+
+            var EDIModal = $("#EDI_modal");
+            var EDIModalBody = $("#EDI_modal .modal-body");
+
+            $(".view_message").on("click", function(e){
+                e.preventDefault();
+                var page = $(this).attr("href");
+                EDIModalBody.load(page + " #edimsg");
+                EDIModal.modal("show");
+            });
+            EDIModal.on("click",".closebtn",function(e){
+                e.preventDefault();
+                EDIModal.modal("hide");
+            });
+            EDIModal.on("hidden", function(){
+                EDIModalBody.html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
+            });
+            $(".delete_msg").on("click",function(){
+                return confirm(_("Are you sure you want to delete this message?"));
+            });
+        });
+    </script>
+[% END %]
+
 [% INCLUDE 'intranet-bottom.inc' %]
Unnamed repository; edit this file 'description' to name the repository.