Skip to content

Ldap password renewal fixes for NC13 #9288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 4 commits into from
May 12, 2018
Merged

Ldap password renewal fixes for NC13 #9288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15fb3bb
remove reset password link
GitHubUser4234 Apr 24, 2018
571b337
adjust css to nc13 core changes
GitHubUser4234 Apr 24, 2018
cc40917
css indent alignment
GitHubUser4234 Apr 25, 2018
aa85418
Remove unneeded semicolon and parentheses
GitHubUser4234 Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 124 additions & 5 deletions apps/user_ldap/css/renewPassword.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#personal-show + label {
left: 222px !important;
margin-top: 3px !important;
left: 236px !important;
margin-top: 17px !important;
}

#renewpassword .strengthify-wrapper {
Expand All @@ -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
}
6 changes: 1 addition & 5 deletions apps/user_ldap/templates/renewpassword.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@

<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>
Expand Down