valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display filter tree rules as a list

This commit is contained in:
Andrew Dolgov 2018-12-19 12:08:06 +03:00
parent e3c4540c12
commit 51b069a1ee
10 changed files with 33 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/pref/filters.php
View File

@ -177,7 +177,7 @@ class Pref_Filters extends Handler_Protected {
} }
private function getfilterrules_concise($filter_id) { private function getfilterrules_list($filter_id) {
$sth = $this->pdo->prepare("SELECT reg_exp, $sth = $this->pdo->prepare("SELECT reg_exp,
inverse, inverse,
match_on, match_on,
@ -227,11 +227,11 @@ class Pref_Filters extends Handler_Protected {
$inverse = $line["inverse"] ? "inverse" : ""; $inverse = $line["inverse"] ? "inverse" : "";
$rv .= "<span class='$inverse'>" . T_sprintf("%s on %s in %s %s", $rv .= "<li class='$inverse'>" . T_sprintf("%s on %s in %s %s",
htmlspecialchars($line["reg_exp"]), htmlspecialchars($line["reg_exp"]),
$line["field"], $line["field"],
$where, $where,
$line["inverse"] ? __("(inverse)") : "") . "</span>"; $line["inverse"] ? __("(inverse)") : "") . "</li>";
} }
return $rv; return $rv;
@ -306,7 +306,7 @@ class Pref_Filters extends Handler_Protected {
$filter['checkbox'] = false; $filter['checkbox'] = false;
$filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null; $filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null;
$filter['enabled'] = $line["enabled"]; $filter['enabled'] = $line["enabled"];
$filter['rules'] = $this->getfilterrules_concise($line['id']); $filter['rules'] = $this->getfilterrules_list($line['id']);
if (!$filter_search || $match_ok) { if (!$filter_search || $match_ok) {
array_push($folder['items'], $filter); array_push($folder['items'], $filter);

17
css/default.css
View File

@ -1485,9 +1485,6 @@ body.ttrss_prefs .user-css-editor {
height: 300px; height: 300px;
width: 575px; width: 575px;
} }
body.ttrss_prefs #filterTree .filterRules * {
white-space: normal;
}
body.ttrss_prefs table.prefPluginsList td label, body.ttrss_prefs table.prefPluginsList td label,
body.ttrss_prefs table.prefUserList td { body.ttrss_prefs table.prefUserList td {
cursor: pointer; cursor: pointer;
@ -1757,10 +1754,6 @@ body#sharepopup input {
.flat li { .flat li {
padding: 2px; padding: 2px;
} }
.flat .filterRules span {
display: block;
color: green;
}
.flat #filterDlg_Matches span.filterRule { .flat #filterDlg_Matches span.filterRule {
color: green; color: green;
} }
@ -1805,7 +1798,7 @@ body#sharepopup input {
.flat .dijitTree .dijitFolderOpened { .flat .dijitTree .dijitFolderOpened {
display: none; display: none;
} }
.flat .dijitTree .dijitTreeRowSelected .filterRules span { .flat .dijitTree .dijitTreeRowSelected .filterRules li {
color: white; color: white;
} }
.flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando { .flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando {
@ -1832,11 +1825,13 @@ body#sharepopup input {
float: right; float: right;
} }
.flat .dijitTree .filterRules { .flat .dijitTree .filterRules {
display: block;
color: #ccc;
font-size: 12px; font-size: 12px;
margin-left: 100px;
line-height: normal; line-height: normal;
white-space: normal;
margin-left: 28px;
}
.flat .dijitTree .filterRules li {
color: green;
} }
.flat .dijitTree .dijitTreeContainer { .flat .dijitTree .dijitTreeContainer {
max-width: 100%; max-width: 100%;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

17
css/dijit_basic.less
View File

@ -4,11 +4,6 @@
padding: 2px; padding: 2px;
} }
.filterRules span {
display: block;
color: green;
}
#filterDlg_Matches span.filterRule { #filterDlg_Matches span.filterRule {
color: green; color: green;
} }
@ -69,7 +64,7 @@
} }
.dijitTreeRowSelected { .dijitTreeRowSelected {
.filterRules span { .filterRules li {
color : white; color : white;
} }
@ -105,13 +100,15 @@
} }
.filterRules { .filterRules {
display: block;
color: #ccc;
font-size: 12px; font-size: 12px;
margin-left: 100px;
line-height : normal; line-height : normal;
} white-space: normal;
margin-left : 28px;
li {
color : green;
}
}
.dijitTreeContainer { .dijitTreeContainer {
max-width : 100%; max-width : 100%;

4
css/prefs.less
View File

@ -76,10 +76,6 @@ body.ttrss_prefs {
width : 575px; width : 575px;
} }
#filterTree .filterRules * {
white-space: normal;
}
table.prefPluginsList td label, table.prefUserList td { table.prefPluginsList td label, table.prefUserList td {
cursor : pointer; cursor : pointer;
} }

