rework feed dialog layouts

[tt-rss.git] / modules / pref-filters.php

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index fcd04de7330db922d02a451137127857742a3a61..927cddcd7c143349c76682164e21dce497bf764b 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -19,7 +19,7 @@
                        $enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled"));
                        $inverse = sql_bool_to_bool(db_fetch_result($result, 0, "inverse"));
 
-                       print "<div id=\"infoBoxTitle\">".__('Filter editor')."</div>";
+                       print "<div id=\"infoBoxTitle\">".__('Filter Editor')."</div>";
                        print "<div class=\"infoBoxContents\">";
 
                        print "<form id=\"filter_edit_form\" onsubmit='return false'>";
@@ -27,8 +27,6 @@
                        print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
                        print "<input type=\"hidden\" name=\"id\" value=\"$filter_id\">";
                        print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">"; 
-
-//                     print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
                        
                        $result = db_query($link, "SELECT id,description 
                                FROM ttrss_filter_types ORDER BY description");
@@ -40,7 +38,7 @@
                                $filter_types[$line["id"]] = __($line["description"]);
                        }
 
-                       print "<table width='100%'>";
+/*                     print "<table width='100%'>";
 
                        print "<tr><td>".__('Match:')."</td>
                                <td><input onkeypress=\"return filterCR(event, filterEditSave)\"
@@ -106,7 +104,80 @@
 
                        print "</form>";
 
-                       print "<div align='right'>";
+                       print "<hr>"; */
+
+                       print "<div class=\"dlgSec\">".__("Match")."</div>";
+
+                       print "<div class=\"dlgSecCont\">";
+
+                       print "<input onkeypress=\"return filterCR(event, filterEditSave)\"
+                                        onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+                                        onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+                                        name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+
+                       print " " . __("on field") . " ";
+                       print_select_hash("filter_type", $filter_type, $filter_types);
+
+                       print "<br/>";
+
+                       print __("in") . " ";
+                       print_feed_select($link, "feed_id", $feed_id);
+
+                       print "</div>";
+
+                       print "<div class=\"dlgSec\">".__("Perform Action")."</div>";
+
+                       print "<div class=\"dlgSecCont\">";
+
+                       print "<select name=\"action_id\"
+                               onchange=\"filterDlgCheckAction(this)\">";
+       
+                       $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
+                               ORDER BY name");
+
+                       while ($line = db_fetch_assoc($result)) {
+                               $is_sel = ($line["id"] == $action_id) ? "selected" : "";                        
+                               printf("<option value='%d' $is_sel>%s</option>", $line["id"], __($line["description"]));
+                       }
+       
+                       print "</select>";
+
+                       print " " . __("with params") . " ";
+
+                       $param_disabled = ($action_id == 4 || $action_id == 6) ? "" : "disabled";
+
+                       print "<input $param_disabled size=\"20\"
+                               name=\"action_param\" value=\"$action_param\">";
+
+                       print "</div>";
+
+                       print "<div class=\"dlgSec\">".__("Options")."</div>";
+                       print "<div class=\"dlgSecCont\">";
+
+                       print "<div style=\"line-height : 100%\">";
+
+                       if ($enabled) {
+                               $checked = "checked";
+                       } else {
+                               $checked = "";
+                       }
+
+                       print "<input type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
+                                       <label for=\"enabled\">".__('Enabled')."</label><br/>";
+
+                       if ($inverse) {
+                               $checked = "checked";
+                       } else {
+                               $checked = "";
+                       }
+
+                       print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
+                               <label for=\"inverse\">".__('Inverse match')."</label>";
+
+                       print "</div>";
+                       print "</div>";
+
+                       print "<div class=\"dlgButtons\">";
 
                        print "<input type=\"submit\" 
                                id=\"infobox_submit\"
@@ -370,12 +441,11 @@
                                        $line["action_param"] = "<span class=\"insensitive\">" . 
                                                $line["action_param"] . "</span>";
                                }       
-       
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["reg_exp"] . "</td>";             
-       
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["feed_title"] . "</td>";                  
+
+                               $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
+
+                               print "<td $onclick>" . $line["reg_exp"] . "</td>";             
+                               print "<td $onclick>" . $line["feed_title"] . "</td>";                  
 
                                $inverse_label = "";
 
@@ -383,31 +453,14 @@
                                        $inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>";
                                }
        
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["filter_type_descr"] . "$inverse_label</td>";             
-               
-/*                             print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["action_description"]."</td>"; */
-
-                               print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                               $line["action_param"] . "</td>";
+                               print "<td $onclick>" . $line["filter_type_descr"] . "$inverse_label</td>";
+                               print "<td $onclick>" . $line["action_param"] . "</td>";
 
                                print "</tr>";
        
                                ++$lnum;
                        }
-       
-                       if ($lnum == 0) {
-                               print "<tr><td colspan=\"4\" align=\"center\">";
-                               if (!$filter_search) {
-                                       print __('No filters defined.');
-                               } else {
-                                       print __('No matching filters found.');
-                               }
-                                       
-                               print "</td></tr>";
-                       }
-       
+
                        print "</table>";
 
                        print "<p id=\"filterOpToolbar\">";
@@ -419,21 +472,14 @@
 
                        print "</p>";
 
-
-/*                     print "<div class=\"insensitive\" style=\"float : right\">
-                               First matching filter is used, filtering is performed
-                               when importing articles from the feed.</div>"; */
-
                } else {
 
                        print "<p>";
-
                        if (!$filter_search) {
                                print __('No filters defined.');
                        } else {
                                print __('No matching filters found.');
                        }
-
                        print "</p>";
 
                }