From cf5c31464ef57d6170a189404ee59e81c7644e55 Mon Sep 17 00:00:00 2001 From: dave Date: Thu, 15 Oct 2009 07:11:43 +0000 Subject: [PATCH] - Add a #content iframe to the toplevel, hidden, width,hight=0,0 - Add a report generator dialog box that uses the content iframe for file downloads - The content iframe also works for creating dynamic content - Try to make FCKEditor work with jquery, it still doesn't. The content of FCKEditor isn't passed through serializeArray it seems. --- admin/communication.php | 24 +++---- admin/fundraising_campaigns.php | 15 +++-- admin/reports_gen.php | 112 +++++++++++++++++++++++++++++++- common.inc.php | 2 + 4 files changed, 135 insertions(+), 18 deletions(-) diff --git a/admin/communication.php b/admin/communication.php index 17743dd..57c7973 100644 --- a/admin/communication.php +++ b/admin/communication.php @@ -227,17 +227,10 @@ case 'dialog_edit': - \n"; echo "
BasePath = "../fckeditor/"; - $oFCKeditor->ToolbarSet = 'sfiab'; - $oFCKeditor->Value = $bodyhtml; - $oFCKeditor->Width="100%"; - $oFCKeditor->Height=300; - $oFCKeditor->Create(); - // echo "" - ?> + \n"; - echo "\n"; + echo "\n"; echo "
+
+ +
\n"; echo "
\n"; @@ -664,12 +664,12 @@ function prospect_removeall() { //key is initial or followup //start is either 'new' to start with a blank, or 'existing' to load an existing email to start from function opencommunicationeditor(key,id,fcid) { - $("#dialog").empty(); + $("#content").empty(); if(id) { - $("#dialog").load("communication.php?action=dialog_edit&id="+id+"&fundraising_campaigns_id="+fcid,null,function() { + $("#content").load("communication.php?action=dialog_edit&id="+id+"&fundraising_campaigns_id="+fcid,null,function() { }); } else { - $("#dialog").load("communication.php?action=dialog_edit&key="+key+"&fundraising_campaigns_id="+fcid,null,function() { + $("#content").load("communication.php?action=dialog_edit&key="+key+"&fundraising_campaigns_id="+fcid,null,function() { }); } } @@ -711,6 +711,13 @@ function comm_dialog_edit_cancel() { // alert("cancelled!"); } +function opensendlabelsdialog(reports_id) { + $("#dialog").empty(); + $("#dialog").load("reports_gen.php?action=dialog_gen&id="+reports_id,null,function() { + }); +} + + 0) { + if(array_key_exists('sid', $_GET)) { + $sid = intval($_GET['sid']); $q = mysql_query("SELECT id FROM reports WHERE system_report_id='$sid'"); $r = mysql_fetch_assoc($q); $id = $r['id']; } + +switch($_GET['action']) { +case 'dialog_gen': + $report = report_load($id); + ?> +
Debug...
+ @@ -680,6 +681,7 @@ echo "SFIAB Version ".$config['version']; ?>
Debug...
+