X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=modules%2Fpref-users.php;h=b75d5b76fb5101529cc62d4101cee2fe07a052e7;hb=8ffd20110ee28ca87ff29da193fdb63ca2e0c2ea;hp=a4531c45f196ba9c0ee40c640defe46939813492;hpb=d90c741e6faf4831262c1a43a41eb9fa7a46fdfd;p=tt-rss.git

diff --git a/modules/pref-users.php b/modules/pref-users.php
index a4531c45..b75d5b76 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -12,11 +12,14 @@
 
 		if ($subop == "user-details") {
 
+			header("Content-Type: text/xml");
+			print "<dlg id=\"$subop\">";
+
 			$uid = sprintf("%d", $_REQUEST["id"]);
 
-			print "<div id=\"infoBoxTitle\">".__('User details')."</div>";
+			print "<title>".__('User details')."</title>";
 
-			print "<div class='infoBoxContents'>";
+			print "<content><![CDATA[";
 
 			$result = db_query($link, "SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
@@ -96,18 +99,20 @@
 				<button onclick=\"closeInfoBox()\">".__("Close this window").
 				"</button></div>";
 
-			print "</div>";
+			print "]]></content></dlg>";
 
 			return;
 		}
 
 		if ($subop == "edit") {
 
+			header("Content-Type: text/xml");
+
 			$id = db_escape_string($_REQUEST["id"]);
 
-			print "<div id=\"infoBoxTitle\">".__('User Editor')."</div>";
-			
-			print "<div class=\"infoBoxContents\">";
+			print "<dlg id=\"$subop\">";
+			print "<title>".__('User Editor')."</title>";
+			print "<content><![CDATA[";
 
 			print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
@@ -180,7 +185,7 @@
 				<button onclick=\"return userEditCancel()\">".
 					__('Cancel')."</button></div>";
 
-			print "</div>";
+			print "]]></content></dlg>";
 
 			return;
 		}
@@ -198,7 +203,7 @@
 				if ($password) {
 					$pwd_hash = encrypt_password($password, $login);
 					$pass_query_part = "pwd_hash = '$pwd_hash', ";					
-					print_notice(T_sprintf('Changed password of user <b>%s</b>.', $login));
+					$status_msg = format_notice(T_sprintf('Changed password of user <b>%s</b>.', $login));
 				} else {
 					$pass_query_part = "";
 				}
@@ -246,18 +251,18 @@
 	
 						$new_uid = db_fetch_result($result, 0, "id");
 	
-						print_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>", 
+						$status_msg = format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>", 
 							$login, $tmp_user_pwd));
 	
 						initialize_user($link, $new_uid);
 	
 					} else {
 					
-						print_warning(T_sprintf("Could not create user <b>%s</b>", $login));
+						$status_msg = format_warning(T_sprintf("Could not create user <b>%s</b>", $login));
 	
 					}
 				} else {
-					print_warning(T_sprintf("User <b>%s</b> already exists.", $login));
+					$status_msg = format_warning(T_sprintf("User <b>%s</b> already exists.", $login));
 				}
 			} 
 		} else if ($subop == "resetPass") {
@@ -277,11 +282,11 @@
 				db_query($link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash'
 					WHERE id = '$uid'");
 
-				print_notice(T_sprintf("Changed password of user <b>%s</b>
+				$status_msg = format_notice(T_sprintf("Changed password of user <b>%s</b>
 					 to <b>%s</b>", $login, $tmp_user_pwd));
 
 				if ($email) {
-					print_notice(T_sprintf("Notifying <b>%s</b>.", $email));
+					$status_msg += format_notice(T_sprintf("Notifying <b>%s</b>.", $email));
 
 					require_once "lib/MiniTemplator.class.php";
 
@@ -342,7 +347,10 @@
 			}
 		}
 
-		set_pref($link, "_PREFS_ACTIVE_TAB", "userConfig");
+		print "<div id=\"pref-user-wrap\" dojoType=\"dijit.layout.BorderContainer\" gutters=\"false\">";
+		print "<div id=\"pref-user-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
+
+		print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
 
 		$user_search = db_escape_string($_REQUEST["search"]);
 
@@ -352,12 +360,12 @@
 			$user_search = $_SESSION["prefs_user_search"];
 		}
 
-		print "<div style='float : right'>
-			<input id=\"user_search\" size=\"20\" type=\"search\"
+		print "<div style='float : right; padding-right : 4px;'>
+			<input dojoType=\"dijit.form.TextBox\" id=\"user_search\" size=\"20\" type=\"search\"
 				onfocus=\"javascript:disableHotkeys();\" 
 				onblur=\"javascript:enableHotkeys();\"
 				onchange=\"javascript:updateUsersList()\" value=\"$user_search\">
-			<button onclick=\"javascript:updateUsersList()\">".
+			<button dojoType=\"dijit.form.Button\" onclick=\"javascript:updateUsersList()\">".
 				__('Search')."</button>
 			</div>";
 
@@ -367,19 +375,31 @@
 			$sort = "login";
 		}
 
-		print "<button onclick=\"javascript:addUser()\">".__('Create user')."</button>";
+		print "<div dojoType=\"dijit.form.DropDownButton\">".
+				"<span>" . __('Select')."</span>";
+		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		print "<div onclick=\"selectTableRows('prefUserList', 'all')\" 
+			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+		print "<div onclick=\"selectTableRows('prefUserList', 'none')\" 
+			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+		print "</div></div>";
 
-		print "
-			<button onclick=\"javascript:selectedUserDetails()\">".
-			__('Details')."</button>
-			<button onclick=\"javascript:editSelectedUser()\">".
-			__('Edit')."</button>
-			<button onclick=\"javascript:removeSelectedUsers()\">".
-			__('Remove')."</button>
-			<button onclick=\"javascript:resetSelectedUserPass()\">".
-			__('Reset password')."</button>";
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"javascript:addUser()\">".__('Create user')."</button>";
 
-		print "</div>";
+		print "
+			<button dojoType=\"dijit.form.Button\" onclick=\"javascript:selectedUserDetails()\">".
+			__('Details')."</button dojoType=\"dijit.form.Button\">
+			<button dojoType=\"dijit.form.Button\" onclick=\"javascript:editSelectedUser()\">".
+			__('Edit')."</button dojoType=\"dijit.form.Button\">
+			<button dojoType=\"dijit.form.Button\" onclick=\"javascript:removeSelectedUsers()\">".
+			__('Remove')."</button dojoType=\"dijit.form.Button\">
+			<button dojoType=\"dijit.form.Button\" onclick=\"javascript:resetSelectedUserPass()\">".
+			__('Reset password')."</button dojoType=\"dijit.form.Button\">";
+
+		print "</div>"; #toolbar
+		print "</div>"; #pane
+		print "<div id=\"pref-user-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">";
+		print "<p>$status_msg";
 
 		if ($user_search) {
 
@@ -410,23 +430,15 @@
 
 		if (db_num_rows($result) > 0) {
 
-//		print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
-
 		print "<p><table width=\"100%\" cellspacing=\"0\" 
 			class=\"prefUserList\" id=\"prefUserList\">";
 
-		print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				".__('Select:')." 
-					<a href=\"javascript:selectPrefRows('user', true)\">".__('All')."</a>,
-					<a href=\"javascript:selectPrefRows('user', false)\">".__('None')."</a>
-				</td</tr>";
-
 		print "<tr class=\"title\">
 					<td align='center' width=\"5%\">&nbsp;</td>
-					<td width=''><a href=\"javascript:updateUsersList('login')\">".__('Login')."</a></td>
-					<td width='20%'><a href=\"javascript:updateUsersList('access_level')\">".__('Access Level')."</a></td>
-					<td width='20%'><a href=\"javascript:updateUsersList('created')\">".__('Registered')."</a></td>
-					<td width='20%'><a href=\"javascript:updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
+					<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='20%'><a href=\"#\" onclick=\"updateUsersList('created')\">".__('Registered')."</a></td>
+					<td width='20%'><a href=\"#\" onclick=\"updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
 		
 		$lnum = 0;
 		
@@ -438,7 +450,7 @@
 			$edit_uid = $_REQUEST["id"];
 
 			if ($subop == "edit" && $uid != $edit_uid) {
-				$class .= "Grayed";
+				$class .= " Grayed";
 				$this_row_id = "";
 			} else {
 				$this_row_id = "id=\"UMRR-$uid\"";
@@ -451,10 +463,10 @@
 			$line["created"] = make_local_datetime($link, $line["created"], false);
 			$line["last_login"] = make_local_datetime($link, $line["last_login"], false);
 
-			print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"user\");' 
+			print "<td align='center'><input onclick='toggleSelectRow(this);' 
 				type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
 
-			$onclick = "onclick='editUser($uid)' title='".__('Click to edit')."'";
+			$onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
 
 			print "<td $onclick>" . $line["login"] . "</td>";		
 
@@ -482,5 +494,8 @@
 
 		}
 
+		print "</div>"; #pane
+		print "</div>"; #container
+
 	}
 ?>