diff options
author | Andrew Dolgov <[email protected]> | 2011-04-18 13:09:59 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-04-18 13:09:59 +0400 |
commit | aaba22250fd497ddbf17a73ca187e13516411454 (patch) | |
tree | 47841c2ccea6259216de3eaa05201bd762755d55 | |
parent | 361840203b217b03eca1839bfe11a172a5cccd40 (diff) |
filter dialog: display parsed date when checking; fix Check it button not using Dijit control
-rw-r--r-- | functions.js | 2 | ||||
-rw-r--r-- | modules/backend-rpc.php | 3 | ||||
-rw-r--r-- | modules/popup-dialog.php | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/functions.js b/functions.js index ee92674eb..2a4268e8c 100644 --- a/functions.js +++ b/functions.js @@ -628,7 +628,7 @@ function filterDlgCheckDate() { var reply = JSON.parse(transport.responseText); if (reply['result'] == true) { - alert(__("Date syntax appears to be correct.")); + alert(__("Date syntax appears to be correct:") + " " + reply['date']); return; } else { alert(__("Date syntax is incorrect.")); diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 4f2ba252f..0630d8821 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -456,7 +456,8 @@ $date = db_escape_string($_REQUEST["date"]); $date_parsed = strtotime($date); - print json_encode(array("result" => (bool)$date_parsed)); + print json_encode(array("result" => (bool)$date_parsed, + "date" => date("c", $date_parsed))); return; } diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 78962dc6c..02459ba84 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -466,7 +466,8 @@ name=\"reg_exp\" value=\"$reg_exp\"/>"; print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">"; - print " <button onclick=\"return filterDlgCheckDate()\">". + print " <button dojoType=\"dijit.form.Button\" + onclick=\"return filterDlgCheckDate()\">". __('Check it')."</button>"; print "</span>"; |