X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Ftools%2Fletter.tt;h=95c55e5e5437811ab63a5f618846be552835f0dd;hb=26696e3b299ff9ca96d7a834a172f6534ef952d5;hp=aa1301b356377a46147aa3b3dc768a5385208f00;hpb=0486d0c6b781fbda73df19eb825ef330bdc4544a;p=koha_fer

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index aa1301b356..95c55e5e54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -1,24 +1,28 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Tools &rsaquo; Notices[% IF ( add_form ) %][% IF ( modify ) %] &rsaquo; Modify notice[% ELSE %] &rsaquo; Add notice[% END %][% END %][% IF ( add_validate ) %] &rsaquo; Notice added[% END %][% IF ( delete_confirm ) %] &rsaquo; Confirm Deletion[% END %]</title>
+<title>Koha &rsaquo; Tools &rsaquo; Notices[% IF ( add_form ) %][% IF ( modify ) %] &rsaquo; Modify notice[% ELSE %] &rsaquo; Add notice[% END %][% END %][% IF ( add_validate ) %] &rsaquo; Notice added[% END %][% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-	<script type="text/javascript">
-	//<![CDATA[
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+[% INCLUDE 'datatables.inc' %]
+<script type="text/javascript">
+//<![CDATA[
 $(document).ready(function() {
-	$("#lettert:has(tbody tr)").tablesorter({
-		widgets : ['zebra'],
-		sortList: [[0,0]],
-		headers: { 3: {sorter:false},4: { sorter: false }}
-	}); 
-
-    $('#branch').change(function() {
+    $("#lettert:has(tbody tr)").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "sDom": 't',
+        "aoColumnDefs": [
+            { "aTargets": [ -1,-2, -3 ], "bSortable": false, "bSearchable": false }
+        ],
+        "bPaginate": false
+    }));
+    [% IF no_op_set %]
+      $('#branch').change(function() {
             $('#op').val("");
             $('#selectlibrary').submit();
-    });
-    $('#newnotice').click(function() {
+      });
+      $('#newnotice').click(function() {
             $('#op').val("add_form");
             return true;
-    });
+      });
+    [% END %]
 }); 
 [% IF ( add_form ) %]
 	
