From f2842869bb124907f185c69b8b5453c581c453ee Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 9 May 2012 15:41:15 -0400
Subject: [PATCH] Bug 7842 - Inconsistencies in Notices interface

- Putting "New" button in toolbar <div>
- Moving "Copy" function and making label more explicit
- Adding page headings
- Correcting table header sort options

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 .../prog/en/modules/tools/letter.tt           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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 dd32550603..374b2f1ce6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -8,7 +8,7 @@ $(document).ready(function() {
 	$("#lettert:has(tbody tr)").tablesorter({
 		widgets : ['zebra'],
 		sortList: [[0,0]],
-		headers: { 3: {sorter:false},4: { sorter: false }}
+        headers: { 4: {sorter:false},5: { sorter: false },6: { sorter: false }}
 	}); 
 
     $('#branch').change(function() {
@@ -130,6 +130,7 @@ $(document).ready(function() {
 	<div class="yui-b">
 
 [% IF ( no_op_set ) %]
+    <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 %]
@@ -143,10 +144,10 @@ $(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 ) %]
@@ -156,7 +157,7 @@ $(document).ready(function() {
             [% 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 %]
@@ -167,7 +168,7 @@ $(document).ready(function() {
 			<th>Module</th>
 			<th>Code</th>
 			<th>Name</th>
-			<th>&nbsp;</th>
+            <th>Copy notice</th>
 			<th>&nbsp;</th>
 			<th>&nbsp;</th>
 		</tr></thead>
@@ -184,11 +185,6 @@ $(document).ready(function() {
 				<td>[% lette.code %]</td>
 				<td>[% lette.name %]</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 !independant_branch || !lette.branchcode %]
                     <form method="post" action="/cgi-bin/koha/tools/letter.pl">
                         <input type="hidden" name="op" value="copy" />
@@ -202,6 +198,11 @@ $(document).ready(function() {
             [% END %]
                         <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>
@@ -217,7 +218,7 @@ $(document).ready(function() {
 
 	
 [% 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,7 +228,6 @@ $(document).ready(function() {
 		<input type="hidden" name="add" value="1" />
 		[% END %]
 		<fieldset class="rows">
-		<legend>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</legend>
 				<input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
             [% IF independant_branch %]
                 <input type="hidden" name="branchcode" value="[% independant_branch %]" />
-- 
2.39.5