[Koha-cvs] koha admin/authorised_values.pl koha-tmpl/intra... [rel_3_0]

[paul poulain]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/11/15 17:28:40

Modified files:
	admin          : authorised_values.pl 
	koha-tmpl/intranet-tmpl/prog/en/admin: authorised_values.tmpl 

Log message:
	fixing some display bugs & translation problems in auth values

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/authorised_values.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.17.2.1&r2=1.17.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: admin/authorised_values.pl
===================================================================
RCS file: /sources/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -b -r1.17.2.1 -r1.17.2.2
--- admin/authorised_values.pl	14 Nov 2006 15:05:31 -0000	1.17.2.1
+++ admin/authorised_values.pl	15 Nov 2006 17:28:40 -0000	1.17.2.2
@@ -85,14 +85,14 @@
 	} else {
 		$data->{'category'} = $input->param('category');
 	}
-	if ($searchfield) {
-		$template->param(action => "Modify authorised value");
+	if ($id) {
+		$template->param(action_modify => 1);
 		$template->param('heading-modify-authorized-value-p' => 1);
 	} elsif ( ! $data->{'category'} ) {
-		$template->param(action => "Add new category");
+		$template->param(action_add_category => 1);
 		$template->param('heading-add-new-category-p' => 1);
 	} else {
-		$template->param(action => "Add authorised value");
+		$template->param(action_add_value => 1);
 		$template->param('heading-add-authorized-value-p' => 1);
 	}
 	$template->param('use-heading-flags-p' => 1);

Index: koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl	14 Nov 2006 15:11:26 -0000	1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl	15 Nov 2006 17:28:40 -0000	1.1.2.4
@@ -9,10 +9,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_IF name="add_form" -->
+	<h1>
+	   <!-- TMPL_IF name="action_modify" -->Modify authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_value" -->Add authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_category" -->Add category<!-- /TMPL_IF -->
+	</h1>
 	<form class="inline" action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
 	<input type="hidden" name="op" value="add_validate" />
 	<table>
-	<caption><!-- TMPL_VAR name="action" --></caption>
 	<tr>
 		<th><label for="category">Category</label></th>
 		<td><!-- TMPL_VAR name="category" --></td>
@@ -25,8 +29,11 @@
 		<th><label for="lib">Description</label></th>
 		<td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
 	</tr>
-	</table><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-			<input type="submit" value="<!-- TMPL_VAR name="action" -->" /></form> <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Cancel and Return to Authorized Values" /></form>
+        </table>
+        <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+        <input type="submit" value="Save" />
+    </form>
+    <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Cancel and Return to Authorized Values" /></form>
 <!-- /TMPL_IF -->