@@ -121,7 +125,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'letters-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Add notice[% END %][% ELSE %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Confirm Deletion[% ELSE %]Notices &amp; Slips[% END %][% END %][% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( add_form ) %][% IF ( modify ) %]<a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Modify notice[% ELSE %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Add notice[% END %][% ELSE %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Notice added[% ELSE %][% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; Slips</a> &rsaquo; Confirm deletion[% ELSE %]Notices &amp; Slips[% END %][% END %][% END %]</div>
 
 [% IF ( add_form ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
    
@@ -130,7 +134,8 @@ $(document).ready(function() {
 	<div class="yui-b">
 
 [% IF ( no_op_set ) %]
-    <form method="get" action="?" id="selectlibrary">
+    <h1>Notices and Slips</h1>
+    <form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary">
       <input type="hidden" name="searchfield" value="[% searchfield %]" />
     [% UNLESS independant_branch %]
       <p>
@@ -143,31 +148,33 @@ $(document).ready(function() {
             </select>
       </p>
     [% END %]
-      <p>
+      <div id="toolbar">
 	      <input type="submit" id="newnotice" value="New Notice" />
         <input type="hidden" id="op" name="op" />
-      </p>
+      </div>
     </form>
 
 		[% IF ( search ) %]
-		<p>You Searched for <b>[% searchfield %]</b></p>
+        <p>You searched for <b>[% searchfield %]</b></p>
 		[% END %]
 		[% IF ( letter && !independant_branch) %]
             [% select_for_copy = BLOCK %]
             <select name="branchcode">
                 [% FOREACH branchloo IN branchloop %]
-                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
+                <option value="[% branchloo.value %]">Copy to [% branchloo.branchname %]</option>
                 [% END %]
             </select>
             [% END %]
         [% END %]
+
+[% IF ( letter ) %]
         <table id="lettert">
 		<thead><tr>
 			<th>Library</th>
 			<th>Module</th>
 			<th>Code</th>
 			<th>Name</th>
-			<th>&nbsp;</th>
+            <th>Copy notice</th>
 			<th>&nbsp;</th>
 			<th>&nbsp;</th>
 		</tr></thead>
@@ -183,14 +190,9 @@ $(document).ready(function() {
 				<td>[% lette.module %]</td>
 				<td>[% lette.code %]</td>
 				<td>[% lette.name %]</td>
-				<td>
-        [% IF can_edit %]
-					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Edit</a>
-        [% END %]
-				</td>
-				<td>
+				<td style="white-space: nowrap">
         [% IF !independant_branch || !lette.branchcode %]
-                    <form method="post" action="?">
+                    <form method="post" action="/cgi-bin/koha/tools/letter.pl">
                         <input type="hidden" name="op" value="copy" />
 				        <input type="hidden" name="oldbranchcode" value="[% lette.branchcode %]" />
                         <input type="hidden" name="module" value="[% lette.module %]" />
@@ -203,21 +205,35 @@ $(document).ready(function() {
                         <input type="submit" value="Copy" />
                     </form>
         [% END %]
+                </td>
+                <td>
+        [% IF can_edit %]
+                    <a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;branchcode=[% lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Edit</a>
+        [% END %]
 				</td>
 				<td>
         [% IF !lette.protected && can_edit %]
-					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[%lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]">Delete</a>
+					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;branchcode=[%lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Delete</a>
         [% END %]
 				</td>
 			</tr>
     [% END %]
         </tbody>
 		</table>
+[% ELSE %]
+    <div class="dialog message">
+        [% IF ( branchcode ) %]
+           <p>There are no notices for this library.</p>
+        [% ELSE %]
+            <p>There are no notices.</p>
+        [% END %]
+    </div>
+[% END %]
 [% END %]
 
 	
 [% IF ( add_form ) %]
-	
+<h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1>
 		<form action="?" name="Aform" method="post">
 		<input type="hidden" name="op" id="op" value="add_validate" />
 		<input type="hidden" name="checked" value="0" />
@@ -227,14 +243,13 @@ $(document).ready(function() {
 		<input type="hidden" name="add" value="1" />
 		[% END %]
 		<fieldset class="rows">
-		<legend>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</legend>
-		<ol>
 				<input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
             [% IF independant_branch %]
                 <input type="hidden" name="branchcode" value="[% independant_branch %]" />
             [% ELSE %]
+		<ol>
 			<li>
-				<label for="branchcode">Library:</label>
+				<label for="branch">Library:</label>
                 <select name="branchcode" id="branch" style="width:20em;">
                     <option value="">All libraries</option>
                 [% FOREACH branchloo IN branchloop %]
@@ -258,14 +273,14 @@ $(document).ready(function() {
                                     <option value="circulation">Circulation</option>
                                     [% END %]
                                     [% IF ( claimacquisition ) %]
-                                    <option value="claimacquisition" selected="selected">Claim Acquisition</option>
+                                    <option value="claimacquisition" selected="selected">Claim acquisition</option>
                                     [% ELSE %]
-                                    <option value="claimacquisition">Claim Acquisition</option>
+                                    <option value="claimacquisition">Claim acquisition</option>
                                     [% END %]
                                     [% IF ( claimissues ) %]
-                                    <option value="claimissues" selected="selected">Claim Serial Issue</option>
+                                    <option value="claimissues" selected="selected">Claim serial issue</option>
                                     [% ELSE %]
-                                    <option value="claimissues">Claim Serial Issue</option>
+                                    <option value="claimissues">Claim serial issue</option>
                                     [% END %]
                                     [% IF ( reserves ) %]
                                     <option value="reserves" selected="selected">Holds</option>
@@ -278,9 +293,9 @@ $(document).ready(function() {
                                     <option value="members">Members</option>
                                     [% END %]
                                     [% IF ( serial ) %]
-                                    <option value="serial" selected="selected">Serials (Routing List)</option>
+                                    <option value="serial" selected="selected">Serials (routing list)</option>
                                     [% ELSE %]
-                                    <option value="serial">Serials (Routing List)</option>
+                                    <option value="serial">Serials (routing list)</option>
                                     [% END %]
                                     [% IF ( suggestions ) %]
                                     <option value="suggestions" selected="selected">Suggestions</option>
@@ -296,7 +311,7 @@ $(document).ready(function() {
 			<label for="name">Name:</label><input type="text" id="name" name="name" size="60" value="[% name %]" />
 		</li>
 		<li>
-			<label for="is_html">HTML Message:</label>
+            <label for="is_html">HTML message:</label>
       [% IF is_html %]
       <input type="checkbox" id="is_html" name="is_html" value="1" checked />
       [% ELSE %]
@@ -304,10 +319,10 @@ $(document).ready(function() {
       [% END %]
 		</li>
 		<li>
-			<label for="title">Message Subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
+            <label for="title">Message subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
 		</li>
 		<li>
-			<label for="SQLfieldname">Message Body:</label>
+            <label for="SQLfieldname">Message body:</label>
 		</li>
 		<li>
 		<table>
@@ -319,9 +334,9 @@ $(document).ready(function() {
 
 		</li>
 		</ol>
+                [% IF code.search('DGST') %] <span class="overdue">Warning, this is a template for a Digest, as such, any references to branch data ( e.g. branches.branchname ) will refer to the borrower's home branch.</span> [% END %]
 		</fieldset>
-		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
-		<fieldset class="action"><input type="button" value="Cancel" onclick="cancel(this.form)" class="button" /></fieldset>
+		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /> <a class="cancel" href="/cgi-bin/koha/tools/letter.pl">Cancel</a></fieldset>
       <input type="hidden" name="searchfield" value="[% searchfield %]" />
 		</form>
 [% END %]
@@ -334,7 +349,7 @@ $(document).ready(function() {
 [% END %]
 	
 [% IF ( delete_confirm ) %]
-	<div class="dialog alert"><h3>Delete Notice?</h3>
+    <div class="dialog alert"><h3>Delete notice?</h3>
 	<table>
         <thead>
 		<tr>
@@ -356,11 +371,11 @@ $(document).ready(function() {
 		<input type="hidden" name="branchcode" value="[% branchcode %]" />
 		<input type="hidden" name="code" value="[% code %]" />
 		<input type="hidden" name="module" value="[% module %]" />
-				<input type="submit" value="Yes, Delete" class="approve" />
+                <input type="submit" value="Yes, delete" class="approve" />
 				</form>
 
 				<form action="[% action %]" method="get">
-					<input type="submit" value="No, Do Not Delete" class="deny" />
+                    <input type="submit" value="No, do not delete" class="deny" />
 				</form>
 		</div>