X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=blobdiff_plain;f=includes%2Ftemplates%2FUserlogin.php;h=69266c8de3627dc0d8f6f10240e8f76c2170508e;hb=f6d0456175a8b28fd7ce7a9bb3c5302d353fa4bd;hp=2a9badf224091e7930549e8d2904c18090acec0b;hpb=cf93d76c03b99b8167f54c2a05f66657ba4c59b3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 2a9badf224..69266c8de3 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -90,14 +90,6 @@ class UserloginTemplate extends BaseTemplate {
 				<label for='wpPassword1'>
 					<?php
 					$this->msg( 'userlogin-yourpassword' );
-
-					if ( $this->data['useemail'] && $this->data['canreset'] && $this->data['resetlink'] === true ) {
-						echo ' ' . Linker::link(
-							SpecialPage::getTitleFor( 'PasswordReset' ),
-							$this->getMsg( 'userlogin-resetpassword-link' )->parse(),
-							array( 'class' => 'mw-ui-flush-right' )
-						);
-					}
 					?>
 				</label>
 				<?php
@@ -160,7 +152,7 @@ class UserloginTemplate extends BaseTemplate {
 				?>
 			</div>
 
-			<div class="mw-ui-vform-field" id="mw-userlogin-help">
+			<div class="mw-ui-vform-field mw-form-related-link-container" id="mw-userlogin-help">
 				<?php
 				echo Html::element(
 					'a',
@@ -173,14 +165,26 @@ class UserloginTemplate extends BaseTemplate {
 				);
 				?>
 			</div>
-
-			<?php if ( $this->haveData( 'createOrLoginHref' ) ) { ?>
-				<?php if ( $this->data['loggedin'] ) { ?>
-					<div id="mw-createaccount-another">
-						<a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"  class="mw-ui-button"><?php $this->msg( 'userlogin-createanother' ); ?></a>
+			<?php
+			if ( $this->haveData( 'createOrLoginHref' ) ) {
+				if ( $this->data['useemail'] && $this->data['canreset'] && $this->data['resetlink'] === true ) {
+					echo Html::openElement( 'div',
+							array(
+								'class' => 'mw-ui-vform-field mw-form-related-link-container',
+							)
+						) .
+						Linker::link(
+							SpecialPage::getTitleFor( 'PasswordReset' ),
+							$this->getMsg( 'userlogin-resetpassword-link' )->parse()
+						) .
+						Html::closeElement( 'div' );
+				}
+				if ( $this->data['loggedin'] ) { ?>
+					<div id="mw-createaccount-another" class="mw-form-related-link-container mw-ui-vform-field">
+						<a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"><?php $this->msg( 'userlogin-createanother' ); ?></a>
 					</div>
 				<?php } else { ?>
-					<div id="mw-createaccount-cta">
+					<div id="mw-createaccount-cta" class="mw-form-related-link-container mw-ui-vform-field">
 						<?php $this->msg( 'userlogin-noaccount' ); ?><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"  class="mw-ui-button mw-ui-progressive"><?php $this->msg( 'userlogin-joinproject' ); ?></a>
 					</div>
 				<?php } ?>
@@ -188,6 +192,7 @@ class UserloginTemplate extends BaseTemplate {
 			<?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
 			<?php if ( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpLoginToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
 			<?php if ( $this->data['cansecurelogin'] ) {?><input type="hidden" name="wpForceHttps" value="<?php $this->text( 'stickhttps' ); ?>" /><?php } ?>
+			<?php if ( $this->data['cansecurelogin'] && $this->haveData( 'fromhttp' )) {?><input type="hidden" name="wpFromhttp" value="<?php $this->text( 'fromhttp' ); ?>" /><?php } ?>
 		</form>
 	</div>
 </div>