From 4ad5ec9d689bf97e76c19113e3751ee40f8bbd39 Mon Sep 17 00:00:00 2001 From: jacob Date: Wed, 31 Mar 2010 18:44:42 +0000 Subject: [PATCH] Made tables of the "tableview" class sortable --- admin/award_download.php | 4 +- admin/award_upload.php | 4 +- admin/communication.php | 10 +- admin/communication_send_status.php | 8 +- admin/cwsfregister.php | 4 +- admin/donors.php | 865 ++++++++++++++------------- admin/donors_search.php | 6 +- admin/fundraising.php | 8 +- admin/fundraising_campaigns.php | 10 +- admin/judges_teams_projects.php | 4 +- admin/registration_stats.php | 8 +- admin/reports.php | 2 +- admin/sponsor_contacts.php | 4 +- admin/students_info.php | 89 --- js/tablesorter/jquery.tablesorter.js | 2 +- scripts/populate_fake.php | 10 +- 16 files changed, 481 insertions(+), 557 deletions(-) delete mode 100644 admin/students_info.php diff --git a/admin/award_download.php b/admin/award_download.php index 1a31125..1430fa3 100644 --- a/admin/award_download.php +++ b/admin/award_download.php @@ -262,11 +262,11 @@ if(!function_exists('curl_init')) { } ?> - +
- + -
+
- +\n"; diff --git a/admin/communication.php b/admin/communication.php index 49ee050..c052b5c 100644 --- a/admin/communication.php +++ b/admin/communication.php @@ -608,11 +608,11 @@ case "email_get_list": $q=mysql_query("SELECT * FROM emails ORDER BY type,name"); echo "
Info")?>
{$r->awardname}
"; - echo ""; + echo ""; echo " "; echo " "; echo " "; - echo ""; + echo ""; while($r=mysql_fetch_object($q)) { if($r->fundraising_campaigns_id) $fcid=$r->fundraising_campaigns_id; else $fcid='null'; @@ -892,8 +892,10 @@ case "email_get_list": ?> \n"; - echo "\n"; + echo "\n"; + echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - /* - echo ""; - echo "\n"; - */ + echo "\n"; + echo "\n"; + echo "\n"; + /* + echo ""; + echo "\n"; + */ echo "\n"; - echo "
".i18n("Name")."".i18n("Type")."".i18n("Actions")."
"; + echo i18n("Purpose").":"; + echo ""; + echo "\n"; + echo "\n"; - echo "
".i18n("Date Received").":
".i18n("Amount").":\$
".i18n("Type of Support").":"; - $supporttypes=array("Gift - no receipt"); - if($config['registered_charity']) - $supporttypes[]="Donation - with receipt"; - $supporttypes[]="Sponsorship"; - echo "\n"; - echo "
"; - echo "".i18n("Generate Thank You")."
".i18n("Date Received").":
".i18n("Amount").":\$
".i18n("Type of Support").":"; + $supporttypes=array("Gift - no receipt"); + if($config['registered_charity']) + $supporttypes[]="Donation - with receipt"; + $supporttypes[]="Sponsorship"; + echo "\n"; + echo "
"; + echo "".i18n("Generate Thank You")."
\n"; - - - echo "\n"; - + echo "\n"; + echo "\n"; + exit; break; @@ -332,12 +336,12 @@ switch($_GET['action']) { case 'activityinfo_save': //($comment , $donorId, $userId, $type, $campaign_id=null){ if(save_activityinfo( - $_POST['comment'], - $_GET['id'], - $_SESSION['users_uid'], - $_POST['type'], - $_POST['fundraising_campaigns_id'] - )){ + $_POST['comment'], + $_GET['id'], + $_SESSION['users_uid'], + $_POST['type'], + $_POST['fundraising_campaigns_id'] + )){ happy_("Activity Logged"); }else{ error_("Unable to save activity log"); @@ -347,57 +351,56 @@ switch($_GET['action']) { case 'newcontactsearch': - if($_POST['email']) - $q=mysql_query("SELECT *,MAX(year) FROM users WHERE email='".trim($_POST['email'])."' GROUP BY uid HAVING deleted='no'"); + if($_POST['email']) + $q=mysql_query("SELECT *,MAX(year) FROM users WHERE email='".trim($_POST['email'])."' GROUP BY uid HAVING deleted='no'"); - if($r=mysql_fetch_object($q)) { - echo i18n("There is an exact email address match for %1",array($_POST['email'])); - echo ""; + if($r=mysql_fetch_object($q)) { + echo i18n("There is an exact email address match for %1",array($_POST['email'])); + echo ""; - ?> - - + + + + - - "; - echo ""; - } - else { - echo i18n("There are %1 existing users that match, please enter more details",array($num)); - } - } - echo "
"; - exit; - break; + $q=mysql_query("SELECT *,MAX(year) FROM users WHERE $searchstr GROUP BY uid HAVING deleted='no'"); + $num=mysql_num_rows($q); + if($num==0) { + echo i18n("No existing users match, will create a new user"); + } + else if($num<15) { + echo i18n("Did you mean one of these existing users? (click to choose one)")."
"; + echo ""; + } + else { + echo i18n("There are %1 existing users that match, please enter more details",array($num)); + } + } + echo "
"; + exit; + break; case "donation_add": $campaignid=intval($_POST['fundraising_campaigns_id']); $sponsorid=intval($_POST['sponsors_id']); @@ -470,19 +473,19 @@ function delete_contact(){ } function addexisting_contact() { - $uid=intval($_POST['uid']); - $sponsors_id=intval($_POST['id']); - echo "Linking uid=$uid to sponsors_id=$sponsors_id
"; + $uid=intval($_POST['uid']); + $sponsors_id=intval($_POST['id']); + echo "Linking uid=$uid to sponsors_id=$sponsors_id
"; - echo "uid $uid has users.id {$u['id']}"; + echo "uid $uid has users.id {$u['id']}"; - $u=user_load_by_uid($uid); - $u['sponsors_id']=$sponsors_id; - $u['types'][]="sponsor"; - user_save($u); + $u=user_load_by_uid($uid); + $u['sponsors_id']=$sponsors_id; + $u['types'][]="sponsor"; + user_save($u); - save_activityinfo("Existing user (".$u['firstname']." ".$u['lastname'].") linked to donor/sponsor",$sponsors_id,$_SESSION['users_uid'],'System'); - happy_("Added existing user to donor/sponsor"); + save_activityinfo("Existing user (".$u['firstname']." ".$u['lastname'].") linked to donor/sponsor",$sponsors_id,$_SESSION['users_uid'],'System'); + happy_("Added existing user to donor/sponsor"); } @@ -494,13 +497,13 @@ function save_contact(){ // load or create the user, according to the situation if($_POST['recordtype'] == 'new'){ - if($_POST['email']) { - $q=mysql_query("SELECT *,MAX(year) FROM users WHERE email='".trim($_POST['email'])."' GROUP BY uid HAVING deleted='no'"); - if(mysql_num_rows($q)) { - error_("A user with that email address already exists"); - exit; - } - } + if($_POST['email']) { + $q=mysql_query("SELECT *,MAX(year) FROM users WHERE email='".trim($_POST['email'])."' GROUP BY uid HAVING deleted='no'"); + if(mysql_num_rows($q)) { + error_("A user with that email address already exists"); + exit; + } + } // this is a new record being submitted. Create the user. $successMessage = "Contact created successfully"; @@ -602,12 +605,12 @@ function draw_contactsinfo_form($contact = null){ $query = mysql_query("SELECT *,MAX(year) FROM users LEFT JOIN users_sponsor ON users_sponsor.users_id=users.id WHERE sponsors_id='" . $sponsor_id . "' - AND types LIKE '%sponsor%' - GROUP BY uid + AND types LIKE '%sponsor%' + GROUP BY uid HAVING deleted='no' ORDER BY users_sponsor.primary DESC,lastname,firstname - "); - echo mysql_error(); + "); + echo mysql_error(); while($contact = mysql_fetch_array($query)){ // draw a header for this user @@ -626,8 +629,8 @@ function draw_contactsinfo_form($contact = null){ echo "\n"; echo "
\n"; - //and do the blank one - echo "
"; + //and do the blank one + echo "
"; draw_contact_form($sponsor_id); echo "
\n"; @@ -638,43 +641,43 @@ function draw_contactsinfo_form($contact = null){ // draw a form in which to enter information about the various contacts function draw_contact_form($sponsor_id, $contact = null){ - global $salutations; - global $config; + global $salutations; + global $config; - //grab the sponsor details, so we can do diff things for individual vs organization - $q=mysql_query("SELECT * FROM sponsors WHERE id='$sponsor_id'"); - $sponsor=mysql_fetch_object($q); + //grab the sponsor details, so we can do diff things for individual vs organization + $q=mysql_query("SELECT * FROM sponsors WHERE id='$sponsor_id'"); + $sponsor=mysql_fetch_object($q); if($contact != null){ $id = $contact["id"]; }else{ $id = "new"; - if($sponsor->donortype=="individual") { - list($firstname,$lastname)=split(" ",$sponsor->organization,2); - $contact['firstname']=$firstname; - $contact['lastname']=$lastname; - $contact['email']=$sponsor->email; - $contact['phonehome']=$sponsor->phone; - } - else { - $contact['phonework']=$sponsor->phone; - } + if($sponsor->donortype=="individual") { + list($firstname,$lastname)=split(" ",$sponsor->organization,2); + $contact['firstname']=$firstname; + $contact['lastname']=$lastname; + $contact['email']=$sponsor->email; + $contact['phonehome']=$sponsor->phone; + } + else { + $contact['phonework']=$sponsor->phone; + } - $contact['fax']=$sponsor->fax; - $contact['address']=$sponsor->address; - $contact['address2']=$sponsor->address2; - $contact['city']=$sponsor->city; - $contact['province']=$sponsor->province_code; - $contact['postalcode']=$sponsor->postalcode; + $contact['fax']=$sponsor->fax; + $contact['address']=$sponsor->address; + $contact['address2']=$sponsor->address2; + $contact['city']=$sponsor->city; + $contact['province']=$sponsor->province_code; + $contact['postalcode']=$sponsor->postalcode; - } + } echo "
\n"; echo "\n"; if($id == "new"){ echo "\n"; - $newcontactsearch="onkeypress=\"return newcontactsearch()\""; - $newcontactsave="id=\"contactnewsave\""; + $newcontactsearch="onkeypress=\"return newcontactsearch()\""; + $newcontactsave="id=\"contactnewsave\""; }else{ echo "\n"; echo "\n"; @@ -684,28 +687,28 @@ function draw_contact_form($sponsor_id, $contact = null){ - - + + - donortype=="individual") { - $d="disabled=\"disabled\""; - } - else $d=""; - ?> + donortype=="individual") { + $d="disabled=\"disabled\""; + } + else $d=""; + ?> value = ""> - + type="text" name="firstname" value = ""> type="text" name="lastname" value = ""> @@ -761,59 +764,61 @@ function draw_contact_form($sponsor_id, $contact = null){ function draw_activityinfo_form(){ - global $config; + global $config; $sponsorid = $_GET['id']; // we'll start by drawing the table header ?> - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - "; $q = mysql_query($query); - echo mysql_error(); + echo mysql_error(); if(mysql_num_rows($q)) { while($r = mysql_fetch_array($q)) { echo ""; @@ -822,7 +827,7 @@ function draw_activityinfo_form(){ echo ""; echo ""; echo "\n"; - } + } }else{ echo ""; } @@ -835,29 +840,28 @@ function draw_activityinfo_form(){ // Save an activity info log. function save_activityinfo($comment, $donorId, $userId, $type, $campaign_id=null){ - if($campaign_id) $cid="'$campaign_id'"; else $cid="NULL"; + if($campaign_id) $cid="'$campaign_id'"; else $cid="NULL"; - $query = "INSERT INTO fundraising_donor_logs (sponsors_id, dt, users_id, log, `type`, fundraising_campaigns_id) - VALUES ($donorId, - NOW(), - $userId, - '".mysql_real_escape_string($comment)."', - '".mysql_real_escape_string($type)."', - $cid)"; - - mysql_query($query); - echo mysql_error(); + $query = "INSERT INTO fundraising_donor_logs (sponsors_id, dt, users_id, log, `type`, fundraising_campaigns_id) + VALUES ($donorId, + NOW(), + $userId, + '".mysql_real_escape_string($comment)."', + '".mysql_real_escape_string($type)."', + $cid)"; + mysql_query($query); + echo mysql_error(); } function getDonationString($id) { global $config; $q=mysql_query("SELECT fundraising_donations.*, - fundraising_campaigns.name AS campaignname - FROM fundraising_donations - LEFT JOIN fundraising_campaigns ON fundraising_donations.fundraising_campaigns_id=fundraising_campaigns.id - WHERE fundraising_donations.id='$id' - AND fundraising_donations.fiscalyear='{$config['FISCALYEAR']}' - "); + fundraising_campaigns.name AS campaignname + FROM fundraising_donations + LEFT JOIN fundraising_campaigns ON fundraising_donations.fundraising_campaigns_id=fundraising_campaigns.id + WHERE fundraising_donations.id='$id' + AND fundraising_donations.fiscalyear='{$config['FISCALYEAR']}' + "); echo mysql_error(); $str=""; if($r=mysql_fetch_object($q)) { @@ -921,8 +925,8 @@ $(document).ready(function() { $("#organizationinfo_fundingselectiondate").datepicker({ dateFormat: 'yy-mm-dd'}); $("#organizationinfo_proposalsubmissiondate").datepicker({ dateFormat: 'yy-mm-dd'}); - //, showOn: 'button', buttonText: "" }); - open_search(); + //, showOn: 'button', buttonText: "" }); + open_search(); }); @@ -1004,7 +1008,7 @@ function update_organizationinfo() $("[name=waiveraccepted]").val([json.waiveraccepted]); $("[name=donortype]").val([json.donortype]); - donortypechange(); + donortypechange(); }); } @@ -1028,8 +1032,9 @@ function update_sponsorshipinfo() { var id=sponsor_id; $("#editor_tab_sponsorship").load("?action=sponsorshipinfo_load&id="+id, null,function() { - $(".date").datepicker({ dateFormat: 'yy-mm-dd' }); - }); + $(".date").datepicker({ dateFormat: 'yy-mm-dd' }); + $('.tableview').tablesorter(); + }); } function sponsorshipinfo_save() { @@ -1071,14 +1076,11 @@ function contactsinfo_delete(uid) { function update_activityinfo() { var id=sponsor_id; - $("#editor_tab_activity").load("?action=activityinfo_load&id="+id); - /* - var id=sponsor_id; - $.getJSON("?action=activityinfo_load&id="+id, - function(json){ - $("#sponsor_id").val(json.id); - }); - */ + $("#editor_tab_activity").load( + "?action=activityinfo_load&id="+id, + null, + function(){$('.tableview').tablesorter(); } + ); return false; } @@ -1094,21 +1096,22 @@ function activityinfo_save() { function donorsearch(realsearch) { $("#searchresults").show(); if(realsearch) - $("#searchresults").load("donors_search.php", $("#searchform").serializeArray()); + $("#searchresults").load("donors_search.php", $("#searchform").serializeArray(), function(){$('.tableview').tablesorter(); }); else - $("#searchresults").load("donors_search.php"); //, $("#searchform").serializeArray()); + $("#searchresults").load("donors_search.php", null, function(){$('.tableview').tablesorter(); }); //, $("#searchform").serializeArray()); + return false; } var searchtimer; function newcontactsearch() { - clearTimeout(searchtimer); - searchtimer=setTimeout('donewcontactsearch()',300); - return true; + clearTimeout(searchtimer); + searchtimer=setTimeout('donewcontactsearch()',300); + return true; } function donewcontactsearch() { - $("#newcontactsearch").load("?action=newcontactsearch",$("#contact_new").serializeArray()); + $("#newcontactsearch").load("?action=newcontactsearch",$("#contact_new").serializeArray()); } function useexistingcontact(uid) { @@ -1117,8 +1120,8 @@ function useexistingcontact(uid) { } function togglefulldonationhistory() { - $("#fulldonationhistory").toggle('slow'); - $("#thisyeardonationhistory").toggle('slow'); + $("#fulldonationhistory").toggle('slow'); + $("#thisyeardonationhistory").toggle('slow'); } function campaignchange() { @@ -1128,20 +1131,20 @@ function campaignchange() { } function donortypechange() { - if($("input[@name='donortype']:checked").val()=="organization") { - $("#organizationinfo_logo").attr("disabled",""); - $("#organizationinfo_donationpolicyurl").attr("disabled",""); - $("#organizationinfo_fundingselectiondate").attr("disabled",""); - $("#organizationinfo_proposalsubmissiondate").attr("disabled",""); - } - else if($("input[@name='donortype']:checked").val()=="individual") { - $("#organizationinfo_logo").attr("disabled","disabled"); - $("#organizationinfo_donationpolicyurl").attr("disabled","disabled"); - $("#organizationinfo_fundingselectiondate").attr("disabled","disabled"); - $("#organizationinfo_proposalsubmissiondate").attr("disabled","disabled"); - } - else { - } + if($("input[@name='donortype']:checked").val()=="organization") { + $("#organizationinfo_logo").attr("disabled",""); + $("#organizationinfo_donationpolicyurl").attr("disabled",""); + $("#organizationinfo_fundingselectiondate").attr("disabled",""); + $("#organizationinfo_proposalsubmissiondate").attr("disabled",""); + } + else if($("input[@name='donortype']:checked").val()=="individual") { + $("#organizationinfo_logo").attr("disabled","disabled"); + $("#organizationinfo_donationpolicyurl").attr("disabled","disabled"); + $("#organizationinfo_fundingselectiondate").attr("disabled","disabled"); + $("#organizationinfo_proposalsubmissiondate").attr("disabled","disabled"); + } + else { + } $("#organizationinfo_save_button").attr('disabled',''); } @@ -1162,20 +1165,20 @@ function removedonation(donationid,sponsorid) { "; +echo "
" onClick="return activityinfo_save()" /> +"; + echo "\n"; + $logtypes=array("Appeal","Phone Call","Email","Personal Visit","Other"); + foreach($logtypes AS $lt) { + echo "\n"; + } + echo "\n"; +?> + +"; + echo "\n"; + while($r=mysql_fetch_object($q)) { + echo "\n"; + } + echo "\n"; +?> +
" onClick="return activityinfo_save()" /> - "; - echo "\n"; - $logtypes=array("Appeal","Phone Call","Email","Personal Visit","Other"); - foreach($logtypes AS $lt) { - echo "\n"; - } - echo "\n"; - ?> - - "; - echo "\n"; - while($r=mysql_fetch_object($q)) { - echo "\n"; - } - echo "\n"; - ?> -
" . $query . "
" . $r["dt"] . "" . $r["campaignname"] . "" . $r["log"] . "
" . i18n("No records") . "
"; echo ""; echo ""; echo "
"; - echo "Add New Donor(s)/Sponsor(s)\n"; +echo "Add New Donor(s)/Sponsor(s)\n"; echo ""; - echo "View/Modify Donor(s)/Sponsor(s)\n"; +echo "View/Modify Donor(s)/Sponsor(s)\n"; echo "
"; echo "
"; @@ -1210,14 +1213,14 @@ echo "
"; - + - + - + - - + + @@ -1234,7 +1237,7 @@ echo "
";       - */ + */ ?> diff --git a/admin/donors_search.php b/admin/donors_search.php index 9d15bd8..3ad0fe7 100644 --- a/admin/donors_search.php +++ b/admin/donors_search.php @@ -78,12 +78,14 @@ } echo ""; + echo ""; echo ""; echo " "; echo " "; echo " "; echo " "; - echo "\n"; + echo ""; + echo "\n"; $x=0; @@ -118,5 +120,5 @@ echo "
".i18n("Donor/Sponsor")."".i18n("Total $ this year")."".i18n("Total $ last year")."".i18n("% change")."
\n"; - + ?> diff --git a/admin/fundraising.php b/admin/fundraising.php index bfcbcca..b122085 100644 --- a/admin/fundraising.php +++ b/admin/fundraising.php @@ -131,12 +131,12 @@ echo mysql_error(); if(mysql_num_rows($q)) { echo ""; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; while($r=mysql_fetch_object($q)) { $dq=mysql_query("SELECT organization AS name FROM sponsors WHERE id='$r->sponsors_id'"); @@ -217,11 +217,11 @@ $q=mysql_query("SELECT * FROM fundraising_campaigns WHERE followupdate>=NOW() OR echo mysql_error(); if(mysql_num_rows($q)) { echo "
".i18n("Name")."
".i18n("Name")."".i18n("Date Received")."".i18n("Amount")."".i18n("Generate Thank You")."".i18n("Thanked")."
"; - echo ""; + echo ""; echo " \n"; echo " \n"; echo " \n"; - echo "\n"; + echo "\n"; while($r=mysql_fetch_object($q)) { echo "\n"; } diff --git a/admin/fundraising_campaigns.php b/admin/fundraising_campaigns.php index 258b080..42fd00f 100644 --- a/admin/fundraising_campaigns.php +++ b/admin/fundraising_campaigns.php @@ -205,13 +205,15 @@ switch($_GET['action']){ $q=mysql_query("SELECT * FROM fundraising_campaigns WHERE id='$campaign_id' AND fiscalyear='{$config['FISCALYEAR']}'"); if($campaign=mysql_fetch_object($q)) { echo "
".i18n("Appeal")."".i18n("Start Date")."".i18n("Follow-Up Date")."
$r->name".format_date($r->startdate)."".format_date($r->followupdate)."
"; + echo ""; echo ""; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo "\n"; + echo ""; + echo "\n"; $q=mysql_query("SELECT * FROM fundraising_donations WHERE fundraising_campaigns_id='$campaign_id' AND status='received' ORDER BY datereceived DESC"); @@ -614,7 +616,11 @@ function update_tab_overview() { $("#campaign_tab_overview").load("?action=manage_tab_overview&id="+currentcampaignid); } function update_tab_donations() { - $("#campaign_tab_donations").load("?action=manage_tab_donations&id="+currentcampaignid); + $("#campaign_tab_donations").load( + "?action=manage_tab_donations&id="+currentcampaignid, + null, + function(){$('.tableview').tablesorter();} + ); } function update_tab_prospects() { $("#campaign_tab_prospects").load("?action=manage_tab_prospects&id="+currentcampaignid); diff --git a/admin/judges_teams_projects.php b/admin/judges_teams_projects.php index ad1b3b3..bdd2d7d 100644 --- a/admin/judges_teams_projects.php +++ b/admin/judges_teams_projects.php @@ -338,10 +338,10 @@ if( ($action=="edit" || $action=="assign" ) && $edit) echo ""; echo "
".i18n("Date")."".i18n("Donor/Sponsor")."".i18n("Purpose")."".i18n("Amount")."".i18n("Type of Support")."
"; - echo ""; + echo ""; echo ""; echo ""; - echo ""; + echo ""; $teams=getJudgingTeams(); foreach($teams AS $team) diff --git a/admin/registration_stats.php b/admin/registration_stats.php index 0790511..38f8f0d 100644 --- a/admin/registration_stats.php +++ b/admin/registration_stats.php @@ -162,12 +162,12 @@ else $wherestatus=""; echo ""; echo "
".i18n("Team")."".i18n("Timeslots and Projects")."

{$status_str[$showstatus]} - ".i18n("Students / projects per age category / division")."

"; echo ""; - echo ""; + echo ""; foreach($cats AS $c=>$cn) { echo ""; } echo ""; - echo ""; + echo ""; foreach($divs AS $d=>$dn) { echo ""; $tstud=0; @@ -218,12 +218,12 @@ else $wherestatus=""; echo ""; echo "
$cn
".i18n("Stud | Proj")."		".i18n("Total")."
".i18n("Stud | Proj")."
$dn

{$status_str[$showstatus]} - ".i18n("Students / projects per age category / school")."

"; echo ""; - echo ""; + echo ""; foreach($cats AS $c=>$cn) { echo ""; } echo ""; - echo ""; + echo ""; asort($schools_names); foreach($schools_names AS $id=>$sn) diff --git a/admin/reports.php b/admin/reports.php index 6d71b7a..617e3e2 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -254,7 +254,7 @@ $(document).ready(function() { $x++; if($last_category != $i->category) { /* New category */ - echo '"; $last_category = $i->category; diff --git a/admin/sponsor_contacts.php b/admin/sponsor_contacts.php index 3d3bc0c..5c9a9ee 100644 --- a/admin/sponsor_contacts.php +++ b/admin/sponsor_contacts.php @@ -181,14 +181,14 @@ if(mysql_num_rows($q)) { echo "
$cn
".i18n("Stud | Proj")."		".i18n("Total")."
".i18n("Stud | Proj")."

'; + echo '

'; if($edit_mode == true) echo i18n('Category').': '; echo "{$i->category}

"; - echo ""; + echo ""; echo " "; echo " "; echo " "; echo " "; echo " "; echo " "; - echo "\n"; + echo "\n"; while($r=mysql_fetch_object($q)) diff --git a/admin/students_info.php b/admin/students_info.php deleted file mode 100644 index 0a48c0e..0000000 --- a/admin/students_info.php +++ /dev/null @@ -1,89 +0,0 @@ - - Copyright (C) 2005 James Grant - Copyright (C) 2006 Justin Reardon - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ -?> -firstname,$studentinfo->lastname))); - - echo "
".i18n("Name")."".i18n("Email")."".i18n("Phone (Work)")."".i18n("Phone (Cell)")."".i18n("Primary")."Actions
\n"; - - echo "\n"; - echo " \n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; -echo "
".i18n("First Name")."$studentinfo->firstname".i18n("Last Name")."$studentinfo->lastname
".i18n("Grade")."$studentinfo->grade".i18n("Gender")."$studentinfo->sex
".i18n("Email Address")."$studentinfo->email".i18n("Phone")."$studentinfo->phone
".i18n("Address")."$studentinfo->address".i18n("City")."$studentinfo->city
".i18n($config['provincestate'])."$studentinfo->province"; - echo " ".i18n($config['postalzip'])."$studentinfo->postalcode
".i18n("Medical Information")."$studentinfo->medicalalert"; - echo " ".i18n("School")."$studentinfo->school
".i18n("Teacher Name")."$studentinfo->teachername"; - echo " ".i18n("Teacher Email")."$studentinfo->teacheremail
"; - } - else - { - send_popup_header("Student Information"); - echo error(i18n("No Student ID passed to Student Info")); - } - - send_popup_footer(); - -?> diff --git a/js/tablesorter/jquery.tablesorter.js b/js/tablesorter/jquery.tablesorter.js index f781334..d8b8d00 100644 --- a/js/tablesorter/jquery.tablesorter.js +++ b/js/tablesorter/jquery.tablesorter.js @@ -849,4 +849,4 @@ if(table.config.debug) { $.tablesorter.benchmark("Applying Zebra widget", time); } } }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/scripts/populate_fake.php b/scripts/populate_fake.php index 6907de7..79379eb 100644 --- a/scripts/populate_fake.php +++ b/scripts/populate_fake.php @@ -23,7 +23,7 @@ ?>