[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.25,1.25.2.1

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24628/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	branches.tmpl 
Log Message:
fix for
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=758
(Move error messages out of branches.pl)

Index: branches.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** branches.tmpl	30 Nov 2004 17:42:30 -0000	1.25
--- branches.tmpl	1 Aug 2005 12:50:53 -0000	1.25.2.1
***************
*** 4,13 ****
  	
  	<h1>
- 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
  	<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
  	<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
  	<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
  	<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
- 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
  	</h1>
  	
--- 4,11 ----
***************
*** 87,99 ****
  	<!-- TMPL_IF NAME="else" -->
  		<h1>
- 		<!-- TMPL_IF NAME="use-heading-flags-p" -->
  		<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
- 		<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
  		</h1>
  	
! 		<font color="red"><!-- TMPL_VAR NAME="message" --></font>
  		<table border="1" cellpadding="5" cellspacing="0">
  			<tr>
--- 85,117 ----
  	<!-- TMPL_IF NAME="else" -->
  		<h1>
  		<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
  		</h1>
  	
! 		<font color="red">
! 		<!-- TMPL_IF name="MESSAGE1" -->
! 			NEW Cannot change branch record: You must specify a Branchname and a Branchcode
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="MESSAGE2" -->
! 			NEW Branch record changed
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="MESSAGE3" -->
! 			NEW Branch record deleted
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="MESSAGE4" -->
! 			NEW Cannot change branch record: You must specify a Branchname and a Branchcode
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="MESSAGE5" -->
! 			NEW Category record changed
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="MESSAGE6" -->
! 			NEW The category has been deleted
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="MESSAGE7" -->
! 			Branch cannot be deleted because there are items using that branch
! 		<!-- /TMPL_IF -->
! 		</font>
  		<table border="1" cellpadding="5" cellspacing="0">
  			<tr>