From a22b8f3dc73555800caf55768f04a7a2ce4af7f2 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 11 Mar 2017 15:24:34 -0500
Subject: Make user actions available from contextual menu

---
 app/Template/user_credential/authentication.php | 8 ++------
 app/Template/user_credential/password.php       | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'app/Template/user_credential')

diff --git a/app/Template/user_credential/authentication.php b/app/Template/user_credential/authentication.php
index 98c0d758..32371bd8 100644
--- a/app/Template/user_credential/authentication.php
+++ b/app/Template/user_credential/authentication.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Edit Authentication') ?></h2>
+    <h2><?= t('Authentication Parameters') ?></h2>
 </div>
 <form method="post" action="<?= $this->url->href('UserCredentialController', 'saveAuthentication', array('user_id' => $user['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
@@ -14,11 +14,7 @@
         <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
     </fieldset>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
-    </div>
+    <?= $this->modal->submitButtons() ?>
 
     <div class="alert alert-info">
         <ul>
diff --git a/app/Template/user_credential/password.php b/app/Template/user_credential/password.php
index bd7a47da..a71ba825 100644
--- a/app/Template/user_credential/password.php
+++ b/app/Template/user_credential/password.php
@@ -8,7 +8,7 @@
 
     <fieldset>
         <?= $this->form->label(t('Current password for the user "%s"', $this->user->getFullname()), 'current_password') ?>
-        <?= $this->form->password('current_password', $values, $errors) ?>
+        <?= $this->form->password('current_password', $values, $errors, array('autofocus')) ?>
 
         <?= $this->form->label(t('New password for the user "%s"', $this->user->getFullname($user)), 'password') ?>
         <?= $this->form->password('password', $values, $errors) ?>
@@ -17,9 +17,5 @@
         <?= $this->form->password('confirmation', $values, $errors) ?>
     </fieldset>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
-    </div>
+    <?= $this->modal->submitButtons() ?>
 </form>
-- 
cgit v1.2.3