Basic edit user routine.

resources/lang/en_US/firefly.php

@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

resources/lang/en_US/form.php

@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domain',
-    'single_user_mode'           => 'Single user mode',
-    'must_confirm_account'       => 'New users must activate account',
-    'is_demo_site'               => 'Is demo site',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domain',
+    'single_user_mode'        => 'Single user mode',
+    'must_confirm_account'    => 'New users must activate account',
+    'is_demo_site'            => 'Is demo site',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => 'Import file',
-    'configuration_file'         => 'Configuration file',
-    'import_file_type'           => 'Import file type',
-    'csv_comma'                  => 'A comma (,)',
-    'csv_semicolon'              => 'A semicolon (;)',
-    'csv_tab'                    => 'A tab (invisible)',
-    'csv_delimiter'              => 'CSV field delimiter',
-    'csv_import_account'         => 'Default import account',
-    'csv_config'                 => 'CSV import configuration',
+    'import_file'             => 'Import file',
+    'configuration_file'      => 'Configuration file',
+    'import_file_type'        => 'Import file type',
+    'csv_comma'               => 'A comma (,)',
+    'csv_semicolon'           => 'A semicolon (;)',
+    'csv_tab'                 => 'A tab (invisible)',
+    'csv_delimiter'           => 'CSV field delimiter',
+    'csv_import_account'      => 'Default import account',
+    'csv_config'              => 'CSV import configuration',
 
 
     'due_date'           => 'Due date',

resources/lang/en_US/list.php

@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Buttons',
     'icon'                  => 'Icon',
+    'id'                    => 'ID',
     'create_date'           => 'Created at',
     'update_date'           => 'Updated at',
     'balance_before'        => 'Balance before',

resources/views/admin/users/edit.twig

@@ -4,11 +4,44 @@
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 {% block content %}
+
+
+    {{ Form.model(user, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.users.update',user.id) } ) }}
+
+    <input type="hidden" name="id" value="{{ user.id }}"/>
+
     <div class="row">
-        <div class="col-lg-12">
-            <p>
-                This page is empty.
-            </p>
+        <div class="col-lg-6 col-md-6 col-sm-12">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    {{ ExpandedForm.text('email') }}
+                    {{ ExpandedForm.password('password') }}
+                    {{ ExpandedForm.password('password_confirmation') }}
+                    {{ ExpandedForm.checkbox('blocked') }}
+                    {{ ExpandedForm.select('blocked_code', codes, user.blocked_code) }}
+
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12">
+            <!-- panel for options  -->
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'options'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    {{ ExpandedForm.optionsList('update','account') }}
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn pull-right btn-success">
+                        {{ ('update_user')|_ }}
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
+    {{ Form.close|raw }}
 {% endblock %}

resources/views/form/password.twig

@@ -0,0 +1,9 @@
+<div class="{{ classes }}" id="{{ name }}_holder">
+    <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
+
+    <div class="col-sm-8">
+        {{ Form.input('password', name, value, options) }}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
+    </div>
+</div>