X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ftemplates%2FUsercreate.php;h=01da0bd790470739960a3f68ea00a9783ecf0e99;hb=c55116b808ba938e075d738a91515d2a7ab6b67d;hp=a4240e2fc89946048a6d2b554f47d4cc369395da;hpb=67a773cc3f78d963596914a97b016b862cea29f7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/templates/Usercreate.php b/includes/templates/Usercreate.php
index a4240e2fc8..01da0bd790 100644
--- a/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@ -81,7 +81,7 @@ class UsercreateTemplate extends BaseTemplate {
 				</label>
 				<?php
 				echo Html::input( 'wpName', $this->data['name'], 'text', array(
-					'class' => 'mw-input loginText',
+					'class' => 'mw-ui-input loginText',
 					'id' => 'wpName2',
 					'tabindex' => '1',
 					'size' => '20',
@@ -94,14 +94,15 @@ class UsercreateTemplate extends BaseTemplate {
 
 			<div class="mw-ui-vform-field">
 				<?php if ( $this->data['createemail'] ) { ?>
-					<label class="mw-ui-checkbox-label">
+					<div class="mw-ui-checkbox">
 						<input name="wpCreateaccountMail" type="checkbox" value="1" id="wpCreateaccountMail" tabindex="2"
 							<?php if ( $this->data['createemailset'] ) {
 								echo 'checked="checked"';
 							} ?>
-						>
-						<?php $this->msg( 'createaccountmail' ); ?>
-					</label>
+						><label for="wpCreateaccountMail">
+							<?php $this->msg( 'createaccountmail' ); ?>
+						</label>
+					</div>
 				<?php } ?>
 			</div>
 
@@ -109,7 +110,7 @@ class UsercreateTemplate extends BaseTemplate {
 				<label for='wpPassword2'><?php $this->msg( 'userlogin-yourpassword' ); ?></label>
 				<?php
 				echo Html::input( 'wpPassword', null, 'password', array(
-					'class' => 'mw-input loginPassword',
+					'class' => 'mw-ui-input loginPassword',
 					'id' => 'wpPassword2',
 					'tabindex' => '3',
 					'size' => '20',
@@ -129,7 +130,7 @@ class UsercreateTemplate extends BaseTemplate {
 			?>
 				<div class="mw-ui-vform-field" id="mw-user-domain-section">
 					<label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
-					<div class="mw-input">
+					<div>
 						<?php echo $select->getHTML(); ?>
 					</div>
 				</div>
@@ -139,7 +140,7 @@ class UsercreateTemplate extends BaseTemplate {
 				<label for='wpRetype'><?php $this->msg( 'createacct-yourpasswordagain' ); ?></label>
 				<?php
 				echo Html::input( 'wpRetype', null, 'password', array(
-					'class' => 'mw-input loginPassword',
+					'class' => 'mw-ui-input loginPassword',
 					'id' => 'wpRetype',
 					'tabindex' => '5',
 					'size' => '20',
@@ -161,7 +162,7 @@ class UsercreateTemplate extends BaseTemplate {
 					</label>
 					<?php
 						echo Html::input( 'wpEmail', $this->data['email'], 'email', array(
-							'class' => 'mw-input loginText',
+							'class' => 'mw-ui-input loginText',
 							'id' => 'wpEmail',
 							'tabindex' => '6',
 							'size' => '20',
@@ -176,7 +177,7 @@ class UsercreateTemplate extends BaseTemplate {
 			<?php if ( $this->data['userealname'] ) { ?>
 				<div class="mw-ui-vform-field">
 					<label for='wpRealName'><?php $this->msg( 'createacct-realname' ); ?></label>
-					<input type='text' class='mw-input loginText' name="wpRealName" id="wpRealName"
+					<input type='text' class='mw-ui-input loginText' name="wpRealName" id="wpRealName"
 						tabindex="7"
 						value="<?php $this->text( 'realname' ); ?>" size='20' />
 					<div class="prefsectiontip">
@@ -189,7 +190,7 @@ class UsercreateTemplate extends BaseTemplate {
 				<div class="mw-ui-vform-field">
 					<label for='wpReason'><?php $this->msg( 'createacct-reason' ); ?></label>
 					<?php echo Html::input( 'wpReason', $this->data['reason'], 'text', array(
-						'class' => 'mw-input loginText',
+						'class' => 'mw-ui-input loginText',
 						'id' => 'wpReason',
 						'tabindex' => '8',
 						'size' => '20',
@@ -207,7 +208,7 @@ class UsercreateTemplate extends BaseTemplate {
 						// If it's a checkbox, output the whole thing (assume it has a msg).
 						if ( $inputItem['type'] == 'checkbox' ) {
 						?>
-							<label class="mw-ui-checkbox-label">
+							<div class="mw-ui-checkbox">
 								<input
 									name="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
 									id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
@@ -216,9 +217,8 @@ class UsercreateTemplate extends BaseTemplate {
 									<?php if ( !empty( $inputItem['value'] ) ) {
 										echo 'checked="checked"';
 									} ?>
-								>
-								<?php $this->msgHtml( $inputItem['msg'] ); ?>
-							</label>
+								><label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"></label>
+							</div><?php $this->msgHtml( $inputItem['msg'] ); ?>
 						<?php
 						} else {
 							// Not a checkbox.
@@ -231,7 +231,7 @@ class UsercreateTemplate extends BaseTemplate {
 							<?php } ?>
 							<input
 								type="<?php echo htmlspecialchars( $inputItem['type'] ); ?>"
-								class="mw-input"
+								class="mw-ui-input"
 								name="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
 								tabindex="<?php echo $tabIndex++; ?>"
 								value="<?php echo htmlspecialchars( $inputItem['value'] ); ?>"