[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/bull su... [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/11 13:51:57

Modified files:
	koha-tmpl/intranet-tmpl/default/en/bull: subscription-add.tmpl 
	                                         subscription-detail.tmpl 

Log message:
	sync with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.8.2.1&r2=1.8.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.6&r2=1.6.2.6.2.1

Patches:
Index: subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.1.2.1
diff -u -b -r1.8.2.1 -r1.8.2.1.2.1
--- subscription-add.tmpl	25 Mar 2005 16:48:33 -0000	1.8.2.1
+++ subscription-add.tmpl	11 Jul 2006 13:51:57 -0000	1.8.2.1.2.1
@@ -162,19 +162,21 @@
 				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
 			</tr>
 			<tr>
-				<td class="bull">When more than</td>
-				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
-			</tr>
 			<!-- TMPL_IF name="mod" -->
-			<tr>
 				<td class="bull">The loop is for instance</td>
+				<!-- TMPL_ELSE -->
+					<td class="bull">Starting period</td>
+				<!-- /TMPL_IF -->
 				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
 				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
 				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
 			</tr>
-			<!-- /TMPL_IF -->
+			<tr>
+				<td class="bull">When more than</td>
+				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+			</tr>
 			<tr>
 				<td class="bull">Set back to</td>
 				<td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>

Index: subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.6.2.1
diff -u -b -r1.6.2.6 -r1.6.2.6.2.1
--- subscription-detail.tmpl	9 Sep 2005 10:11:38 -0000	1.6.2.6
+++ subscription-detail.tmpl	11 Jul 2006 13:51:57 -0000	1.6.2.6.2.1
@@ -118,13 +118,16 @@
 				<td><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
+				<td class="bull">Starting period</td>
+				<td><!-- TMPL_IF name="innerloop1" --><!-- TMPL_VAR name="innerloop1" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF name="innerloop2" --><!-- TMPL_VAR name="innerloop2" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF name="innerloop3" --><!-- TMPL_VAR name="innerloop3" --><!-- /TMPL_IF --></td>
+			</tr>
+			<tr>
 				<td class="bull">When more than</td>
-				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR name="whenmorethan1" --></td>
+				<td><!-- TMPL_VAR name="whenmorethan2" --></td>
+				<td><!-- TMPL_VAR name="whenmorethan3" --></td>
 			</tr>
 			<tr>
 				<td class="bull">Set back to</td>