[Phpbb-checkins] r10055 - in /branches/phpBB-3_0_0/phpBB: includes/ styles/prosilver/template/

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Aug 25 11:02:24 2009
New Revision: 10055

Log:
Adjustement for r10050, related to Bug #50185
Use internal S_TAB_INDEX instead of DEFINE

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Aug 25 11:02:24 2009
***************
*** 4120,4125 ****
--- 4120,4127 ----
  		'S_USER_UNREAD_PRIVMSG'			=> $user->data['user_unread_privmsg'],
  		'S_USER_NEW'					=> $user->data['user_new'],
  
+ 		'S_TAB_INDEX'		=> 1,
+ 
  		'SID'				=> $SID,
  		'_SID'				=> $_SID,
  		'SESSION_ID'		=> $user->session_id,

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_default.html Tue Aug 25 11:02:24 2009
***************
*** 11,17 ****
  	<dl>
  		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
  		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! 		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="<!-- INC $TAB_INDEX -->" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
  		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
  		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
  		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
--- 11,17 ----
  	<dl>
  		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
  		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
! 		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="<!-- INC S_TAB_INDEX -->" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
  		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
  		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
  		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Tue Aug 25 11:02:24 2009
***************
*** 9,15 ****
  	<dl>
  	<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
  	<dd>
! 		<input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
  		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
  	</dd>
  	</dl>
--- 9,15 ----
  	<dl>
  	<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
  	<dd>
! 		<input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
  		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
  	</dd>
  	</dl>

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_recaptcha.html Tue Aug 25 11:02:24 2009
***************
*** 17,23 ****
  		// <![CDATA[
  		var RecaptchaOptions = {
  		   lang : {L_RECAPTCHA_LANG},
! 		   tabindex : <!-- INC $TAB_INDEX -->
  		};
  		// ]]>
  		</script>
--- 17,23 ----
  		// <![CDATA[
  		var RecaptchaOptions = {
  		   lang : {L_RECAPTCHA_LANG},
! 		   tabindex : <!-- INC S_TAB_INDEX -->
  		};
  		// ]]>
  		</script>

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/index_body.html Tue Aug 25 11:02:24 2009
***************
*** 18,24 ****
  	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
  	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
  		<fieldset class="quick-login">
! 			<label for="username">{L_USERNAME}:</label>&nbsp;<input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />  
  			<label for="password">{L_PASSWORD}:</label>&nbsp;<input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
  			<!-- IF S_AUTOLOGIN_ENABLED -->
  				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
--- 18,24 ----
  	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
  	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
  		<fieldset class="quick-login">
! 			<label for="username">{L_USERNAME}:</label>&nbsp;<input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />
  			<label for="password">{L_PASSWORD}:</label>&nbsp;<input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
  			<!-- IF S_AUTOLOGIN_ENABLED -->
  				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html Tue Aug 25 11:02:24 2009
***************
*** 6,21 ****
  
  	<div class="content">
  		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
! 		
  		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
  		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
  		<dl>
  			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! 			<dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
  		</dl>
  		<dl>
  			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! 			<dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
  			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
  				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
  				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
--- 6,21 ----
  
  	<div class="content">
  		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
! 
  		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
  		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
  		<dl>
  			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt>
! 			<dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
  		</dl>
  		<dl>
  			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt>
! 			<dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
  			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
  				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
  				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
***************
*** 26,41 ****
  		<!-- ENDIF -->
  		<!-- IF S_DISPLAY_FULL_LOGIN -->
  		<dl>
! 			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="<!-- INC $TAB_INDEX -->" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! 			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="<!-- INC $TAB_INDEX -->" /> {L_HIDE_ME}</label></dd>
  		</dl>
  		<!-- ENDIF -->
  
  		<dl>
  			<dt>&nbsp;</dt>
! 			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="<!-- INC $TAB_INDEX -->" value="{L_LOGIN}" class="button1" /></dd>
  		</dl>
! 	
  		</fieldset>
  	</div>
  	<span class="corners-bottom"><span></span></span></div>
--- 26,41 ----
  		<!-- ENDIF -->
  		<!-- IF S_DISPLAY_FULL_LOGIN -->
  		<dl>
! 			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="<!-- INC S_TAB_INDEX -->" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
! 			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="<!-- INC S_TAB_INDEX -->" /> {L_HIDE_ME}</label></dd>
  		</dl>
  		<!-- ENDIF -->
  
  		<dl>
  			<dt>&nbsp;</dt>
! 			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="<!-- INC S_TAB_INDEX -->" value="{L_LOGIN}" class="button1" /></dd>
  		</dl>
! 
  		</fieldset>
  	</div>
  	<span class="corners-bottom"><span></span></span></div>

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Tue Aug 25 11:02:24 2009
***************
*** 97,103 ****
  <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
  	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
  <!-- ENDIF -->
! <!-- DEFINE $TAB_INDEX = 1 -->
  </head>
  
  <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
--- 97,103 ----
  <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
  	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
  <!-- ENDIF -->
