[Koha-cvs] koha admin/branches.pl koha-tmpl/intranet-tmpl/... [rel_3_0]

[paul poulain]

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

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

Log message:
	fixing branches messages & highlighting them (+reindenting template with spaces)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/branches.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.34&r2=1.34.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.1&r2=1.3.2.2

Patches:
Index: admin/branches.pl
===================================================================
RCS file: /sources/koha/koha/admin/branches.pl,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -b -r1.34 -r1.34.2.1
--- admin/branches.pl	4 Jul 2006 14:36:51 -0000	1.34
+++ admin/branches.pl	15 Nov 2006 15:56:17 -0000	1.34.2.1
@@ -554,7 +554,7 @@
     my $message;
     if ($total) {
 	# FIXME: need to be replaced by an exported boolean parameter
-	$message = "Category cannot be deleted because there are $total branches using that category.";
+	$message = "MESSAGE8";
     }
     return $message;
 }

Index: koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl	16 Oct 2006 10:09:03 -0000	1.3.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl	15 Nov 2006 15:56:17 -0000	1.3.2.2
@@ -91,7 +91,17 @@
 
 <!-- TMPL_IF name="else" -->
 	
-	<!-- TMPL_IF NAME="message" --><div class="error"><!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="message" --><div class="problem">
+        <!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE1" --><div class="problem">Branch saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE2" --><div class="problem">Branch saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE3" --><div class="problem">Branch deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE4" --><div class="problem">Branch category added</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE5" --><div class="problem">Branch category modified</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE6" --><div class="problem">Branch category deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE7" --><div class="problem">Impossible to delete : branch is used</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE8" --><div class="problem">Category cannot be deleted because there are branches using that category.</div><!-- /TMPL_IF -->
+
 	<table>
 	<caption><!-- TMPL_VAR name="head" --></caption>
 		<tr>