From 37ebda534b6d0bcaf6e244d8277f2b83aa6059ba Mon Sep 17 00:00:00 2001
From: acli <acli>
Date: Sun, 9 Feb 2003 08:08:38 +0000
Subject: [PATCH] Updated for the fix for bug 180

---
 .../default/en/parameters/branches.tmpl       | 29 ++++++++++++++-
 .../default/es/parameters/branches.tmpl       | 33 +++++++++++++++--
 .../default/fr/parameters/branches.tmpl       | 37 ++++++++++++++++---
 .../default/pl/parameters/branches.tmpl       | 29 ++++++++++++++-
 .../default/zh-TW/parameters/branches.tmpl    | 34 +++++++++++++++--
 5 files changed, 145 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
index 540bf4b468..6010bddae6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
@@ -53,8 +53,33 @@ Confirm delete:
 <tr bgcolor='<TMPL_VAR name=color>'>
     <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
     <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=address escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=categories escape="HTML"></td>
+    <td align='left' valign='top'>
+<TMPL_IF name=address-empty-p>
+(nothing entered)
+<TMPL_ELSE>
+<TMPL_IF name=branchaddress1>
+<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress2>
+<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress3>
+<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchphone>
+<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchfax>
+<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchemail>
+<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
+</TMPL_IF>
+    </td>
+    <td align='left' valign='top'>
+<TMPL_IF name=no-categories-p>
+(no categories set)
+<TMPL_ELSE>
+<TMPL_LOOP name=category_list>
+<TMPL_VAR name=categoryname><br>
+</TMPL_LOOP>
+</TMPL_IF>
+    </td>
     <td align='left' valign='top'>
 <form action='<TMPL_VAR name=action>' method=post>
 <input type='hidden' name='op' value='edit'>
diff --git a/koha-tmpl/intranet-tmpl/default/es/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/es/parameters/branches.tmpl
index 9dad83045d..6a77ee9ef3 100644
--- a/koha-tmpl/intranet-tmpl/default/es/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/es/parameters/branches.tmpl
@@ -45,10 +45,35 @@ Confirm delete:
 </tr>
 <TMPL_LOOP name="branches">
 <tr bgcolor='<TMPL_VAR name=color>'>
-    <td align='left' valign='top'><TMPL_VAR name=branch_name></td>
-    <td align='left' valign='top'><TMPL_VAR name=branch_code></td>
-    <td align='left' valign='top'><TMPL_VAR name=address></td>
-    <td align='left' valign='top'><TMPL_VAR name=categories></td>
+    <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
+    <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
+    <td align='left' valign='top'>
+<TMPL_IF name=address-empty-p>
+(nothing entered)
+<TMPL_ELSE>
+<TMPL_IF name=branchaddress1>
+<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress2>
+<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress3>
+<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchphone>
+<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchfax>
+<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchemail>
+<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
+</TMPL_IF>
+    </td>
+    <td align='left' valign='top'>
+<TMPL_IF name=no-categories-p>
+(no categories set)
+<TMPL_ELSE>
+<TMPL_LOOP name=category_list>
+<TMPL_VAR name=categoryname><br>
+</TMPL_LOOP>
+</TMPL_IF>
+    </td>
     <td align='left' valign='top'> 
 <form action='<TMPL_VAR name=action>' method=post>
 <input type='hidden' name='op' value='edit'>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
index 3505d67b11..e4ab15bc64 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
@@ -41,7 +41,7 @@
 <TMPL_IF name="else">
 <FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
 <font color='red'><TMPL_VAR name="message"></font>
-<form action=><TMPL_VAR name=action> method=post><input type='hidden' name='op' value='add'>
+<form action="<TMPL_VAR name=action>" method=post><input type='hidden' name='op' value='add'>
   <input type=submit value='Ajouter une nouvelle annexe'>
 </form>
 <table border='1' cellpadding='5' cellspacing='0' width='550'>
@@ -53,15 +53,40 @@
     <td width='175'><b>Nom</b></td> 
 <td width='25'><b>Code</b></td> 
     <td width='175'><b>Adresse</b></td>
-    <td width='175'><b>Categories</b></td>
+    <td width='175'><b>Cat&eacute;gories</b></td>
 <td width='50'><b>&nbsp;</b></td>
 </tr>
 <TMPL_LOOP name="branches">
 <tr bgcolor='<TMPL_VAR name=color>'>
