From: S Page <spage@wikimedia.org>
Date: Thu, 6 Jun 2013 01:47:04 +0000 (-0700)
Subject: "Your domain" appearance fixes for new forms
X-Git-Tag: 1.31.0-rc.0~19480^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=ed0ca43e87affbab007326546641768271c54035;p=lhc%2Fweb%2Fwiklou.git

"Your domain" appearance fixes for new forms

* Restore lost id=mw-user-domain-section (so wikitech can hide it).
* Remove obsolete pos-above class.
* Fix message key.

Bug: 49225
Change-Id: I73bcd44eff10a4fd2d1a392e82427e42e92fc3bf
---

diff --git a/includes/templates/UsercreateVForm.php b/includes/templates/UsercreateVForm.php
index 2f90d3ceaf..92588819b1 100644
--- a/includes/templates/UsercreateVForm.php
+++ b/includes/templates/UsercreateVForm.php
@@ -121,8 +121,8 @@ class UsercreateTemplateVForm extends BaseTemplate {
 			$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
 		}
 	?>
-		<div>
-			<label><?php $this->msg( 'yourdomainname' ); ?></label>
+		<div id="mw-user-domain-section">
+			<label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
 			<div class="mw-input">
 				<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>"
 					tabindex="4">
diff --git a/includes/templates/UserloginVForm.php b/includes/templates/UserloginVForm.php
index 4f44209ca6..5b2504e9af 100644
--- a/includes/templates/UserloginVForm.php
+++ b/includes/templates/UserloginVForm.php
@@ -130,7 +130,7 @@ class UserloginTemplateVForm extends BaseTemplate {
 		}
 	?>
 		<div id="mw-user-domain-section">
-			<label for='wpDomain' class="pos-above"><?php $this->msg( 'yourdomain' ); ?></label>
+			<label for='wpDomain'><?php $this->msg( 'yourdomainname' ); ?></label>
 				<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>"
 					tabindex="3">
 					<?php echo $doms ?>