[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.39,1.40 readingrec.tmpl,1.15,1.16

Paul POULAIN tipaul at users.sourceforge.net
Wed Oct 26 11:17:09 CEST 2005 

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

Modified Files:
	moremember.tmpl readingrec.tmpl 
Log Message:
big commit, still breaking things...

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** moremember.tmpl	22 Sep 2005 15:34:17 -0000	1.39
--- moremember.tmpl	26 Oct 2005 09:17:07 -0000	1.40
***************
*** 3,15 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
- 	<!-- TMPL_IF NAME="picture" -->
- 		<img src="/intranet-tmpl/<!-- TMPL_VAR NAME="picture" -->">
- 	<!-- /TMPL_IF --><br>
- 	<a href="/cgi-bin/koha/members/member-picupload.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&name=<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->" class="button">Upload Picture</a><br>
  	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
! 		<p><label class="label100">Card number: </label><!-- TMPL_VAR NAME="cardnumber" --><br>	
! 
  		<label class="label100">Postal Address: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Home Address: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
--- 3,10 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
! 		<p><label class="label100">Card number: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
  		<label class="label100">Postal Address: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Home Address: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
***************
*** 69,91 ****
  		</p>
  		<p>
! 		<!-- TMPL_IF NAME="independantbranches"--> 
! 			<!-- TMPL_IF NAME="samebranch"--> 
! 				<!-- TMPL_IF NAME="I" -->
! 					<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
! 				<!-- /TMPL_IF -->
! 				<a href="javascript:confirm_deletion()" class="button">Delete</a>
! 				<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
! 				<a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
! 				</p>
! 				<br/>
! 				<p>
! 				<!-- TMPL_IF NAME="IS_ADULT" -->
! 					<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
! 				<!-- /TMPL_IF -->
! 				<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
! 			<!-- /TMPL_IF -->
! 		<!-- TMPL_ELSE --> 
  			<!-- TMPL_IF NAME="I" -->
  				<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
--- 64,68 ----
  		</p>
  		<p>
! 		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
  			<!-- TMPL_IF NAME="I" -->
  				<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
***************
*** 103,107 ****
  			<!-- /TMPL_IF -->
  			<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
! 		<!-- /TMPL_IF -->
  		<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Print Slip</a>
  		</p>
--- 80,84 ----
  			<!-- /TMPL_IF -->
  			<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
! 		<!-- /TMPL_UNLESS -->
  		<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Print Slip</a>
  		</p>
***************
*** 125,138 ****
  		</TMPL_IF>
  		<p>
! 		<!-- TMPL_IF NAME="independantbranches"--> 
! 			<!-- TMPL_IF NAME="samebranch"--> 
! 				<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 					View Account
! 				</a>
! 				<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 					Pay Fines
! 				</a>
! 			<!-- /TMPL_IF --> 
! 		<!-- TMPL_ELSE --> 
  			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
  				View Account
--- 102,106 ----
  		</TMPL_IF>
  		<p>
! 		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
  			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
  				View Account
***************
*** 141,145 ****
  				Pay Fines
  			</a>
! 		<!-- /TMPL_IF --> 
  		</p>
  	</div>
--- 109,113 ----
  				Pay Fines
  			</a>
! 		<!-- /TMPL_UNLESS -->
  		</p>
  	</div>
***************
*** 176,191 ****
  					<tr>
  						<td colspan="5" align="right">
! 						<!-- TMPL_IF NAME="independantbranches"--> 
! 							<!-- TMPL_IF NAME="samebranch"--> 
! 								<!-- TMPL_IF NAME="reserveloop" -->
! 									<input type="submit" name="submit" value="Update" class="button">
! 								<!-- /TMPL_IF -->
! 							<!-- /TMPL_IF --> 
! 						<!-- TMPL_ELSE --> 
  							<!-- TMPL_IF NAME="reserveloop" -->
  								<input type="submit" name="submit" value="Update" class="button">
  							<!-- /TMPL_IF -->
! 						<!-- /TMPL_IF --> 
! 
  						</td>
  					</tr>
--- 144,152 ----
  					<tr>
  						<td colspan="5" align="right">
! 						<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
  							<!-- TMPL_IF NAME="reserveloop" -->
  								<input type="submit" name="submit" value="Update" class="button">
  							<!-- /TMPL_IF -->
! 						<!-- /TMPL_UNLESS -->
  						</td>
  					</tr>
***************
*** 213,223 ****
  				<th>Itemtype</th>
  				<th>Charge</th>
! 				<!-- TMPL_IF NAME="independantbranches"--> 
! 					<!-- TMPL_IF NAME="samebranch"--> 
! 						<th>Renew</th>
! 					<!-- /TMPL_IF--> 
! 				<!-- TMPL_ELSE --> 
  					<th>Renew</th>
! 				<!-- /TMPL_IF--> 
  			</tr>
  
--- 174,180 ----
  				<th>Itemtype</th>
  				<th>Charge</th>
! 				<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
  					<th>Renew</th>
! 				<!-- /TMPL_UNLESS -->
  			</tr>
  
***************
*** 233,239 ****
  				<td><!-- TMPL_VAR NAME="itemtype" --></td>
  				<td><!-- TMPL_VAR NAME="charge" --></td>
! 				<!-- TMPL_IF NAME="independantbranches"--> 
! 					<!-- TMPL_IF NAME="samebranch"--> 
! 						<td>
  						<!-- TMPL_IF NAME="norenew" -->
  							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
--- 190,195 ----
  				<td><!-- TMPL_VAR NAME="itemtype" --></td>
  				<td><!-- TMPL_VAR NAME="charge" --></td>
! 				<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
! 					<td>
  						<!-- TMPL_IF NAME="norenew" -->
  							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
***************
*** 242,267 ****
  							<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
  						<!-- /TMPL_IF -->
- 						</td>
- 					<!-- /TMPL_IF--> 
- 				<!-- TMPL_ELSE --> 
- 					<td>
- 					<!-- TMPL_IF NAME="norenew" -->
- 						<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
- 					<!-- TMPL_ELSE -->
- 						<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
- 						<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
- 					<!-- /TMPL_IF -->
  					</td>
! 				<!-- /TMPL_IF -->
  			</tr>
  			<!-- /TMPL_LOOP -->
  			</table>
! 			<!-- TMPL_IF NAME="independantbranches"--> 
! 				<!-- TMPL_IF NAME="samebranch"--> 
! 					<input type="submit" class="button" value="Renew Items">
! 				<!-- /TMPL_IF--> 
! 			<!-- TMPL_ELSE --> 
  				<input type="submit" class="button" value="Renew Items">
! 			<!-- /TMPL_IF -->
  		</form>
  		<!-- TMPL_ELSE -->
--- 198,209 ----
  							<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
  						<!-- /TMPL_IF -->
  					</td>
! 				<!-- /TMPL_UNLESS --> 
  			</tr>
  			<!-- /TMPL_LOOP -->
  			</table>
! 			<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
  				<input type="submit" class="button" value="Renew Items">
! 			<!-- /TMPL_UNLESS --> 
  		</form>
  		<!-- TMPL_ELSE -->

Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** readingrec.tmpl	4 Oct 2005 14:41:48 -0000	1.15
--- readingrec.tmpl	26 Oct 2005 09:17:07 -0000	1.16
***************
*** 25,29 ****
  		</th>
  		<th>
! 			Volume
  		</th>
  	</tr>
--- 25,29 ----
  		</th>
  		<th>
! 			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Returned</a></th>
  		</th>
  	</tr>
***************
*** 47,53 ****
  			<!-- TMPL_VAR NAME="returndate" -->&nbsp;
  		</td>
- 		<td>
- 			<!-- TMPL_VAR NAME="volumeddesc" -->&nbsp;
- 		</td>
  	<!-- /TMPL_LOOP -->
  	</table>
--- 47,50 ----

More information about the Koha-cvs mailing list