From 15fb3bb73ad0167ffe5a6843427c895e3c2140f0 Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Tue, 24 Apr 2018 15:47:31 +0800
Subject: [PATCH 1/4] remove reset password link

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 apps/user_ldap/templates/renewpassword.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/templates/renewpassword.php b/apps/user_ldap/templates/renewpassword.php
index 9fc4271d6b..7834678839 100644
--- a/apps/user_ldap/templates/renewpassword.php
+++ b/apps/user_ldap/templates/renewpassword.php
@@ -23,7 +23,7 @@ style('user_ldap', 'renewPassword');
 				<?php p($message); ?><br>
 			</div>
 		<?php endforeach; ?>
-		<?php if (isset($_['internalexception']) && $_['internalexception']): ?>
+		<?php if (isset($_['internalexception']) && ($_['internalexception'])): ?>
 			<div class="warning">
 				<?php p($l->t('An internal error occurred.')); ?><br>
 				<small><?php p($l->t('Please try again or contact your administrator.')); ?></small>
@@ -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>

From 571b337a5e36511bef7ccf7b73e6cfd5ff9ea22a Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Tue, 24 Apr 2018 15:53:48 +0800
Subject: [PATCH 2/4] adjust css to nc13 core changes

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 apps/user_ldap/css/renewPassword.css | 112 +++++++++++++++++++++++++--
 1 file changed, 107 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css
index 03fe2bccd8..c0c8081b80 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,109 @@
 	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
 }

From cc40917e5e897c72909d1fbb85d8f118d4c74912 Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Wed, 25 Apr 2018 14:47:16 +0800
Subject: [PATCH 3/4] css indent alignment

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 apps/user_ldap/css/renewPassword.css | 157 +++++++++++++++------------
 1 file changed, 87 insertions(+), 70 deletions(-)

diff --git a/apps/user_ldap/css/renewPassword.css b/apps/user_ldap/css/renewPassword.css
index c0c8081b80..7493789eab 100644
--- a/apps/user_ldap/css/renewPassword.css
+++ b/apps/user_ldap/css/renewPassword.css
@@ -20,108 +20,125 @@
 }
 
 .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));
+	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
+	opacity:1
 }
+
 .tooltip.top {
- margin-top:-3px;
- padding:10px 0
+	margin-top:-3px;
+	padding:10px 0
 }
+
 .tooltip.bottom {
- margin-top:3px;
- padding:10px 0
+	margin-top:3px;
+	padding:10px 0
 }
+
 .tooltip.right {
- margin-left:3px;
- padding:0 10px
+	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
+	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
+	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
+	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
+	bottom:0;
+	border-width:10px 10px 0;
+	border-top-color:#fff
 }
+
 .tooltip.top .tooltip-arrow {
- left:50%;
- margin-left:-10px
+	left:50%;
+	margin-left:-10px
 }
+
 .tooltip.top-left .tooltip-arrow {
- right:10px;
- margin-bottom:-10px
+	right:10px;
+	margin-bottom:-10px
 }
+
 .tooltip.top-right .tooltip-arrow {
- left:10px;
- margin-bottom:-10px
+	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
+	top:0;
+	border-width:0 10px 10px;
+	border-bottom-color:#fff
 }
+
 .tooltip.bottom .tooltip-arrow {
- left:50%;
- margin-left:-10px
+	left:50%;
+	margin-left:-10px
 }
+
 .tooltip.bottom-left .tooltip-arrow {
- right:10px;
- margin-top:-10px
+	right:10px;
+	margin-top:-10px
 }
+
 .tooltip.bottom-right .tooltip-arrow {
- left:10px;
- margin-top:-10px
+	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
+	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
+	position:absolute;
+	width:0;
+	height:0;
+	border-color:transparent;
+	border-style:solid
 }

From aa85418c68d9a051ffa68759ef2e4bfc2e7eff15 Mon Sep 17 00:00:00 2001
From: Roger Szabo <roger.szabo@web.de>
Date: Wed, 25 Apr 2018 15:54:33 +0800
Subject: [PATCH 4/4] Remove unneeded semicolon and parentheses

Signed-off-by: Roger Szabo <roger.szabo@web.de>
---
 apps/user_ldap/templates/renewpassword.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/templates/renewpassword.php b/apps/user_ldap/templates/renewpassword.php
index 7834678839..12b1d7fc04 100644
--- a/apps/user_ldap/templates/renewpassword.php
+++ b/apps/user_ldap/templates/renewpassword.php
@@ -23,7 +23,7 @@ style('user_ldap', 'renewPassword');
 				<?php p($message); ?><br>
 			</div>
 		<?php endforeach; ?>
-		<?php if (isset($_['internalexception']) && ($_['internalexception'])): ?>
+		<?php if (isset($_['internalexception']) && $_['internalexception']): ?>
 			<div class="warning">
 				<?php p($l->t('An internal error occurred.')); ?><br>
 				<small><?php p($l->t('Please try again or contact your administrator.')); ?></small>