-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from schuer/schuer-pr-1
Diverse Anpassungen
- Loading branch information
Showing
7 changed files
with
153 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,5 @@ | ||
.be_password_submit_link { | ||
float: left; | ||
.be_password_cancel { | ||
float: left !important; | ||
padding-left: 0; | ||
padding-right: 0; | ||
} | ||
.be_password_submit_link a { | ||
display: inline-block; | ||
padding: 7px 0 7px 6px; | ||
font-size: 14px; | ||
line-height: 1.428571429; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
package: be_password | ||
version: '0.4.0' | ||
author: 'Adrian Kühnis' | ||
author: 'Friends Of REDAXO' | ||
|
||
requires: | ||
redaxo: ^5.1.0 | ||
packages: | ||
phpmailer: ^2 | ||
page: | ||
title: 'Passwort-Reset Mail' | ||
perm: be_password[] | ||
perm: admin |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,73 @@ | ||
<form class="has-handler" | ||
method="POST" | ||
data-handler="submit:BePassHandler:showForm" | ||
> | ||
<section class="rex-page-section"> | ||
<div class="panel panel-default"> | ||
<header class="panel-heading"><div class="panel-title">Passwort vergessen</div></header> | ||
<div class="panel-body"> | ||
<?php if ('' != $error): ?> | ||
<div class="alert alert-danger"><?php echo $error; ?></div> | ||
<?php elseif ('' != $success): ?> | ||
<div class="alert alert-success"><?php echo $success; ?></div> | ||
<?php else: ?> | ||
<div class="form-group"> | ||
<label for="be_password_email_input">E-Mail-Adresse</label> | ||
<input class="form-control" id="be_password_email_input" type="email" name="email" required/> | ||
</div> | ||
<?php endif; ?> | ||
</div> | ||
<footer class="panel-footer"> | ||
<div class="rex-form-panel-footer"> | ||
<div class="btn-toolbar"> | ||
<?php if ('' != $error): ?> | ||
<a class="btn btn-primary" href="">Weiter</a> | ||
<?php elseif ('' != $success): ?> | ||
<a class="btn btn-primary" href="">Weiter</a> | ||
<?php else: ?> | ||
<div class="be_password_submit_link"><a class="" href="">Abbrechen</a></div> | ||
<button type="submit" class="btn btn-primary">Senden</button> | ||
<?php endif; ?> | ||
</div> | ||
</div> | ||
</footer> | ||
</div> | ||
</section> | ||
</form> | ||
<?php | ||
if ($success != '') { | ||
echo '<div class="rex-js-login-message">' . rex_view::success($success) . "</div>"; | ||
} | ||
|
||
if ($error != '') { | ||
echo '<div class="rex-js-login-message">' . rex_view::error($error) . "</div>"; | ||
} | ||
|
||
if ($success == '') { | ||
|
||
$email = rex_request('email', 'string'); | ||
|
||
$content = ''; | ||
$content .= '<fieldset>'; | ||
|
||
$formElements = []; | ||
|
||
$inputGroups = []; | ||
$n = []; | ||
$n['field'] = '<input class="form-control" type="email" value="' . htmlspecialchars($email) . '" id="be_password_email_input" name="email" />'; | ||
$n['left'] = '<i class="rex-icon rex-icon-envelope"></i>'; | ||
$inputGroups[] = $n; | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('elements', $inputGroups, false); | ||
$inputGroup = $fragment->parse('core/form/input_group.php'); | ||
|
||
$n = []; | ||
$n['label'] = '<label for="be_password_email_input">E-Mailadresse:</label>'; | ||
$n['field'] = $inputGroup; | ||
$n['class'] = 'rex-form-group-vertical'; | ||
$formElements[] = $n; | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('elements', $formElements, false); | ||
$content .= $fragment->parse('core/form/form.php'); | ||
|
||
$content .= '</fieldset>'; | ||
|
||
$formElements = []; | ||
$n = []; | ||
$n['field'] = '<button class="btn btn-primary" type="submit">Senden</button>'; | ||
$formElements[] = $n; | ||
|
||
$n = []; | ||
$n['field'] = '<a class="btn btn-link be_password_cancel" href="' . rex_url::currentBackendPage() . '">Abbrechen</a>'; | ||
$formElements[] = $n; | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('elements', $formElements, false); | ||
$buttons = $fragment->parse('core/form/submit.php'); | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('title', 'Passwort zurücksetzen', false); | ||
$fragment->setVar('body', $content, false); | ||
$fragment->setVar('buttons', $buttons, false); | ||
$content = $fragment->parse('core/page/section.php'); | ||
|
||
$content = ' | ||
<form class="has-handler" data-handler="submit:BePassHandler:showForm" method="post"> | ||
' . $content . ' | ||
</form> | ||
<script> | ||
(function() { | ||
var inputField = $("#be_password_email_input"); | ||
var initialValue = inputField.val(); | ||
inputField.val("").val(initialValue).focus(); // focus with trailing caret | ||
}()); | ||
</script>'; | ||
|
||
echo $content; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1 @@ | ||
<div id="be_password_forgotten" class="be_password_submit_link"> | ||
<a | ||
href="" | ||
class="has-handler" | ||
data-handler="click:BePassHandler:showForm" | ||
>Passwort vergessen?</a> | ||
</div> | ||
|
||
<a id="be_password_forgotten" class="btn btn-link has-handler be_password_cancel" data-handler="click:BePassHandler:showForm">Passwort vergessen?</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,71 @@ | ||
<form class="has-handler" | ||
method="POST" | ||
data-handler="submit:BePassHandler:showReset" | ||
data-token="<?php echo $token; ?>" | ||
> | ||
<section class="rex-page-section"> | ||
<div class="panel panel-default"> | ||
<header class="panel-heading"> | ||
<div class="panel-title">Neues Passwort eingeben</div> | ||
</header> | ||
<div class="panel-body"> | ||
<?php if ('' != $error): ?> | ||
<div class="alert alert-danger"><?php echo $error; ?></div> | ||
<?php elseif ('' != $success): ?> | ||
<div class="alert alert-success"><?php echo $success; ?></div> | ||
<?php else: ?> | ||
<div class="form-group"> | ||
<label for="be_password_password_input">Neues Passwort</label> | ||
<input id="be_password_password_input" type="password" name="password" class="form-control" required/> | ||
</div> | ||
<?php endif; ?> | ||
</div> | ||
<footer class="panel-footer"> | ||
<div class="rex-form-panel-footer"> | ||
<div class="btn-toolbar"> | ||
<?php if ('' != $error): ?> | ||
<?php elseif ('' != $success): ?> | ||
<a class="btn btn-primary" href="index.php">Weiter</a> | ||
<?php else: ?> | ||
<div class="be_password_submit_link"> | ||
<a class="" href="">Abbrechen</a> | ||
</div> | ||
<button type="submit" class="btn btn-primary">Senden</button> | ||
<?php endif; ?> | ||
</div> | ||
</div> | ||
</footer> | ||
</div> | ||
</section> | ||
</form> | ||
<?php | ||
if ($success != '') { | ||
echo '<div class="rex-js-login-message">' . rex_view::success($success) . "</div>"; | ||
} | ||
|
||
if ($error != '') { | ||
echo '<div class="rex-js-login-message">' . rex_view::error($error) . "</div>"; | ||
} | ||
|
||
if ($success == '' && $error == '') { | ||
|
||
$email = rex_request('email', 'string'); | ||
|
||
$content = ''; | ||
$content .= '<fieldset>'; | ||
|
||
$formElements = []; | ||
|
||
$inputGroups = []; | ||
$n = []; | ||
$n['field'] = '<input class="form-control" type="password" value="' . htmlspecialchars($email) . '" id="be_password_password_input" name="password" />'; | ||
$n['left'] = '<i class="rex-icon rex-icon-password"></i>'; | ||
$inputGroups[] = $n; | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('elements', $inputGroups, false); | ||
$inputGroup = $fragment->parse('core/form/input_group.php'); | ||
|
||
$n = []; | ||
$n['label'] = '<label for="be_password_password_input">Passwort:</label>'; | ||
$n['field'] = $inputGroup; | ||
$n['class'] = 'rex-form-group-vertical'; | ||
$formElements[] = $n; | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('elements', $formElements, false); | ||
$content .= $fragment->parse('core/form/form.php'); | ||
|
||
$content .= '</fieldset>'; | ||
|
||
$formElements = []; | ||
$n = []; | ||
$n['field'] = '<button class="btn btn-primary" type="submit">Senden</button>'; | ||
$formElements[] = $n; | ||
|
||
$n = []; | ||
$n['field'] = '<a class="btn btn-link be_password_cancel" href="' . rex_url::currentBackendPage() . '">Abbrechen</a>'; | ||
$formElements[] = $n; | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('elements', $formElements, false); | ||
$buttons = $fragment->parse('core/form/submit.php'); | ||
|
||
$fragment = new rex_fragment(); | ||
$fragment->setVar('title', 'Neues Passwort festlegen', false); | ||
$fragment->setVar('body', $content, false); | ||
$fragment->setVar('buttons', $buttons, false); | ||
$content = $fragment->parse('core/page/section.php'); | ||
|
||
$content = ' | ||
<form class="has-handler" data-handler="submit:BePassHandler:showReset" data-token="' . $token . '" method="post"> | ||
' . $content . ' | ||
</form> | ||
<script> | ||
(function() { | ||
$("#be_password_password_input").focus(); | ||
}()); | ||
</script>'; | ||
|
||
echo $content; | ||
} |