diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/dlg.php | 11 | ||||
| -rwxr-xr-x | classes/pref/feeds.php | 28 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 14 | ||||
| -rw-r--r-- | classes/pref/labels.php | 10 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 28 | ||||
| -rw-r--r-- | classes/pref/users.php | 11 |
6 files changed, 44 insertions, 58 deletions
diff --git a/classes/dlg.php b/classes/dlg.php index 7ac18bb90..ed0d16322 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -16,15 +16,12 @@ class Dlg extends Handler_Protected { function importOpml() { print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "</p>"; - print "<div class=\"prefFeedOPMLHolder\">"; - - print "<ul class='nomarks'>"; + print "<div class='panel panel-scrollable'>"; $opml = new Opml($_REQUEST); $opml->opml_import($_SESSION["uid"]); - print "</ul>"; print "</div>"; print "<div align='center'>"; @@ -43,7 +40,7 @@ class Dlg extends Handler_Protected { print __("Your Public OPML URL is:"); - print "<div class=\"tagCloudContainer\">"; + print "<div class='panel'>"; print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>"; print "</div>"; @@ -94,7 +91,7 @@ class Dlg extends Handler_Protected { } function printTagCloud() { - print "<div class=\"tagCloudContainer\">"; + print "<div class='panel'>"; // from here: http://www.roscripts.com/Create_tag_cloud-71.html @@ -170,7 +167,7 @@ class Dlg extends Handler_Protected { print "<div>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</div>"; - print "<div class=\"tagCloudContainer\">"; + print "<div class='panel'>"; print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>"; print "</div>"; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index b834d0de1..71379a12b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1132,8 +1132,8 @@ 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\" + 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 @@ -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'>". @@ -1423,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; @@ -1440,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\" @@ -1485,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; @@ -1502,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 7c255db4f..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'>"; @@ -772,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; @@ -816,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>"; diff --git a/classes/pref/labels.php b/classes/pref/labels.php index 0414a7f8e..a58e33ac9 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -255,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)\" @@ -280,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 ac3eae13f..6c7a45953 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -1015,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>"; @@ -1035,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)"); @@ -1055,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>"; @@ -1066,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/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"); |