From b88e10120ab6b459da4975113c670524001f64b8 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 17 Sep 2009 19:05:17 +0000 Subject: [PATCH] Set the datepicker z-indez so its above the dialogs (so when used within a dialog it wont be below it) Change the width of the translations dialog, so when used from within another dialog (at 0.8) it looks more distinctly a different dialog (at 0.6) First go at converting the sponsor editor to a tabbed interface, so far the sponsor info tab works and saves but thats it. --- admin/sponsors.php | 248 +++++++++++++++++++++++++++++++++++++- theme/default/sfiab.css | 4 + translationseditor.js.php | 2 +- 3 files changed, 249 insertions(+), 5 deletions(-) diff --git a/admin/sponsors.php b/admin/sponsors.php index 2fbce439..4bc7bc1f 100644 --- a/admin/sponsors.php +++ b/admin/sponsors.php @@ -26,11 +26,248 @@ require_once("../user.inc.php"); user_auth_required('committee', 'admin'); + switch($_GET['action']) { + case 'organizationinfo_load': + $q=mysql_query("SELECT * FROM sponsors WHERE id='".intval($_GET['id'])."'"); + $ret=mysql_fetch_assoc($q); + echo json_encode($ret); + exit; + break; + + case 'organizationinfo_save': + $id=$_POST['sponsor_id']; + if($id) { + $exec="UPDATE sponsors SET ". + "organization='".mysql_escape_string(stripslashes($_POST['organization']))."', ". + "address='".mysql_escape_string(stripslashes($_POST['address']))."', ". + "city='".mysql_escape_string(stripslashes($_POST['city']))."', ". + "province_code='".mysql_escape_string(stripslashes($_POST['province_code']))."', ". + "postalcode='".mysql_escape_string(stripslashes($_POST['postalcode']))."', ". + "phone='".mysql_escape_string(stripslashes($_POST['phone']))."', ". + "tollfree='".mysql_escape_string(stripslashes($_POST['tollfree']))."', ". + "fax='".mysql_escape_string(stripslashes($_POST['fax']))."', ". + "email='".mysql_escape_string(stripslashes($_POST['email']))."', ". + "website='".mysql_escape_string(stripslashes($_POST['website']))."', ". + "notes='".mysql_escape_string(stripslashes($_POST['notes']))."', ". + "donationpolicyurl='".mysql_escape_string(stripslashes($_POST['donationpolicyurl']))."', ". + "fundingselectiondate='".mysql_escape_string(stripslashes($_POST['fundingselectiondate']))."', ". + "waiveraccepted='".mysql_escape_string(stripslashes($_POST['waiveraccepted']))."', ". + "taxreceiptrequired='".mysql_escape_string(stripslashes($_POST['taxreceiptrequired']))."' ". + "WHERE id='$id'"; + mysql_query($exec); + + //FIXME accept the logo + //"logo='".mysql_escape_string(stripslashes($_POST['logo']))."', ". + + happy_("Organization Info Saved"); + } + exit; + break; + + case 'sponsorshipinfo_load': + $ret=array(); + echo json_encode($ret); + exit; + break; + + } + send_header("Sponsors", array('Committee Main' => 'committee_main.php', 'Administration' => 'admin/index.php', 'Fundraising Main' => 'admin/fundraising.php') ); + +?> + + + +\n"; - echo " $r->organization\n"; + $eh="style=\"cursor:pointer;\" onclick=\"popup_editor({$r->id});\""; + echo " $r->organization\n"; $numq=mysql_query("SELECT COUNT(id) AS num FROM award_awards WHERE year='".$config['FAIRYEAR']."' AND sponsors_id='$r->id'"); $numr=mysql_fetch_object($numq); @@ -170,9 +408,11 @@ $numr=mysql_fetch_object($numq); $numsponsorships=$numr->num; - $numq=mysql_query("SELECT COUNT(users_id) AS num FROM users_sponsor, users WHERE sponsors_id='$r->id' AND users_sponsor.users_id=users.id AND users.year='".$config['FAIRYEAR']."' and users.deleted='no'"); - $numr=mysql_fetch_object($numq); - $numcontacts=$numr->num; + $numq=mysql_query("SELECT uid,MAX(year),firstname,lastname,deleted FROM users,users_sponsor WHERE types LIKE '%sponsor%' AND sponsors_id='$r->id' AND users_sponsor.users_id=users.id AND users.deleted='no' GROUP BY uid ORDER BY firstname"); +// $numq=mysql_query("SELECT DISTINCT(uid) FROM users_sponsor, users WHERE sponsors_id='$r->id' AND users_sponsor.users_id=users.id AND users.deleted='no'"); + $numcontacts=mysql_num_rows($numq); +// $numr=mysql_fetch_object($numq); +// $numcontacts=$numr->num; echo " "; diff --git a/theme/default/sfiab.css b/theme/default/sfiab.css index f8ad78b0..f7bd24fa 100644 --- a/theme/default/sfiab.css +++ b/theme/default/sfiab.css @@ -433,3 +433,7 @@ div.ui-tabs ul.ui-tabs-nav { font-weight: bold; } + +.ui-datepicker { + z-index: 1003; +} diff --git a/translationseditor.js.php b/translationseditor.js.php index a79ce40e..5554a9da 100644 --- a/translationseditor.js.php +++ b/translationseditor.js.php @@ -33,7 +33,7 @@ $(document).ready(function() { }); function popup_translator(str) { - var w = (document.documentElement.clientWidth * 0.8); + var w = (document.documentElement.clientWidth * 0.6); var h = (document.documentElement.clientHeight * 0.4); $('#translation_editor').dialog('option','width',w);