From d90868d719a4a620ff5c1f74457626c429196590 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 20 Nov 2010 14:10:26 +0300
Subject: rework filter dialogs to use dijit.Form

---
 modules/popup-dialog.php | 64 +++++++++++++++++++++---------------------------
 modules/pref-filters.php | 54 ++++++++++++++++++++--------------------
 2 files changed, 54 insertions(+), 64 deletions(-)

(limited to 'modules')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index ad434bd9b..2f339e669 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -451,14 +451,9 @@
 
 			$active_feed_id = db_escape_string($_REQUEST["param"]);
 
-			print "<title>".__('Create Filter')."</title>";
-			print "<content><![CDATA[";
-
-			print "<form id=\"filter_add_form\" onsubmit='return false'>";
-
-			print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
-			print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
-			print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"quiet\" value=\"1\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"add\">"; 
 		
 			$result = db_query($link, "SELECT id,description 
 				FROM ttrss_filter_types ORDER BY description");
@@ -474,33 +469,36 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<span id=\"filter_dlg_date_mod_box\" style=\"display : none\">";
-			print __("Date") . " ";
+			print "<span id=\"filterDlg_dateModBox\" style=\"display : none\">";
 
 			$filter_params = array(
 				"before" => __("before"),
 				"after" => __("after"));
 
-			print_select_hash("filter_date_modifier", "before", $filter_params);
+			print_select_hash("filter_date_modifier", "before", 
+				$filter_params, 'dojoType="dijit.form.Select"');
 
 			print "&nbsp;</span>";
 
-			print "<input onkeypress=\"return filterCR(event, createFilter)\"
-				 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" 
+				 required=\"true\" id=\"filterDlg_regExp\"
+				 style=\"font-size : 16px\"
+				 name=\"reg_exp\" value=\"$reg_exp\"/>";
 
-			print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
+			print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
 			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
 				__('Check it')."</button>";
 			print "</span>";
 
-			print "<br/> " . __("on field") . " ";
+			print "<br/>" .  __("on field") . " ";
 			print_select_hash("filter_type", 1, $filter_types,
-				'onchange="filterDlgCheckType(this)"');
+				'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
 
 			print "<br/>";
 
 			print __("in") . " ";
-			print_feed_select($link, "feed_id", $active_feed_id);
+			print_feed_select($link, "feed_id", $active_feed_id, 
+				'dojoType="dijit.form.FilteringSelect"');
 
 			print "</div>";
 
@@ -508,7 +506,7 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<select name=\"action_id\"
+			print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
 				onchange=\"filterDlgCheckAction(this)\">";
 	
 			$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
@@ -520,13 +518,14 @@
 	
 			print "</select>";
 
-			print "<span id=\"filter_dlg_param_box\" style=\"display : none\">";
+			print "<span id=\"filterDlg_paramBox\" style=\"display : none\">";
 			print " " . __("with parameters:") . " ";
-			print "<input size=\"20\"
-					onkeypress=\"return filterCR(event, createFilter)\"
-					name=\"action_param\">";
+			print "<input dojoType=\"dijit.form.TextBox\"
+				id=\"filterDlg_actionParam\"
+				name=\"action_param\">";
 
-			print_label_select($link, "action_param_label", $action_param);
+			print_label_select($link, "action_param_label", $action_param, 
+			 'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"');
 
 			print "</span>";
 
@@ -537,30 +536,23 @@
 			print "<div class=\"dlgSec\">".__("Options")."</div>";
 			print "<div class=\"dlgSecCont\">";
 
-			print "<div style=\"line-height : 100%\">";
-
-			print "<input type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
+			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
 					<label for=\"enabled\">".__('Enabled')."</label><br/>";
 
-			print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\">
+			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
 				<label for=\"inverse\">".__('Inverse match')."</label>";
 
 			print "</div>";
-			print "</div>";
-
-			print "</form>";
 
 			print "<div class=\"dlgButtons\">";
 
-			print "<button onclick=\"return createFilter()\">".
+			print "<button onclick=\"return dijit.byId('filterEditDlg').execute()\">".
 				__('Create')."</button> ";
 
-			print "<button onclick=\"return closeInfoBox()\">".__('Cancel').
-				"</button>";
+			print "<button onclick=\"return dijit.byId('filterEditDlg').hide()\">".
+				__('Cancel')."</button>";
 
-			print "]]></content>";
-
-//			print "</td></tr></table>"; 
+			print "</div>";
 
 			//return;
 		}
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 12bfd4397..28f30fa69 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -103,11 +103,6 @@
 
 			$filter_id = db_escape_string($_REQUEST["id"]);
 
