public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 13:25:54 +00:00
Code Issues Releases Wiki Activity

remove separate classes for various panels, unify under .panel

Browse Source 
remove a few other unnecessary css classes/ids
This commit is contained in:
Andrew Dolgov
2018-12-07 14:03:33 +03:00
parent e5dfc20939
commit a68b150601
23 changed files with 156 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
classes/pref/feeds.php
View File

@@ -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\"

14
classes/pref/filters.php
View File

@@ -199,8 +199,8 @@ class Pref_Filters extends Handler_Protected {
print "<div><img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'>&nbsp;<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>";

10
classes/pref/labels.php
View File

@@ -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'>".

28
classes/pref/prefs.php
View File

@@ -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)");

11
classes/pref/users.php
View File

@@ -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");