diff options
Diffstat (limited to 'classes/pref')
| -rwxr-xr-x | classes/pref/feeds.php | 40 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 27 | ||||
| -rw-r--r-- | classes/pref/labels.php | 39 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 89 | ||||
| -rw-r--r-- | classes/pref/system.php | 3 | ||||
| -rw-r--r-- | classes/pref/users.php | 11 |
6 files changed, 104 insertions, 105 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index d29cf70f5..71379a12b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -542,9 +542,8 @@ class Pref_Feeds extends Handler_Protected { $last_error = $row["last_error"]; if ($last_error) { - print " <img src=\"images/error.png\" alt=\"(error)\" - style=\"vertical-align : middle\" - title=\"".htmlspecialchars($last_error)."\">"; + print " <i class=\"material-icons\" + title=\"".htmlspecialchars($last_error)."\">error</i>"; } @@ -1133,8 +1132,9 @@ class Pref_Feeds extends Handler_Protected { function index() { - print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">"; - print "<div id=\"pref-feeds-feeds\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds')."\">"; + print "<div dojoType='dijit.layout.AccordionContainer' region='center'>"; + print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane' + title=\"<i class='material-icons'>rss_feed</i> ".__('Feeds')."\">"; $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?"); @@ -1222,7 +1222,7 @@ class Pref_Feeds extends Handler_Protected { print "</div>"; # toolbar //print '</div>'; - print '<div dojoType="dijit.layout.ContentPane" region="center">'; + print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">'; print "<div id=\"feedlistLoading\"> <img src='images/indicator_tiny.gif'>". @@ -1268,7 +1268,8 @@ class Pref_Feeds extends Handler_Protected { print "</div>"; # feeds pane - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>import_export</i> ".__('OPML')."\">"; print __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . __("Only main settings profile can be migrated using OPML."); @@ -1323,7 +1324,8 @@ class Pref_Feeds extends Handler_Protected { print "</div>"; # pane - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">"; print __('Published articles can be subscribed by anyone who knows the following URL:'); @@ -1421,16 +1423,15 @@ class Pref_Feeds extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"Tables.select('prefInactiveFeedList', true)\" + print "<div onclick=\"Tables.select('inactive-feeds-list', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"Tables.select('prefInactiveFeedList', false)\" + print "<div onclick=\"Tables.select('inactive-feeds-list', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; print "</div>"; #toolbar - print "<div class=\"inactiveFeedHolder\">"; - - print "<table width=\"100%\" cellspacing=\"0\" id=\"prefInactiveFeedList\">"; + print "<div class='panel panel-scrollable'>"; + print "<table width='100%' id='inactive-feeds-list'>"; $lnum = 1; @@ -1438,7 +1439,7 @@ class Pref_Feeds extends Handler_Protected { $feed_id = $line["id"]; - print "<tr class=\"placeholder\" data-row-id='$feed_id'>"; + print "<tr data-row-id='$feed_id'>"; print "<td width='5%' align='center'><input onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\" @@ -1483,16 +1484,15 @@ class Pref_Feeds extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"Tables.select('prefErrorFeedList', true)\" + print "<div onclick=\"Tables.select('error-feeds-list', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"Tables.select('prefErrorFeedList', false)\" + print "<div onclick=\"Tables.select('error-feeds-list', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; print "</div>"; #toolbar - print "<div class=\"inactiveFeedHolder\">"; - - print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">"; + print "<div class='panel panel-scrollable'>"; + print "<table width='100%' id='error-feeds-list'>"; $lnum = 1; @@ -1500,7 +1500,7 @@ class Pref_Feeds extends Handler_Protected { $feed_id = $line["id"]; - print "<tr class=\"placeholder\" data-row-id='$feed_id'>"; + print "<tr data-row-id='$feed_id'>"; print "<td width='5%' align='center'><input onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\" diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 0bb1493e5..ec980d5f9 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -199,8 +199,8 @@ class Pref_Filters extends Handler_Protected { print "<div><img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'> <span id='prefFilterProgressMsg'>Looking for articles...</span></div>"; - print "<br/><div class=\"filterTestHolder\">"; - print "<table width=\"100%\" cellspacing=\"0\" id=\"prefFilterTestResultList\">"; + print "<br/><div class='panel panel-scrollable'>"; + print "<table width='100%' id='prefFilterTestResultList'>"; print "</table></div>"; print "<div style='text-align : center'>"; @@ -320,10 +320,10 @@ class Pref_Filters extends Handler_Protected { $label_sth->execute([$line['action_param'], $_SESSION['uid']]); if ($label_row = $label_sth->fetch()) { - $fg_color = $label_row["fg_color"]; + //$fg_color = $label_row["fg_color"]; $bg_color = $label_row["bg_color"]; - $name[1] = "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-right : 4px'>α</span>" . $name[1]; + $name[1] = "<i class=\"material-icons\" style='color : $bg_color; margin-right : 4px'>label</i>" . $name[1]; } } @@ -333,6 +333,7 @@ class Pref_Filters extends Handler_Protected { $filter['name'] = $name[0]; $filter['param'] = $name[1]; $filter['checkbox'] = false; + $filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null; $filter['enabled'] = $line["enabled"]; $filter['rules'] = $this->getfilterrules_concise($line['id']); @@ -518,7 +519,7 @@ class Pref_Filters extends Handler_Protected { __('Remove')."</button>"; print "</div>"; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">". + print "<button dojoType=\"dijit.form.Button\" class=\"alt-info\" onclick=\"return dijit.byId('filterEditDlg').test()\">". __('Test')."</button> "; print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". @@ -771,9 +772,9 @@ class Pref_Filters extends Handler_Protected { $filter_search = $_SESSION["prefs_filter_search"]; } - print "<div id=\"pref-filter-wrap\" dojoType=\"dijit.layout.BorderContainer\" gutters=\"false\">"; - print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">"; - print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">"; + print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; + print "<div dojoType='dijit.Toolbar'>"; if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_filter_search"] = $filter_search; @@ -815,9 +816,9 @@ class Pref_Filters extends Handler_Protected { print "</div>"; # toolbar print "</div>"; # toolbar-frame - print "<div id=\"pref-filter-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>"; - print "<div id=\"filterlistLoading\"> + print "<div id='filterlistLoading'> <img src='images/indicator_tiny.gif'>". __("Loading, please wait...")."</div>"; @@ -857,7 +858,7 @@ class Pref_Filters extends Handler_Protected { function newfilter() { - print "<form name='filter_new_form' id='filter_new_form'>"; + print "<form name='filter_new_form' id='filter_new_form' onsubmit='return false'>"; print_hidden("op", "pref-filters"); print_hidden("method", "add"); @@ -935,10 +936,10 @@ class Pref_Filters extends Handler_Protected { print "<div class=\"dlgButtons\">"; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">". + print "<button dojoType=\"dijit.form.Button\" class=\"alt-info\" onclick=\"return dijit.byId('filterEditDlg').test()\">". __('Test')."</button> "; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". + print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". __('Create')."</button> "; print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">". diff --git a/classes/pref/labels.php b/classes/pref/labels.php index 1e297818c..a58e33ac9 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -29,12 +29,9 @@ class Pref_Labels extends Handler_Protected { $fg_color = $line['fg_color']; $bg_color = $line['bg_color']; - print "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-bottom : 4px; margin-right : 4px'>α</span>"; - - print "<input style=\"font-size : 16px\" name=\"caption\" - dojoType=\"dijit.form.ValidationTextBox\" - required=\"true\" - value=\"".htmlspecialchars($line['caption'])."\">"; + print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear' + id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox' + required='true' value=\"".htmlspecialchars($line['caption'])."\">"; print "</div>"; print "<div class=\"dlgSec\">" . __("Colors") . "</div>"; @@ -56,8 +53,8 @@ class Pref_Labels extends Handler_Protected { print "<div dojoType=\"dijit.ColorPalette\"> <script type=\"dojo/method\" event=\"onChange\" args=\"fg_color\"> - dijit.byId(\"labelEdit_fgColor\").attr('value', fg_color); - $('label-editor-indicator').setStyle({color: fg_color}); + dijit.byId('labelEdit_fgColor').attr('value', fg_color); + dijit.byId('labelEdit_caption').domNode.setStyle({color: fg_color}); </script> </div>"; print "</div>"; @@ -66,8 +63,8 @@ class Pref_Labels extends Handler_Protected { print "<div dojoType=\"dijit.ColorPalette\"> <script type=\"dojo/method\" event=\"onChange\" args=\"bg_color\"> - dijit.byId(\"labelEdit_bgColor\").attr('value', bg_color); - $('label-editor-indicator').setStyle({backgroundColor: bg_color}); + dijit.byId('labelEdit_bgColor').attr('value', bg_color); + dijit.byId('labelEdit_caption').domNode.setStyle({backgroundColor: bg_color}); </script> </div>"; print "</div>"; @@ -147,13 +144,11 @@ class Pref_Labels extends Handler_Protected { $sth->execute([$fg, $bg, $id, $_SESSION['uid']]); } - $caption = Labels::find_caption($id, $_SESSION["uid"]); - /* Remove cached data */ $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' - WHERE label_cache LIKE ? AND owner_uid = ?"); - $sth->execute(["%$caption%", $_SESSION['uid']]); + WHERE owner_uid = ?"); + $sth->execute([$_SESSION['uid']]); } } @@ -166,13 +161,11 @@ class Pref_Labels extends Handler_Protected { AND owner_uid = ?"); $sth->execute([$id, $_SESSION['uid']]); - $caption = Labels::find_caption($id, $_SESSION["uid"]); - /* Remove cached data */ $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = '' - WHERE label_cache LIKE ? AND owner_uid = ?"); - $sth->execute(["%$caption%", $_SESSION['uid']]); + WHERE owner_uid = ?"); + $sth->execute([$_SESSION['uid']]); } } @@ -262,11 +255,11 @@ class Pref_Labels extends Handler_Protected { function index() { - print "<div id=\"pref-label-wrap\" dojoType=\"dijit.layout.BorderContainer\" gutters=\"false\">"; - print "<div id=\"pref-label-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">"; - print "<div id=\"pref-label-toolbar\" dojoType=\"dijit.Toolbar\">"; + print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; + print "<div dojoType='dijit.Toolbar'>"; - print "<div dojoType=\"dijit.form.DropDownButton\">". + print "<div dojoType='dijit.form.DropDownButton'>". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\" @@ -287,7 +280,7 @@ class Pref_Labels extends Handler_Protected { print "</div>"; #toolbar print "</div>"; #pane - print "<div id=\"pref-label-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; + print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; print "<div id=\"labellistLoading\"> <img src='images/indicator_tiny.gif'>". diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index af827af58..4af0bef33 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -101,20 +101,23 @@ class Pref_Prefs extends Handler_Protected { $value = $_POST[$pref_name]; - if ($pref_name == 'DIGEST_PREFERRED_TIME') { - if (get_pref('DIGEST_PREFERRED_TIME') != $value) { + switch ($pref_name) { + case 'DIGEST_PREFERRED_TIME': + if (get_pref('DIGEST_PREFERRED_TIME') != $value) { - $sth = $this->pdo->prepare("UPDATE ttrss_users SET + $sth = $this->pdo->prepare("UPDATE ttrss_users SET last_digest_sent = NULL WHERE id = ?"); - $sth->execute([$_SESSION['uid']]); - - } - } + $sth->execute([$_SESSION['uid']]); - if ($pref_name == "USER_LANGUAGE") { - if ($_SESSION["language"] != $value) { - $need_reload = true; - } + } + break; + case 'USER_LANGUAGE': + if (!$need_reload) $need_reload = $_SESSION["language"] != $value; + break; + + case 'USER_CSS_THEME': + if (!$need_reload) $need_reload = get_pref($pref_name) != $value; + break; } set_pref($pref_name, $value); @@ -176,7 +179,8 @@ class Pref_Prefs extends Handler_Protected { $_SESSION["prefs_op_result"] = ""; print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">"; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Personal data / Authentication')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">"; print "<form dojoType=\"dijit.form.Form\" id=\"changeUserdataForm\">"; @@ -422,7 +426,8 @@ class Pref_Prefs extends Handler_Protected { print "</div>"; #pane - print "<div dojoType=\"dijit.layout.AccordionPane\" selected=\"true\" title=\"".__('Preferences')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" selected=\"true\" + title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">"; print "<form dojoType=\"dijit.form.Form\" id=\"changeSettingsForm\">"; @@ -454,13 +459,9 @@ class Pref_Prefs extends Handler_Protected { $profile = $_SESSION["profile"]; - if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null; - if ($profile) { print_notice(__("Some preferences are only available in default profile.")); - } - if ($_SESSION["profile"]) { initialize_user_prefs($_SESSION["uid"], $profile); } else { initialize_user_prefs($_SESSION["uid"]); @@ -544,20 +545,29 @@ class Pref_Prefs extends Handler_Protected { print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"'); } else if ($pref_name == "USER_STYLESHEET") { - print "<button dojoType=\"dijit.form.Button\" + print "<button dojoType=\"dijit.form.Button\" class='alt-info' onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>"; } else if ($pref_name == "USER_CSS_THEME") { $themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css")); $themes = array_map("basename", $themes); - $themes = array_filter($themes, "theme_valid"); + $themes = array_filter($themes, "theme_exists"); asort($themes); - if (!theme_valid($value)) $value = "default.php"; + if (!theme_exists($value)) $value = "default.php"; - print_select($pref_name, $value, $themes, - 'dojoType="dijit.form.Select"'); + print "<select name='$pref_name' id='$pref_name' dojoType='dijit.form.Select'>"; + + $issel = $value == "default.php" ? "selected='selected'" : ""; + print "<option $issel value='default.php'>".__("default")."</option>"; + + foreach ($themes as $theme) { + $issel = $value == $theme ? "selected='selected'" : ""; + print "<option $issel value='$theme'>$theme</option>"; + } + + print "</select>"; } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { @@ -679,7 +689,8 @@ class Pref_Prefs extends Handler_Protected { print "</div>"; #pane - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>extension</i> ".__('Plugins')."\">"; print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">"; @@ -843,14 +854,16 @@ class Pref_Prefs extends Handler_Protected { print "</div>"; #pane print "</div>"; #pane - print "</doiv>"; #border-container + print "</div>"; #border-container print "</form>"; + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "hook_prefs_tab", "prefPrefs"); print "</div>"; #container + } function toggleAdvanced() { @@ -1002,9 +1015,9 @@ class Pref_Prefs extends Handler_Protected { print "<div dojoType=\"dijit.form.DropDownButton\">". "<span>" . __('Select')."</span>"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; - print "<div onclick=\"Tables.select('prefFeedProfileList', true)\" + print "<div onclick=\"Tables.select('pref-profiles-list', true)\" dojoType=\"dijit.MenuItem\">".__('All')."</div>"; - print "<div onclick=\"Tables.select('prefFeedProfileList', false)\" + print "<div onclick=\"Tables.select('pref-profiles-list', false)\" dojoType=\"dijit.MenuItem\">".__('None')."</div>"; print "</div></div>"; @@ -1022,19 +1035,15 @@ class Pref_Prefs extends Handler_Protected { WHERE owner_uid = ? ORDER BY title"); $sth->execute([$_SESSION['uid']]); - print "<div class=\"prefProfileHolder\">"; + print "<div class='panel panel-scrollable'>"; - print "<form id=\"profile_edit_form\" onsubmit=\"return false\">"; + print "<form id='profile_edit_form' onsubmit='return false'>"; - print "<table width=\"100%\" class=\"prefFeedProfileList\" - cellspacing=\"0\" id=\"prefFeedProfileList\">"; + print "<table width='100%' id='pref-profiles-list'>"; - print "<tr class=\"placeholder\">"; # data-row-id='0' <-- no point, shouldn't be removed + print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed - print "<td width='5%' align='center'><input - onclick='Tables.onRowChecked(this);' - dojoType=\"dijit.form.CheckBox\" - type=\"checkbox\"></td>"; + print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; if (!$_SESSION["profile"]) { $is_active = __("(active)"); @@ -1042,8 +1051,7 @@ class Pref_Prefs extends Handler_Protected { $is_active = ""; } - print "<td><span>" . - __("Default profile") . " $is_active</span></td>"; + print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>"; print "</tr>"; @@ -1053,14 +1061,11 @@ class Pref_Prefs extends Handler_Protected { $profile_id = $line["id"]; - print "<tr class=\"placeholder\" data-row-id='$profile_id'>"; + print "<tr data-row-id='$profile_id'>"; $edit_title = htmlspecialchars($line["title"]); - print "<td width='5%' align='center'><input - onclick='Tables.onRowChecked(this);' - dojoType=\"dijit.form.CheckBox\" - type=\"checkbox\"></td>"; + print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>"; if ($_SESSION["profile"] == $line["id"]) { $is_active = __("(active)"); diff --git a/classes/pref/system.php b/classes/pref/system.php index ef2ca98b0..f44b499c8 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -26,7 +26,8 @@ class Pref_System extends Handler_Protected { function index() { print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">"; - print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Event Log')."\">"; + print "<div dojoType=\"dijit.layout.AccordionPane\" + title=\"<i class='material-icons'>report</i> ".__('Event Log')."\">"; if (LOG_DESTINATION == "sql") { diff --git a/classes/pref/users.php b/classes/pref/users.php index 6fedddf1d..206dc34d5 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -153,7 +153,7 @@ class Pref_Users extends Handler_Protected { WHERE owner_uid = ? ORDER BY title"); $sth->execute([$id]); - print "<ul class=\"userFeedList\">"; + print "<ul class=\"panel panel-scrollable list list-unstyled\">"; while ($line = $sth->fetch()) { @@ -326,10 +326,9 @@ class Pref_Users extends Handler_Protected { global $access_level_names; - 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\">"; + print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; + print "<div dojoType='dijit.Toolbar'>"; $user_search = trim(clean($_REQUEST["search"])); @@ -376,7 +375,7 @@ class Pref_Users extends Handler_Protected { print "</div>"; #toolbar print "</div>"; #pane - print "<div id=\"pref-user-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>"; $sort = validate_field($sort, ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); |