2
js/PrefFilterTree.js
View File

@ -17,7 +17,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
} }
if (rules) { if (rules) {
param = dojo.doc.createElement('span'); param = dojo.doc.createElement('ul');
param.className = 'filterRules'; param.className = 'filterRules';
param.innerHTML = rules; param.innerHTML = rules;
domConstruct.place(param, tnode.rowNode, 'next'); domConstruct.place(param, tnode.rowNode, 'next');

17
themes/night.css
View File

@ -1486,9 +1486,6 @@ body.ttrss_prefs .user-css-editor {
height: 300px; height: 300px;
width: 575px; width: 575px;
} }
body.ttrss_prefs #filterTree .filterRules * {
white-space: normal;
}
body.ttrss_prefs table.prefPluginsList td label, body.ttrss_prefs table.prefPluginsList td label,
body.ttrss_prefs table.prefUserList td { body.ttrss_prefs table.prefUserList td {
cursor: pointer; cursor: pointer;
@ -1758,10 +1755,6 @@ body#sharepopup input {
.flat li { .flat li {
padding: 2px; padding: 2px;
} }
.flat .filterRules span {
display: block;
color: green;
}
.flat #filterDlg_Matches span.filterRule { .flat #filterDlg_Matches span.filterRule {
color: green; color: green;
} }
@ -1806,7 +1799,7 @@ body#sharepopup input {
.flat .dijitTree .dijitFolderOpened { .flat .dijitTree .dijitFolderOpened {
display: none; display: none;
} }
.flat .dijitTree .dijitTreeRowSelected .filterRules span { .flat .dijitTree .dijitTreeRowSelected .filterRules li {
color: white; color: white;
} }
.flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando { .flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando {
@ -1833,11 +1826,13 @@ body#sharepopup input {
float: right; float: right;
} }
.flat .dijitTree .filterRules { .flat .dijitTree .filterRules {
display: block;
color: #ccc;
font-size: 12px; font-size: 12px;
margin-left: 100px;
line-height: normal; line-height: normal;
white-space: normal;
margin-left: 28px;
}
.flat .dijitTree .filterRules li {
color: green;
} }
.flat .dijitTree .dijitTreeContainer { .flat .dijitTree .dijitTreeContainer {
max-width: 100%; max-width: 100%;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long

17
themes/night_blue.css
View File

@ -1486,9 +1486,6 @@ body.ttrss_prefs .user-css-editor {
height: 300px; height: 300px;
width: 575px; width: 575px;
} }
body.ttrss_prefs #filterTree .filterRules * {
white-space: normal;
}
body.ttrss_prefs table.prefPluginsList td label, body.ttrss_prefs table.prefPluginsList td label,
body.ttrss_prefs table.prefUserList td { body.ttrss_prefs table.prefUserList td {
cursor: pointer; cursor: pointer;
@ -1758,10 +1755,6 @@ body#sharepopup input {
.flat li { .flat li {
padding: 2px; padding: 2px;
} }
.flat .filterRules span {
display: block;
color: green;
}
.flat #filterDlg_Matches span.filterRule { .flat #filterDlg_Matches span.filterRule {
color: green; color: green;
} }
@ -1806,7 +1799,7 @@ body#sharepopup input {
.flat .dijitTree .dijitFolderOpened { .flat .dijitTree .dijitFolderOpened {
display: none; display: none;
} }
.flat .dijitTree .dijitTreeRowSelected .filterRules span { .flat .dijitTree .dijitTreeRowSelected .filterRules li {
color: white; color: white;
} }
.flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando { .flat .dijitTree .dijitTreeRowSelected .dijitTreeExpando {
@ -1833,11 +1826,13 @@ body#sharepopup input {
float: right; float: right;
} }
.flat .dijitTree .filterRules { .flat .dijitTree .filterRules {
display: block;
color: #ccc;
font-size: 12px; font-size: 12px;
margin-left: 100px;
line-height: normal; line-height: normal;
white-space: normal;
margin-left: 28px;
}
.flat .dijitTree .filterRules li {
color: green;
} }
.flat .dijitTree .dijitTreeContainer { .flat .dijitTree .dijitTreeContainer {
max-width: 100%; max-width: 100%;

2
themes/night_blue.css.map
View File

File diff suppressed because one or more lines are too long