diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/pref-feeds.php | 10 | ||||
-rw-r--r-- | modules/pref-filters.php | 9 | ||||
-rw-r--r-- | modules/pref-labels.php | 17 | ||||
-rw-r--r-- | modules/pref-prefs.php | 2 | ||||
-rw-r--r-- | modules/pref-users.php | 51 |
5 files changed, 50 insertions, 39 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 783dd34a1..c071ad38f 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -992,19 +992,13 @@ </div>"; */ print "<div dojoType=\"dijit.form.DropDownButton\">". - "<span>" . __('Select')."</span>"; - + "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; - print "</div>"; - - /* print "<div onclick=\"selectTableRows('prefFeedList', 'all')\">".__('All')."</div>, - <div href=\"#\" onclick=\"selectTableRows('prefFeedList', 'none')\">".__('None')."</div>"; */ - - print "</div>"; + print "</div></div>"; print "<button dojoType=\"dijit.form.Button\" onclick=\"quickAddFeed()\">" .__('Subscribe to feed')."</button dojoType=\"dijit.form.Button\"> "; diff --git a/modules/pref-filters.php b/modules/pref-filters.php index d21f35335..153707f6f 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -306,6 +306,15 @@ <button dojoType=\"dijit.form.Button\" onclick=\"javascript:updateFilterList()\">".__('Search')."</button> </div>"; + print "<div dojoType=\"dijit.form.DropDownButton\">". + "<span>" . __('Select')."</span>"; + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; + print "<div onclick=\"selectTableRows('prefFilterList', 'all')\" + dojoType=\"dijit.MenuItem\">".__('All')."</div>"; + print "<div onclick=\"selectTableRows('prefFilterList', 'none')\" + dojoType=\"dijit.MenuItem\">".__('None')."</div>"; + print "</div></div>"; + print "<button dojoType=\"dijit.form.Button\" onclick=\"return quickAddFilter()\">". __('Create filter')."</button dojoType=\"dijit.form.Button\"> "; diff --git a/modules/pref-labels.php b/modules/pref-labels.php index c794e023e..cc92985a9 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -115,7 +115,7 @@ if (label_create($link, $caption)) { if (!$output) { - //print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption)); + print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption)); } } @@ -163,6 +163,15 @@ <button dojoType=\"dijit.form.Button\" onclick=\"javascript:updateLabelList()\">".__('Search')."</button> </div>"; + print "<div dojoType=\"dijit.form.DropDownButton\">". + "<span>" . __('Select')."</span>"; + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; + print "<div onclick=\"selectTableRows('prefLabelList', 'all')\" + dojoType=\"dijit.MenuItem\">".__('All')."</div>"; + print "<div onclick=\"selectTableRows('prefLabelList', 'none')\" + dojoType=\"dijit.MenuItem\">".__('None')."</div>"; + print "</div></div>"; + print"<button dojoType=\"dijit.form.Button\" onclick=\"return addLabel()\">". __('Create label')."</button dojoType=\"dijit.form.Button\"> "; @@ -209,12 +218,6 @@ print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefLabelList\" id=\"prefLabelList\">"; - print "<tr><td class=\"selectPrompt\" colspan=\"8\"> - ".__('Select:')." - <a href=\"#\" onclick=\"selectTableRows('prefLabelList', 'all')\">".__('All')."</a>, - <a href=\"#\" onclick=\"selectTableRows('prefLabelList', 'none')\">".__('None')."</a> - </td</tr>"; - $lnum = 0; while ($line = db_fetch_assoc($result)) { diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index 18a336396..d8a1cb139 100644 --- a/modules/pref-prefs.php +++ b/modules/pref-prefs.php @@ -346,7 +346,7 @@ $themes = get_all_themes(); print "<td><select name=\"_THEME_ID\">"; - print "<option value=''>".__('Default')."</option>"; + print "<option value='Default'>".__('Default')."</option>"; print "<option disabled>--------</option>"; foreach ($themes as $t) { diff --git a/modules/pref-users.php b/modules/pref-users.php index a97bd3108..9c903907f 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -203,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 = ""; } @@ -251,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") { @@ -282,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"; @@ -349,6 +349,7 @@ 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\">"; set_pref($link, "_PREFS_ACTIVE_TAB", "userConfig"); @@ -362,11 +363,11 @@ } print "<div style='float : right; padding-right : 4px;'> - <input id=\"user_search\" size=\"20\" type=\"search\" + <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>"; @@ -376,21 +377,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 dojoType=\"dijit.form.Button\" onclick=\"javascript:addUser()\">".__('Create user')."</button>"; 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>"; + <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) { @@ -424,12 +435,6 @@ print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefUserList\" id=\"prefUserList\">"; - print "<tr><td class=\"selectPrompt\" colspan=\"8\"> - ".__('Select:')." - <a href=\"#\" onclick=\"selectTableRows('prefUserList', 'all')\">".__('All')."</a>, - <a href=\"#\" onclick=\"selectTableRows('prefUserList', 'none')\">".__('None')."</a> - </td</tr>"; - print "<tr class=\"title\"> <td align='center' width=\"5%\"> </td> <td width=''><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td> |