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

simplify filter overview

This commit is contained in:
Andrew Dolgov 2013-03-31 16:52:33 +04:00
parent 18ad09af01
commit da46d21e88
2 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
classes/pref/filters.php
View File

@ -133,7 +133,7 @@ class Pref_Filters extends Handler_Protected {
(SELECT reg_exp FROM ttrss_filters2_rules (SELECT reg_exp FROM ttrss_filters2_rules
WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS reg_exp WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS reg_exp
FROM ttrss_filters2 WHERE FROM ttrss_filters2 WHERE
owner_uid = ".$_SESSION["uid"]." ORDER BY action_id,reg_exp"); owner_uid = ".$_SESSION["uid"]." ORDER BY order_id");
$action_id = -1; $action_id = -1;
@ -142,7 +142,7 @@ class Pref_Filters extends Handler_Protected {
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
if ($action_id != $line["action_id"]) { /* if ($action_id != $line["action_id"]) {
if (count($folder['items']) > 0) { if (count($folder['items']) > 0) {
array_push($root['items'], $folder); array_push($root['items'], $folder);
} }
@ -152,7 +152,7 @@ class Pref_Filters extends Handler_Protected {
$folder['name'] = __($line["action_name"]); $folder['name'] = __($line["action_name"]);
$folder['items'] = array(); $folder['items'] = array();
$action_id = $line["action_id"]; $action_id = $line["action_id"];
} } */
$name = $this->getFilterName($line["id"]); $name = $this->getFilterName($line["id"]);
@ -178,7 +178,7 @@ class Pref_Filters extends Handler_Protected {
$fg_color = db_fetch_result($label_result, 0, "fg_color"); $fg_color = db_fetch_result($label_result, 0, "fg_color");
$bg_color = db_fetch_result($label_result, 0, "bg_color"); $bg_color = db_fetch_result($label_result, 0, "bg_color");
if ($name[1]) $name[1] = "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-right : 4px'>&alpha;</span>" . $name[1]; $name[1] = "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-right : 4px'>&alpha;</span>" . $name[1];
} }
} }
@ -195,9 +195,11 @@ class Pref_Filters extends Handler_Protected {
} }
} }
if (count($folder['items']) > 0) { /* if (count($folder['items']) > 0) {
array_push($root['items'], $folder); array_push($root['items'], $folder);
} } */
$root['items'] = $folder['items'];
$fl = array(); $fl = array();
$fl['identifier'] = 'id'; $fl['identifier'] = 'id';
@ -914,9 +916,7 @@ class Pref_Filters extends Handler_Protected {
$title = db_fetch_result($result, 0, "title"); $title = db_fetch_result($result, 0, "title");
if ($title) { if (!$title) {
return array($title);
} else {
$result = db_query($this->link, $result = db_query($this->link,
"SELECT * FROM ttrss_filters2_rules WHERE filter_id = '$id' ORDER BY id "SELECT * FROM ttrss_filters2_rules WHERE filter_id = '$id' ORDER BY id
@ -944,6 +944,10 @@ class Pref_Filters extends Handler_Protected {
++$count; ++$count;
} }
$title = truncate_string(join(", ", $titles), 64, "...");
}
$result = db_query($this->link, $result = db_query($this->link,
"SELECT * FROM ttrss_filters2_actions WHERE filter_id = '$id' ORDER BY id LIMIT 3"); "SELECT * FROM ttrss_filters2_actions WHERE filter_id = '$id' ORDER BY id LIMIT 3");
@ -960,9 +964,7 @@ class Pref_Filters extends Handler_Protected {
++$count; ++$count;
} }
return array(join(", ", $titles), join(", ", $actions)); return array($title, join(", ", $actions));
}
} }
function join() { function join() {

5
tt-rss.css
View File

@ -840,6 +840,11 @@ div.fatalError textarea {
margin-right : 1em; margin-right : 1em;
} }
.labelParam {
float : right;
margin-right : 1em;
}
.dijitTreeLabel.Disabled, .labelParam.Disabled { .dijitTreeLabel.Disabled, .labelParam.Disabled {
color : gray; color : gray;
} }