From c7c54d93618d456ce6e53ee35b4280097cc3f54c Mon Sep 17 00:00:00 2001
From: Stephane V <stephane@vergeylen.eu>
Date: Wed, 16 Jul 2014 22:23:15 +0200
Subject: [PATCH] Adds 2 checkboxes at the top of userlist in the settings, to
 display/hide optional columns This fixes #9367.

---
 settings/css/settings.css                    |  2 ++
 settings/js/users/users.js                   | 23 ++++++++++++++++++++
 settings/templates/users/part.createuser.php | 13 ++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index b9ce79bc3b8..204d69945d4 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -92,6 +92,8 @@ td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidde
 td.password, td.quota, td.displayName { width:12em; cursor:pointer; }
 td.password>span, td.quota>span, rd.displayName>span { margin-right: 1.2em; color: #C7C7C7; }
 span.usersLastLoginTooltip { white-space: nowrap; }
+th#headerLastLogin, td.lastLogin { display : none; }
+th#headerStorageLocation, td.storageLocation { display : none; }
 
 td.remove { width:1em; padding-right:1em; }
 tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; }
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 0f72746ee83..86ed43d958e 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -707,4 +707,27 @@ $(document).ready(function () {
 		);
 	});
 
+	// Option to display/hide the "Storage location" column
+	$('#CheckboxStorageLocation').click(function() {
+		if ($('#CheckboxStorageLocation').is(':checked')) {
+			$("#headerStorageLocation").show();
+			$("#userlist td.storageLocation").show();
+		} else {
+			$("#headerStorageLocation").hide();
+			$("#userlist td.storageLocation").hide();
+		}
+	});
+	// Option to display/hide the "Last Login" column
+	$('#CheckboxLastLogin').click(function() {
+		if ($('#CheckboxLastLogin').is(':checked')) {
+			$("#headerLastLogin").show();
+			$("#userlist td.lastLogin").show();
+		} else {
+			$("#headerLastLogin").hide();
+			$("#userlist td.lastLogin").hide();
+		}
+	});
+
+
+
 });
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 3dfd27ee52d..70e5a237610 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -28,7 +28,18 @@
 		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
 	</div>
 	<?php endif; ?>
+	
+	<form id="userlistoptions">
+		<?php p($l->t('Display')) ?> : 
+		<label><input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
+			<?php p($l->t('Location')) ?>
+		</label>
+		<label><input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
+			<?php p($l->t('Last login')) ?>
+		</label>
+	</form>
+	
 	<form autocomplete="off" id="usersearchform">
 		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
 	</form>
-</div>
\ No newline at end of file
+</div>