! 
  </head>
  
  <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html Tue Aug 25 11:02:24 2009
***************
*** 90,103 ****
  	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
  	<dl style="clear: left;">
  		<dt><label for="username">{L_USERNAME}:</label></dt>
! 		<dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->"  name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
  	</dl>
  	<!-- ENDIF -->
  
  	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
  	<dl style="clear: left;">
  		<dt><label for="subject">{L_SUBJECT}:</label></dt>
! 		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="<!-- INC $TAB_INDEX -->" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
  	</dl>
  		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
--- 90,103 ----
  	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
  	<dl style="clear: left;">
  		<dt><label for="username">{L_USERNAME}:</label></dt>
! 		<dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->"  name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
  	</dl>
  	<!-- ENDIF -->
  
  	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
  	<dl style="clear: left;">
  		<dt><label for="subject">{L_SUBJECT}:</label></dt>
! 		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="<!-- INC S_TAB_INDEX -->" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
  	</dl>
  		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
***************
*** 135,141 ****
  	</div>
  
  	<div id="message-box">
! 		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="<!-- INC $TAB_INDEX -->" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
  	</div>
  </fieldset>
  
--- 135,141 ----
  	</div>
  
  	<div id="message-box">
! 		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="<!-- INC S_TAB_INDEX -->" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
  	</div>
  </fieldset>
  
***************
*** 180,189 ****
  		<fieldset class="submit-buttons">
  			{S_HIDDEN_ADDRESS_FIELD}
  			{S_HIDDEN_FIELDS}
! 			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="<!-- INC $TAB_INDEX -->" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
! 			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="<!-- INC $TAB_INDEX -->" name="save" value="{L_SAVE}" class="button2" />&nbsp; <!-- ENDIF -->
! 			<input type="submit" tabindex="<!-- INC $TAB_INDEX -->" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
! 			<input type="submit" accesskey="s" tabindex="<!-- INC $TAB_INDEX -->" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
  
  		</fieldset>
  
--- 180,189 ----
  		<fieldset class="submit-buttons">
  			{S_HIDDEN_ADDRESS_FIELD}
  			{S_HIDDEN_FIELDS}
! 			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="<!-- INC S_TAB_INDEX -->" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
! 			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="<!-- INC S_TAB_INDEX -->" name="save" value="{L_SAVE}" class="button2" />&nbsp; <!-- ENDIF -->
! 			<input type="submit" tabindex="<!-- INC S_TAB_INDEX -->" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
! 			<input type="submit" accesskey="s" tabindex="<!-- INC S_TAB_INDEX -->" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
  
  		</fieldset>
  

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Tue Aug 25 11:02:24 2009
***************
*** 26,63 ****
  	<!-- IF L_REG_COND -->
  		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
  	<!-- ENDIF -->
- <!-- DEFINE $TAB_INDEX = 1 -->
- 
  	<dl>
  		<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! 		<dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! 		<dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! 		<dd><input type="text" tabindex="<!-- INC $TAB_INDEX -->" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! 		<dd><input type="password" tabindex="<!-- INC $TAB_INDEX -->" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! 		<dd><input type="password"  tabindex="<!-- INC $TAB_INDEX -->" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
  	</dl>
  
  	<hr />
  
  	<dl>
  		<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! 		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="<!-- INC $TAB_INDEX -->" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
  	</dl>
  	<dl>
  		<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! 		<dd><select name="tz" id="tz" tabindex="<!-- INC $TAB_INDEX -->" class="autowidth">{S_TZ_OPTIONS}</select></dd>
  	</dl>
  
  	<!-- IF .profile_fields -->
--- 26,61 ----
  	<!-- IF L_REG_COND -->
  		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>
  	<!-- ENDIF -->
  	<dl>
  		<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
! 		<dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
! 		<dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
! 		<dd><input type="text" tabindex="<!-- INC S_TAB_INDEX -->" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
! 		<dd><input type="password" tabindex="<!-- INC S_TAB_INDEX -->" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
  	</dl>
  	<dl>
  		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
! 		<dd><input type="password"  tabindex="<!-- INC S_TAB_INDEX -->" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
  	</dl>
  
  	<hr />
  
  	<dl>
  		<dt><label for="lang">{L_LANGUAGE}:</label></dt>
! 		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="<!-- INC S_TAB_INDEX -->" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
  	</dl>
  	<dl>
  		<dt><label for="tz">{L_TIMEZONE}:</label></dt>
! 		<dd><select name="tz" id="tz" tabindex="<!-- INC S_TAB_INDEX -->" class="autowidth">{S_TZ_OPTIONS}</select></dd>
  	</dl>
  
  	<!-- IF .profile_fields -->
***************
*** 79,85 ****
  <!-- IF CAPTCHA_TEMPLATE -->
  
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
! 	
  <!-- ENDIF -->
  <!-- IF S_COPPA -->
  
--- 77,83 ----
  <!-- IF CAPTCHA_TEMPLATE -->
  
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
! 
  <!-- ENDIF -->
  <!-- IF S_COPPA -->