From 34711f584651205cb6738b49df285d93a35393b5 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fguillot@users.noreply.github.com>
Date: Tue, 25 Mar 2014 21:25:54 -0400
Subject: Ask the current password before changing a user password

---
 templates/project_new.php | 2 +-
 templates/task_new.php    | 2 +-
 templates/user_edit.php   | 3 +++
 templates/user_new.php    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/project_new.php b/templates/project_new.php
index 5ce6f97d..2026d461 100644
--- a/templates/project_new.php
+++ b/templates/project_new.php
@@ -9,7 +9,7 @@
     <form method="post" action="?controller=project&amp;action=save" autocomplete="off">
 
         <?= Helper\form_label(t('Name'), 'name') ?>
-        <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
+        <?= Helper\form_text('name', $values, $errors, array('autofocus', 'required')) ?>
 
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/templates/task_new.php b/templates/task_new.php
index 4280bf80..efb9cb62 100644
--- a/templates/task_new.php
+++ b/templates/task_new.php
@@ -6,7 +6,7 @@
     <form method="post" action="?controller=task&amp;action=save" autocomplete="off">
 
         <?= Helper\form_label(t('Title'), 'title') ?>
-        <?= Helper\form_text('title', $values, $errors, array('autofocus required')) ?><br/>
+        <?= Helper\form_text('title', $values, $errors, array('autofocus', 'required')) ?><br/>
 
         <?= Helper\form_hidden('project_id', $values) ?>
 
diff --git a/templates/user_edit.php b/templates/user_edit.php
index c65f3381..0c82793d 100644
--- a/templates/user_edit.php
+++ b/templates/user_edit.php
@@ -13,6 +13,9 @@
         <?= Helper\form_label(t('Username'), 'username') ?>
         <?= Helper\form_text('username', $values, $errors, array('required')) ?><br/>
 
+        <?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?>
+        <?= Helper\form_password('current_password', $values, $errors) ?><br/>
+
         <?= Helper\form_label(t('Password'), 'password') ?>
         <?= Helper\form_password('password', $values, $errors) ?><br/>
 
diff --git a/templates/user_new.php b/templates/user_new.php
index 0c753c2a..8b15525b 100644
--- a/templates/user_new.php
+++ b/templates/user_new.php
@@ -9,7 +9,7 @@
     <form method="post" action="?controller=user&amp;action=save" autocomplete="off">
 
         <?= Helper\form_label(t('Username'), 'username') ?>
-        <?= Helper\form_text('username', $values, $errors, array('autofocus required')) ?><br/>
+        <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
 
         <?= Helper\form_label(t('Password'), 'password') ?>
         <?= Helper\form_password('password', $values, $errors, array('required')) ?><br/>
-- 
cgit v1.2.3