From f6f284665a7d6871c97cf804db99fffee7e989a8 Mon Sep 17 00:00:00 2001
From: Daniel Silva <daniel.silva@flipside.org>
Date: Wed, 11 Jun 2014 12:59:30 +0100
Subject: [PATCH 1/3] Fix checkbox and radio styling

---
 src/styles/aw_enketo.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/aw_enketo.scss b/src/styles/aw_enketo.scss
index 465ddea..a8bd78e 100644
--- a/src/styles/aw_enketo.scss
+++ b/src/styles/aw_enketo.scss
@@ -6218,7 +6218,7 @@ legend ~ .option-wrapper > label .active {
 }
 
 .option-wrapper input[type=radio], .option-wrapper input[type=checkbox] {
-  background: url("../../images/checkradio.png") no-repeat;
+  background: url("../libs/enketo-core/images/checkradio.png") no-repeat;
   cursor: pointer;
   -webkit-appearance: none;
   -moz-background-position-x: -9999px -9999px !important;

From 65b8b45ac15ff956f88017f4554b957e827f74f3 Mon Sep 17 00:00:00 2001
From: Daniel Silva <daniel.silva@flipside.org>
Date: Wed, 11 Jun 2014 14:38:14 +0100
Subject: [PATCH 2/3] Contribute to #118. Conditional showing of password text

---
 application/views/users/user_form.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/views/users/user_form.php b/application/views/users/user_form.php
index 1c7b5f4..9d84c16 100644
--- a/application/views/users/user_form.php
+++ b/application/views/users/user_form.php
@@ -80,7 +80,9 @@
               <?= form_label('Password <small>Required</small>', 'user_new_password'); ?>
             <?php endif; ?>
             <?= form_password('user_new_password', '', 'id="user_new_password"'); ?>
+            <?php if($action != 'add'): ?>
             <p class="help-text">If you would like to change the password type a new one. Otherwise leave this blank.</p>
+            <?php endif; ?>
             <p class="help-text">Hint: The password should be at least eight characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! &quot; ? $ % &circ; &amp; ).</p>
             <?= form_error('user_new_password'); ?>
           </div>

From 8557b97c2f6124e307e5a7b59ddfe1cea9aca703 Mon Sep 17 00:00:00 2001
From: Daniel Silva <daniel.silva@flipside.org>
Date: Wed, 11 Jun 2014 15:16:21 +0100
Subject: [PATCH 3/3] Fix #118. Keep correct state on notify and roles fields

---
 application/controllers/user.php      | 2 ++
 application/views/users/user_form.php | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/application/controllers/user.php b/application/controllers/user.php
index 0b38169..3b6dac6 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -210,6 +210,8 @@ protected function _add_account() {
     $this->form_validation->set_rules('user_new_password', 'Password', 'trim|required|min_length[8]');
     $this->form_validation->set_rules('user_roles', 'Roles', 'callback__cb_check_roles');
     $this->form_validation->set_rules('user_status', 'Status', 'callback__cb_check_status');
+    // To be picked up by the validation object needs a rule, even if empty.
+    $this->form_validation->set_rules('user_notify', 'Notify');
     
     $this->form_validation->set_error_delimiters('<small class="error">', '</small>');
     
diff --git a/application/views/users/user_form.php b/application/views/users/user_form.php
index 9d84c16..37e6c60 100644
--- a/application/views/users/user_form.php
+++ b/application/views/users/user_form.php
@@ -110,7 +110,7 @@
             <?php foreach ($this->config->item('roles') as $key => $role_name): ?>
               <?php $checked_role = isset($user) ? $user->has_role($key) : FALSE; ?>
               <label class="inline-label">
-              <?= form_checkbox('user_roles[]', $key, set_value('user_roles', $checked_role)); ?> <?= $role_name; ?>
+              <?= form_checkbox('user_roles[]', $key, set_select('user_roles', $key, $checked_role)); ?> <?= $role_name; ?>
               </label>
             <?php endforeach; ?>
             <?= form_error('user_roles'); ?>
@@ -129,7 +129,7 @@
         <fieldset class="contained">
           <div class="form-control">
             <label class="inline-label">
-            <?= form_checkbox('user_notify', 'notify'); ?> Notify user about account creation.
+            <?= form_checkbox('user_notify', 'notify', set_checkbox('user_notify', 'notify', FALSE)); ?> Notify user about account creation.
             </label>
             <p class="help-text">If checked an email will be sent to the user with the login data.</p>
           </div>
@@ -138,11 +138,6 @@
       </div>
       <?php endif; ?>
         
-        
-        
-        
-        
-        
       <?= form_button(array(
         'type' => 'submit',
         'name' => 'user_submit',