From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 25 Dec 2012 14:20:33 +0000 (+0400)
Subject: update user editor a bit
X-Git-Tag: 1.7.0~117
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=84391d694844d716cb5be257da7f4c9ca39c6718;p=tt-rss.git

update user editor a bit
---

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 40264660..49dd896e 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -435,8 +435,8 @@ class Pref_Users extends Handler_Protected {
 
 			print "<tr class=\"title\">
 						<td align='center' width=\"5%\">&nbsp;</td>
-						<td width=''><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td>
-						<td width='20%'><a href=\"#\" onclick=\"updateUsersList('access_level')\">".__('Access Level')."</a></td>
+						<td width='30%'><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td>
+						<td width='30%'><a href=\"#\" onclick=\"updateUsersList('access_level')\">".__('Access Level')."</a></td>
 						<td width='20%'><a href=\"#\" onclick=\"updateUsersList('created')\">".__('Registered')."</a></td>
 						<td width='20%'><a href=\"#\" onclick=\"updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
 
@@ -448,15 +448,16 @@ class Pref_Users extends Handler_Protected {
 
 				$uid = $line["id"];
 
-				print "<tr class=\"$class\" id=\"UMRR-$uid\">";
+				print "<tr id=\"UMRR-$uid\">";
 
 				$line["login"] = htmlspecialchars($line["login"]);
 
 				$line["created"] = make_local_datetime($this->link, $line["created"], false);
 				$line["last_login"] = make_local_datetime($this->link, $line["last_login"], false);
 
-				print "<td align='center'><input onclick='toggleSelectRow(this);'
-					type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
+				print "<td align='center'><input onclick='toggleSelectRow2(this);'
+					dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"
+					id=\"UMCHK-$uid\"></td>";
 
 				$onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
 
diff --git a/js/prefs.js b/js/prefs.js
index 1154b9f1..0b3f47c0 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -83,13 +83,8 @@ function addUser() {
 function editUser(id, event) {
 
 	try {
-		if (!event || !event.ctrlKey) {
-
 		notify_progress("Loading, please wait...");
 
-		selectTableRows('prefUserList', 'none');
-		selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
-
 		var query = "?op=pref-users&method=edit&id=" +
 			param_escape(id);
 
@@ -100,12 +95,6 @@ function editUser(id, event) {
 					document.forms['user_edit_form'].login.focus();
 				} });
 
-		} else if (event.ctrlKey) {
-			var cb = $('UMCHK-' + id);
-			cb.checked = !cb.checked;
-			toggleSelectRow(cb);
-		}
-
 	} catch (e) {
 		exception_error("editUser", e);
 	}
diff --git a/tt-rss.css b/tt-rss.css
index c1200bd4..720365f9 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1408,6 +1408,6 @@ ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitChec
 	margin-right : 5px;
 }
 
-table.prefPrefsList td labe/ {
+table.prefPrefsList td label, table.prefUserList td {
 	cursor : pointer;
 }