[Phpbb-checkins] CVS: phpBB2/templates/subSilver install.tpl,1.4,1.5

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv26369/templates/subSilver

Modified Files:
	install.tpl 
Log Message:
Update to "merge" upgrade with Install... (Not fully tested since current upgrade not in CVS)


Index: install.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/install.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** install.tpl	2001/10/18 14:56:40	1.4
--- install.tpl	2001/11/06 16:54:15	1.5
***************
*** 117,121 ****
  			</tr>
  			<tr>
! 				<td width="100%"><form action="{S_FORM_ACTION}" method="post"><table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  					<!-- BEGIN switch_stage_one_install -->
  					<tr>
--- 117,121 ----
  			</tr>
  			<tr>
! 				<td width="100%"><form action="{S_FORM_ACTION}" name="install_form" method="post"><table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
  					<!-- BEGIN switch_stage_one_install -->
  					<tr>
***************
*** 129,132 ****
--- 129,136 ----
  						<td class="row1" align="right"><span class="gen">{L_DBMS}: </span></td>
  						<td class="row2">{S_DBMS_SELECT}</td>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_UPGRADE}:</span></td>
+ 						<td class="row2">{S_UPGRADE_SELECT}</td>
  					</tr>
  					<!-- tr>