Merge pull request #9288 from GitHubUser4234/ldap_password_renew_nc13fix

Ldap password renewal fixes for NC13

2 files changed, 125 insertions, 10 deletions

diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css
index 03fe2bccd88..7493789eab0 100644
--- a/apps/user_ldap/css/renewPassword.css
+++ b/apps/user_ldap/css/renewPassword.css
@@ -1,6 +1,6 @@
 #personal-show + label {
-	left: 222px !important;
-	margin-top: 3px !important;
+	left: 236px !important;
+	margin-top: 17px !important;
 }
 
 #renewpassword .strengthify-wrapper {
@@ -19,7 +19,126 @@
 	background-color: transparent;
 }
 
-input.primary,
-button.primary {
-	background-color: #00a2e9 !important;
+.tooltip {
+	position:absolute;
+	display:block;
+	font-family:'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-style:normal;
+	font-weight:400;
+	letter-spacing:normal;
+	line-break:auto;
+	line-height:1.6;
+	text-align:left;
+	text-align:start;
+	text-decoration:none;
+	text-shadow:none;
+	text-transform:none;
+	white-space:normal;
+	word-break:normal;
+	word-spacing:normal;
+	word-wrap:normal;
+	font-size:12px;
+	opacity:0;
+	z-index:100000;
+	filter:drop-shadow(0 1px 10px rgba(77, 77, 77, 0.75));
+}
+
+.tooltip.in {
+	opacity:1
+}
+
+.tooltip.top {
+	margin-top:-3px;
+	padding:10px 0
+}
+
+.tooltip.bottom {
+	margin-top:3px;
+	padding:10px 0
+}
+
+.tooltip.right {
+	margin-left:3px;
+	padding:0 10px
+}
+
+.tooltip.right .tooltip-arrow {
+	top:50%;
+	left:0;
+	margin-top:-10px;
+	border-width:10px 10px 10px 0;
+	border-right-color:#fff
+}
+
+.tooltip.left {
+	margin-left:-3px;
+	padding:0 5px
+}
+
+.tooltip.left .tooltip-arrow {
+	top:50%;
+	right:0;
+	margin-top:-10px;
+	border-width:10px 0 10px 10px;
+	border-left-color:#fff
+}
+
+.tooltip.top .tooltip-arrow,.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow {
+	bottom:0;
+	border-width:10px 10px 0;
+	border-top-color:#fff
+}
+
+.tooltip.top .tooltip-arrow {
+	left:50%;
+	margin-left:-10px
+}
+
+.tooltip.top-left .tooltip-arrow {
+	right:10px;
+	margin-bottom:-10px
+}
+
+.tooltip.top-right .tooltip-arrow {
+	left:10px;
+	margin-bottom:-10px
+}
+
+.tooltip.bottom .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow {
+	top:0;
+	border-width:0 10px 10px;
+	border-bottom-color:#fff
+}
+
+.tooltip.bottom .tooltip-arrow {
+	left:50%;
+	margin-left:-10px
+}
+
+.tooltip.bottom-left .tooltip-arrow {
+	right:10px;
+	margin-top:-10px
+}
+
+.tooltip.bottom-right .tooltip-arrow {
+	left:10px;
+	margin-top:-10px
+}
+
+.tooltip-inner {
+	max-width:350px;
+	padding:5px 8px !important;
+	background-color:#fff;
+	color:#000 !important;
+	text-align:center !important;
+	font-weight:normal !important;
+	border-radius:3px
+}
+
+.tooltip-arrow {
+	position:absolute;
+	width:0;
+	height:0;
+	border-color:transparent;
+	border-style:solid
 }
diff --git a/apps/user_ldap/templates/renewpassword.php b/apps/user_ldap/templates/renewpassword.php
index 9fc4271d6be..12b1d7fc045 100644
--- a/apps/user_ldap/templates/renewpassword.php
+++ b/apps/user_ldap/templates/renewpassword.php
@@ -53,11 +53,7 @@ style('user_ldap', 'renewPassword');
 		
 		<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Renew password')); ?>"/>
 
-		<?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?>
-		<a id="lost-password" class="warning" href="<?php p($_['resetPasswordLink']); ?>">
-			<?php p($l->t('Wrong password. Reset it?')); ?>
-		</a>
-		<?php } else if (!empty($_['invalidpassword'])) { ?>
+		<?php if (!empty($_['invalidpassword'])) { ?>
 			<p class="warning">
 				<?php p($l->t('Wrong password.')); ?>
 			</p>