Skip to content

Commit

Permalink
Update modals.ctp
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThomasFarineau @Eywek
ThomasFarineau authored and Eywek committed May 13, 2018
1 parent 304ab3c commit c966a29
Showing 1 changed file with 10 additions and 48 deletions.
58 changes: 10 additions & 48 deletions app/View/Elements/modals.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@
<form class="form-horizontal" method="POST" data-ajax="true" action="<?= $this->Html->url(array('plugin' => null, 'admin' => false, 'controller' => 'user', 'action' => 'ajax_login')) ?>" data-redirect-url="?">

<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label"><?= $Lang->get('USER__USERNAME') ?></label>
<div class="col-sm-10">
<input type="text" class="form-control" name="pseudo" id="inputEmail3" placeholder="<?= $Lang->get('USER__USERNAME_LABEL') ?>">
</div>
</div>

<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__PASSWORD') ?></label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password" placeholder="<?= $Lang->get('USER__PASSWORD_LABEL') ?>">
</div>
</div>

<div class="form-group">
Expand All @@ -34,11 +28,10 @@
</div>
</div>

<center><a data-dismiss="modal" href="#" data-toggle="modal" data-target="#lostpasswd"><?= $Lang->get('USER__PASSWORD_FORGOT_LABEL') ?></a></center>
<div class="text-center"><a data-dismiss="modal" href="#" data-toggle="modal" data-target="#lostpasswd"><?= $Lang->get('USER__PASSWORD_FORGOT_LABEL') ?></a></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?= $Lang->get('GLOBAL__CLOSE') ?></button>
<button type="submit" class="btn btn-primary"><?= $Lang->get('USER__LOGIN') ?></button>
<button type="submit" class="btn btn-primary btn-block"><?= $Lang->get('USER__LOGIN') ?></button>
</form>
</div>
</div>
Expand All @@ -55,15 +48,11 @@
<div class="modal-body">
<form class="form-horizontal" method="POST" data-ajax="true" action="<?= $this->Html->url(array('plugin' => null, 'admin' => false, 'controller' => 'user', 'action' => 'ajax_lostpasswd')) ?>">
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__EMAIL') ?></label>
<div class="col-sm-10">
<input type="text" class="form-control" name="email" placeholder="<?= $Lang->get('USER__EMAIL_LABEL') ?>">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?= $Lang->get('GLOBAL__CLOSE') ?></button>
<button type="submit" class="btn btn-primary"><?= $Lang->get('USER__PASSWORD_FORGOT_SEND_MAIL') ?></button>
<button type="submit" class="btn btn-primary btn-block"><?= $Lang->get('USER__PASSWORD_FORGOT_SEND_MAIL') ?></button>
</form>
</div>
</div>
Expand All @@ -83,21 +72,14 @@
<input type="hidden" name="key" value="<?= $resetpsswd['key'] ?>">
<input type="hidden" name="email" value="<?= $resetpsswd['email'] ?>">
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__PASSWORD') ?></label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password" placeholder="<?= $Lang->get('USER__PASSWORD_LABEL') ?>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__PASSWORD_CONFIRM') ?></label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password2" placeholder="<?= $Lang->get('USER__PASSWORD_CONFIRM_LABEL') ?>">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?= $Lang->get('GLOBAL__CLOSE') ?></button>
<button type="submit" class="btn btn-success"><?= $Lang->get('GLOBAL__SAVE') ?></button>
<button type="submit" class="btn btn-success btn-block"><?= $Lang->get('GLOBAL__SAVE') ?></button>
</form>
</div>
</div>
Expand All @@ -115,58 +97,38 @@
<div class="modal-body">
<form class="form-horizontal" method="POST" data-ajax="true" action="<?= $this->Html->url(array('plugin' => null, 'admin' => false, 'controller' => 'user', 'action' => 'ajax_register')) ?>" data-redirect-url="?">
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__USERNAME') ?></label>
<div class="col-sm-10">
<input type="text" class="form-control" name="pseudo" placeholder="<?= $Lang->get('USER__USERNAME_LABEL') ?>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__PASSWORD') ?></label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password" placeholder="<?= $Lang->get('USER__PASSWORD_LABEL') ?>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__PASSWORD_CONFIRM') ?></label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password_confirmation" placeholder="<?= $Lang->get('USER__PASSWORD_CONFIRM_LABEL') ?>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('USER__EMAIL') ?></label>
<div class="col-sm-10">
<input type="email" class="form-control" name="email" placeholder="<?= $Lang->get('USER__EMAIL_LABEL') ?>">
</div>
</div>

<?php if($reCaptcha['type'] == "google") { ?>
<script src='https://www.google.com/recaptcha/api.js'></script>
<div class="form-group">
<label class="col-sm-2 control-label"><?= $Lang->get('FORM__CAPTCHA') ?></label>
<div class="col-sm-10">
<div class="form-group">>
<div class="g-recaptcha" data-sitekey="<?= $reCaptcha['siteKey'] ?>"></div>
</div>
</div>
<?php } else { ?>

<div class="form-group">
<label for="inputPassword3" class="col-sm-2 control-label"><?= $Lang->get('FORM__CAPTCHA') ?></label>
<div class="col-sm-10">
<?php
echo $this->Html->image(array('controller' => 'user', 'action' => 'get_captcha', 'plugin' => false, 'admin' => false), array('plugin' => false, 'admin' => false, 'id' => 'captcha_image'));
echo $this->Html->link($Lang->get('FORM__RELOAD_CAPTCHA'), 'javascript:void(0);',array('id' => 'reload'));
?>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-10">
<input type="text" class="form-control" name="captcha" id="inputPassword3" placeholder="<?= $Lang->get('FORM__CAPTCHA_LABEL') ?>">
</div>
</div>
<?php } ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?= $Lang->get('GLOBAL__CLOSE') ?></button>
<button type="submit" class="btn btn-primary"><?= $Lang->get('USER__REGISTER') ?></button>
<button type="submit" class="btn btn-primary btn-block"><?= $Lang->get('USER__REGISTER') ?></button>
</form>
</div>
</div>
Expand Down Expand Up @@ -195,8 +157,8 @@

</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" onclick="notification.markAllAsSeen()" data-dismiss="modal"><?= $Lang->get('NOTIFICATIONS__MARK_ALL_AS_SEEN') ?></button>
<button type="submit" class="btn btn-danger" onclick="notification.clearAll()" data-dismiss="modal"><?= $Lang->get('NOTIFICATIONS__CLEAR_ALL') ?></button>
<button type="button" class="btn btn-default btn-block" onclick="notification.markAllAsSeen()" data-dismiss="modal"><?= $Lang->get('NOTIFICATIONS__MARK_ALL_AS_SEEN') ?></button>
<button type="submit" class="btn btn-danger btn-block" onclick="notification.clearAll()" data-dismiss="modal"><?= $Lang->get('NOTIFICATIONS__CLEAR_ALL') ?></button>
</div>
</div>
</div>
Expand Down

0 comments on commit c966a29

Please sign in to comment.