-			header("Content-Type: text/xml");
-			print "<dlg id=\"$subop\">";
-			print "<title>".__('Filter Editor')."</title>";
-			print "<content><![CDATA[";
-
 			$result = db_query($link, 
 				"SELECT * FROM ttrss_filters WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -123,9 +118,9 @@
 
 			print "<form id=\"filter_edit_form\" onsubmit='return false'>";
 
-			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 "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$filter_id\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"editSave\">"; 
 			
 			$result = db_query($link, "SELECT id,description 
 				FROM ttrss_filter_types ORDER BY description");
@@ -145,7 +140,7 @@
 				$date_ops_invisible = 'style="display : none"';
 			}
 
-			print "<span id=\"filter_dlg_date_mod_box\" $date_ops_invisible>";
+			print "<span id=\"filterDlg_dateModBox\" $date_ops_invisible>";
 			print __("Date") . " ";
 
 			$filter_params = array(
@@ -153,26 +148,28 @@
 				"after" => __("after"));
 
 			print_select_hash("filter_date_modifier", $filter_param,
-				$filter_params);
+				$filter_params, 'dojoType="dijit.form.Select"');
 
 			print "&nbsp;</span>";
 
-			print "<input onkeypress=\"return filterCR(event, filterEditSave)\"
-					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+			print "<input dojoType=\"dijit.form.ValidationTextBox\"
+					 required=\"1\"
+					 name=\"reg_exp\" style=\"font-size : 16px;\" value=\"$reg_exp\">";
 
-			print "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>";			
+			print "<span id=\"filterDlg_dateChkBox\" $date_ops_invisible>";			
 			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
 				__('Check it')."</button>";
 			print "</span>";
 
 			print "<br/> " . __("on field") . " ";
 			print_select_hash("filter_type", $filter_type, $filter_types,
-				'onchange="filterDlgCheckType(this)"');
+				'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
 
 			print "<br/>";
 
 			print __("in") . " ";
-			print_feed_select($link, "feed_id", $feed_id);
+			print_feed_select($link, "feed_id", $feed_id,
+				'dojoType="dijit.form.FilteringSelect"');
 
 			print "</div>";
 
@@ -180,14 +177,14 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<select name=\"action_id\"
+			print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
 				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" : "";			
+				$is_sel = ($line["id"] == $action_id) ? "selected=\"1\"" : "";			
 				printf("<option value='%d' $is_sel>%s</option>", $line["id"], __($line["description"]));
 			}
 	
@@ -195,19 +192,20 @@
 
 			$param_hidden = ($action_id == 4 || $action_id == 6 || $action_id == 7) ? "" : "display : none";
 
-			print "<span id=\"filter_dlg_param_box\" style=\"$param_hidden\">";
+			print "<span id=\"filterDlg_paramBox\" style=\"$param_hidden\">";
 			print " " . __("with parameters:") . " ";
 
 			$param_int_hidden = ($action_id != 7) ? "" : "display : none";
 
-			print "<input size=\"20\" style=\"$param_int_hidden\"
-					onkeypress=\"return filterCR(event, filterEditSave)\"		
+			print "<input style=\"$param_int_hidden\"
+					dojoType=\"dijit.form.TextBox\" id=\"filterDlg_actionParam\"
 					name=\"action_param\" value=\"$action_param\">";
 
 			$param_int_hidden = ($action_id == 7) ? "" : "display : none";
 
 			print_label_select($link, "action_param_label", $action_param, 
-				$param_int_hidden);
+			 "style=\"$param_int_hidden\"" . 
+			 'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"');
 
 			print "</span>";
 
@@ -221,21 +219,21 @@
 			print "<div style=\"line-height : 100%\">";
 
 			if ($enabled) {
-				$checked = "checked";
+				$checked = "checked=\"1\"";
 			} else {
 				$checked = "";
 			}
 
-			print "<input type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
+			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
 					<label for=\"enabled\">".__('Enabled')."</label><br/>";
 
 			if ($inverse) {
-				$checked = "checked";
+				$checked = "checked=\"1\"";
 			} else {
 				$checked = "";
 			}
 
-			print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
+			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
 				<label for=\"inverse\">".__('Inverse match')."</label>";
 
 			print "</div>";
@@ -250,13 +248,13 @@
 				__('Remove')."</button>";
 			print "</div>";
 
-			print "<button onclick=\"return filterEditSave()\">".
+			print "<button onclick=\"return dijit.byId('filterEditDlg').execute()\">".
 				__('Save')."</button> ";
 
-			print "<button onclick=\"return filterEditCancel()\">".
+			print "<button onclick=\"return dijit.byId('filterEditDlg').hide()\">".
 				__('Cancel')."</button>";
 
-			print "]]></content></dlg>";
+			print "</div>";
 
 			return;
 		}
-- 
cgit v1.2.3