-    <td align='left' valign='top'><TMPL_VAR name=branch_name></td>
-    <td align='left' valign='top'><TMPL_VAR name=branch_code></td>
-    <td align='left' valign='top'><TMPL_VAR name=address></td>
-    <td align='left' valign='top'><TMPL_VAR name=categories></td>
+    <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
+    <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
+    <td align='left' valign='top'>
+<TMPL_IF name=address-empty-p>
+(nothing entered)
+<TMPL_ELSE>
+<TMPL_IF name=branchaddress1>
+<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress2>
+<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress3>
+<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchphone>
+<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchfax>
+<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchemail>
+<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
+</TMPL_IF>
+    </td>
+    <td align='left' valign='top'>
+<TMPL_IF name=no-categories-p>
+(no categories set)
+<TMPL_ELSE>
+<TMPL_LOOP name=category_list>
+<TMPL_VAR name=categoryname><br>
+</TMPL_LOOP>
+</TMPL_IF>
+    </td>
     <td align='left' valign='top'> 
 <form action='<TMPL_VAR name=action>' method=post>
 <input type='hidden' name='op' value='edit'>
diff --git a/koha-tmpl/intranet-tmpl/default/pl/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/pl/parameters/branches.tmpl
index df89f179c0..e7135c19e6 100644
--- a/koha-tmpl/intranet-tmpl/default/pl/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/pl/parameters/branches.tmpl
@@ -53,8 +53,33 @@ Potwierd
 <tr bgcolor='<TMPL_VAR name=color>'>
     <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
     <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=address escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=categories escape="HTML"></td>
+    <td align='left' valign='top'>
+<TMPL_IF name=address-empty-p>
+(nothing entered)
+<TMPL_ELSE>
+<TMPL_IF name=branchaddress1>
+<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress2>
+<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress3>
+<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchphone>
+<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchfax>
+<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchemail>
+<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
+</TMPL_IF>
+    </td>
+    <td align='left' valign='top'>
+<TMPL_IF name=no-categories-p>
+(no categories set)
+<TMPL_ELSE>
+<TMPL_LOOP name=category_list>
+<TMPL_VAR name=categoryname><br>
+</TMPL_LOOP>
+</TMPL_IF>
+    </td>
     <td align='left' valign='top'>
 <form action='<TMPL_VAR name=action>' method=post>
 <input type='hidden' name='op' value='edit'>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
index 09803978dd..81b875eb1e 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
@@ -12,8 +12,10 @@
 <tr><td>¤ÀÀ]½s½X</td><td><input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'</td></tr>
 <tr><td>À]¦W</td><td><input type=text name=branchname size=40 maxlength=80 value="<TMPL_VAR name=branchname escape="HTML">">&nbsp;</td></tr>
 <FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
+<TMPL_LOOP NAME=categoryloop>
 <tr><td><TMPL_VAR name=categoryname></td>
-<td><INPUT TYPE="checkbox" NAME="<TMPL_VAR name=categorycode>" VALUE="1" ><TMPL_VAR name=codedescription></td></tr>
+<td><INPUT TYPE="checkbox" NAME="<TMPL_VAR name=categorycode>" <TMPL_VAR name=checked>><TMPL_VAR name=codedescription></td></tr>
+</TMPL_LOOP>
 <tr><td>¦a§}</td><td><input type=text name=branchaddress1 value='<TMPL_VAR name=branchaddress1 escape="HTML">'></td></tr>
 <tr><td>&nbsp;</td><td><input type=text name=branchaddress2 value='<TMPL_VAR name=branchaddress2 escape="HTML">'></td></tr>
 <tr><td>&nbsp;</td><td><input type=text name=branchaddress3 value='<TMPL_VAR name=branchaddress3 escape="HTML">'></td></tr>
@@ -52,8 +54,33 @@ Confirm delete:
 <tr bgcolor='<TMPL_VAR name=color>'>
     <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
     <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=address escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=categories escape="HTML"></td>
+    <td align='left' valign='top'>
+<TMPL_IF name=address-empty-p>
+(nothing entered)
+<TMPL_ELSE>
+<TMPL_IF name=branchaddress1>
+<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress2>
+<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchaddress3>
+<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchphone>
+<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchfax>
+<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
+<TMPL_IF name=branchemail>
+<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
+</TMPL_IF>
+    </td>
+    <td align='left' valign='top'>
+<TMPL_IF name=no-categories-p>
+(no categories set)
+<TMPL_ELSE>
+<TMPL_LOOP name=category_list>
+<TMPL_VAR name=categoryname><br>
+</TMPL_LOOP>
+</TMPL_IF>
+    </td>
     <td align='left' valign='top'>
 <form action='<TMPL_VAR name=action>' method=post>
 <input type='hidden' name='op' value='edit'>
@@ -68,6 +95,7 @@ Confirm delete:
 </TMPL_LOOP>
 </table>
 <br>
+<form action=<TMPL_VAR name=action> method=post><input type='hidden' name='op' value='add_cat'><input type=submit value='¥[¤@Ãþ§O'></form>
 <table border='1' cellpadding='5' cellspacing='0'>
 <tr> <th colspan='5' align='left' bgcolor='#99cc33'>
 <font size='5'><b>¤ÀÀ]Ãþ§O</b></font></th> </tr> 
-- 
2.39.5