diff --git a/churchinfo/AddEvent.php b/churchinfo/AddEvent.php index 3526006c8a..a0a4c14e74 100644 --- a/churchinfo/AddEvent.php +++ b/churchinfo/AddEvent.php @@ -118,10 +118,10 @@
@@ -258,7 +258,7 @@ { extract($aRow); ?> - + @@ -275,7 +275,7 @@ { extract($aRow); ?> - + @@ -337,7 +337,7 @@ = gettext("To:") ?> | - " id="BirthdayDate2"> + " id="BirthdayDate2"> |
+
= $csvError ?>
= gettext("Check to confirm"); ?>
= gettext("Check to confirm") ?>
= gettext("Check to confirm") ?>
Important note: this will lose any canvasser assignments that have been made by hand.
"); ?> - + = gettext("Check to confirm"); ?>Important note: this will lose any "Ok To Canvass" fields that have been set by hand.
"); ?> - + = gettext("Check to confirm"); ?>Important note: this will lose any "Ok To Canvass" fields that have been set by hand.
"); ?> - + = gettext("Check to confirm"); ?>" . gettext("Canvasser:") . " | \n"; echo ""; @@ -197,37 +196,37 @@ } echo " | ||
= gettext("Date:") ?> | -+ | = $sDateError ?> | |
- | + | = gettext("Positive") ?> | +|
- | + | = gettext("Critical") ?> | +|
- | + | = gettext("Insightful") ?> | +|
- | + | = gettext("Financial") ?> | +|
- | + | = gettext("Suggestions") ?> | +|
- | + | = gettext("Why Not Interested?"); ?> | +
" . gettext("Your cart is empty!") . "
"; require "Include/Footer.php"; ?> diff --git a/churchinfo/CartToFamily.php b/churchinfo/CartToFamily.php index 6d52614005..aebe632d3c 100644 --- a/churchinfo/CartToFamily.php +++ b/churchinfo/CartToFamily.php @@ -203,7 +203,7 @@= gettext("If adding a new family, enter data below."); ?>
->
+">
--= gettext("OR") ?>--
= gettext("Create a New Group") ?>
diff --git a/churchinfo/CartView.php b/churchinfo/CartView.php
index 72fd340733..9e3336cd08 100644
--- a/churchinfo/CartView.php
+++ b/churchinfo/CartView.php
@@ -38,17 +38,17 @@
// Set the page title and include HTML header
$sPageTitle = gettext("View Your Cart");
-require "Include/Header.php";?>
+require "Include/Header.php"; ?>
= gettext("You have no items in your cart.") ;?>
+ if (!array_key_exists("Message", $_GET)) { ?> += gettext("You have no items in your cart.") ; ?>
-= $_GET["iCount"].' '.($_GET["iCount"] == 1 ? "Record":"Records").' Emptied into Event ID:'.$_GET["iEID"] ;?>
+= $_GET["iCount"].' '.($_GET["iCount"] == 1 ? "Record":"Records").' Emptied into Event ID:'.$_GET["iEID"] ; ?>
16) { ?>- | " name="Submit"> | +" name="Submit"> |
- class="btn">
+ " class="btn">
--= gettext("OR") ?>--
= gettext("Add New Event") ?>
@@ -104,7 +104,7 @@
extract($aRow);
?>
@@ -120,9 +120,9 @@ | - Name="Verify" onclick="javascript:document.location='Checkin.php';"> - name="Exit" onClick="javascript:document.location='Checkin.php';"> - name="Add" onClick="javascript:document.location='PersonEditor.php';"> | + " Name="Verify" onclick="javascript:document.location='Checkin.php';"> + " name="Exit" onClick="javascript:document.location='Checkin.php';"> + " name="Add" onClick="javascript:document.location='PersonEditor.php';">
@@ -166,7 +166,7 @@
+ ?>
|
@@ -180,9 +180,9 @@
|
name="Cancel" onClick="javascript:document.location='Checkin.php';"> | -name="CheckIn" onClick="javascript:document.location='Checkin.php';"> | - +" name="Cancel" onClick="javascript:document.location='Checkin.php';"> | +" name="CheckIn" onClick="javascript:document.location='Checkin.php';"> | +
name="Cancel" onClick="javascript:document.location='Checkin.php';"> | - -name="VerifyCheckOut" onClick="javascript:document.location='Checkin.php';"> | +" name="Cancel" onClick="javascript:document.location='Checkin.php';"> | + +" name="VerifyCheckOut" onClick="javascript:document.location='Checkin.php';"> |
= gettext("Name") ?> | = gettext("Checked In Time") ?> | @@ -371,15 +371,15 @@= gettext("Action") ?> | = $checkout_date ?> | = $sCheckoutby ?> |
-
+
|
+
-
= gettext("No Attendees Assigned to Event") ?> |
- + | ".gettext("Deposit Type:")." | "; if ($sDepositType == "BankDraft") $selectBankDraft = "Checked "; @@ -626,8 +626,8 @@ } else { echo ""; } - ?> - + ?> +||||||||||
= gettext("Comment:") ?> | @@ -636,7 +636,7 @@ | ||||||||||
= gettext("Closed:") ?> | >= gettext("Close deposit slip (remember to press Save)") ?> -" . gettext("Important note: failed transactions will be deleted permanantly when the deposit slip is closed.") . ""; } @@ -730,7 +730,7 @@ if (array_key_exists($plg_GroupKey, $depositHash)) { // add/tweak fields so existing key'ed record contains information of new record - + // we could coherency check checkNo, famID, and date, but we won't since I don't know how we'd surface the error list($e_plg_CheckNo, $e_plg_famID, $e_plg_date, $e_plg_FYID, $e_plg_amount, $e_fundName, $e_plg_comment, $e_plg_aut_Cleared, $e_plg_NonDeductible) = explode("|", $depositHash[$plg_GroupKey]); @@ -771,31 +771,31 @@ $sRowClass = "PaymentRowColorA"; else $sRowClass = "PaymentRowColorB"; - ?> + ?> - | ||||||||||
- + = $FamilyName ?> | - + = $plg_date ?> | - + = MakeFYString ($plg_FYID) ?> | - + = $plg_CheckNo ?> | - + = $fundName ?> | - + = $plg_amount ?> | - + = $plg_NonDeductible ?> | = $plg_method ?> @@ -810,19 +810,19 @@ | - ">View + ">View | - ">Edit + ">Edit | - ">Delete + ">Delete | - ">Details + ">Details |
= gettext("Which role is the head of household?") ?> | @@ -171,27 +171,27 @@ | ||||||||||
= gettext("Information to Include:") ?> |
- - - + = gettext("Address") ?> + = gettext("Wedding Date") ?> + = gettext("Birthday") ?> - - - - + = gettext("Family Home Phone") ?> + = gettext("Family Work Phone") ?> + = gettext("Family Cell Phone") ?> + = gettext("Family Email") ?> - - - - - - - = gettext("Personal Home Phone") ?> + = gettext("Personal Work Phone") ?> + = gettext("Personal Cell Phone") ?> + = gettext("Personal Email") ?> + = gettext("Personal Work/Other Email") ?> + = gettext("Photos") ?> + 0) { - while ( $rowCustomField = mysql_fetch_array($rsCustomFields, MYSQL_ASSOC) ){ + while ( $rowCustomField = mysql_fetch_array($rsCustomFields, MYSQL_ASSOC) ){ if (($aSecurityType[$rowCustomField['custom_FieldSec']] == 'bAll') or ($_SESSION[$aSecurityType[$rowCustomField['custom_FieldSec']]])) { ?> - + = $rowCustomField['custom_Name'] ?> | ||||||||||
= gettext("Church Name") ?> | -+ | ||||||||||
= gettext("Address") ?> | -+ | ||||||||||
= gettext("City") ?> | -+ | ||||||||||
= gettext("State") ?> | -+ | ||||||||||
= gettext("Zip") ?> | -+ | ||||||||||
= gettext("Phone") ?> | -+ | ||||||||||
= gettext("Disclaimer") ?> | -+ |
->
+">
onclick="javascript:document.location='Menu.php';">
= gettext("Buyer:") ?> | @@ -269,48 +269,48 @@ echo ">" . $pn_Num . ":" . $buyerFirstName . " " . $buyerLastName; } } ?> - + | ||
= gettext("Final Price:") ?> | |||
= gettext("Replicate item") ?> | - | " name="DonatedItemReplicate" onclick="javascript:document.location='DonatedItemReplicate.php?DonatedItemID=&Count='+NumberCopies.value"> | +" name="DonatedItemReplicate" onclick="javascript:document.location='DonatedItemReplicate.php?DonatedItemID== $iDonatedItemID ?>&Count='+NumberCopies.value"> |
- | + | = gettext("Description"); ?> | +|
- | + | = gettext("Picture URL"); ?> | +|
- | + + |
" value="= htmlentities(stripslashes($aNameFields[$row]),ENT_NOQUOTES, "UTF-8") ?>" size="20" maxlength="30">
" . gettext("You must enter a name.") . " "; - ?> + ?> |
" value="= htmlentities(stripslashes($aDescFields[$row]),ENT_NOQUOTES, "UTF-8") ?>" size="40" maxlength="100"> | - " value="1" >= gettext("Yes") ?> - " value="0" >= gettext("No") ?> + >= gettext("Yes") ?> + >= gettext("No") ?> | - " Name="delete" onclick="confirmDeleteFund(= "'" . $aIDFields[$row] . "'" ?>);" > + " Name="delete" onclick="confirmDeleteFund('= $aIDFields[$row] ?>');" > | ||||||
- Name="SaveChanges"> + " Name="SaveChanges"> | - Name="AddField"> + " Name="AddField"> | @@ -270,4 +270,4 @@ function confirmDeleteFund( Fund ) { - + diff --git a/churchinfo/EditEventAttendees.php b/churchinfo/EditEventAttendees.php index b63fef4163..c7a631b08b 100644 --- a/churchinfo/EditEventAttendees.php +++ b/churchinfo/EditEventAttendees.php @@ -22,7 +22,6 @@ $dpeSQL = "DELETE FROM event_attend WHERE event_id=$dpeEventID AND person_id=$dpePerID LIMIT 1"; RunQuery($dpeSQL); $ShowAttendees = 1; - } // Construct the form ?> @@ -36,69 +35,69 @@ | |||||||
|
|||||||||
Name="Exit" onclick="javascript:document.location='Menu.php';"> | -|||||||||
" Name="Exit" onclick="javascript:document.location='Menu.php';"> | + +|||||||||
= gettext("Name") ?> | = gettext("Email") ?> | = gettext("Home Phone") ?> | = gettext("Action") ?> | ||||||
= FormatFullName($per_Title,$per_FirstName,$per_MiddleName,$per_LastName,$per_Suffix,3) ?> | -'.$sEmail.'':'Not Available'); ?> | -= ($sHomePhone ? $sHomePhone :'Not Available') ?> | += $sEmail ? '' . $sEmail . '' : 'Not Available' ?> | += $sHomePhone ? $sHomePhone : 'Not Available' ?> |
|
+
||||
= gettext("No Attendees Assigned to Event") ?> |
Name="Exit" onclick="javascript:document.location='Menu.php';"> | +" Name="Exit" onclick="javascript:document.location='Menu.php';"> |
Name="Exit" onclick="javascript:document.location='ReportList.php';"> | +" Name="Exit" onclick="javascript:document.location='ReportList.php';"> |
Name="Exit" onclick="javascript:document.location='Menu.php';"> | +" Name="Exit" onclick="javascript:document.location='Menu.php';"> | ||||||
*'.gettext(' are required'); + echo gettext('Items with a ') . '*' . gettext(' are required'); } ?> | |||||||
*= gettext("Event Type:") ?> | +*= gettext("Event Type:") ?> | @@ -429,12 +429,12 @@ | |||||
*= gettext("Event Title:") ?> | +*= gettext("Event Title:") ?> | " . gettext("You must enter a title.") . ""; ?> | -*= gettext("Event Desc:") ?> | +*= gettext("Event Desc:") ?> | " . gettext("You must enter a description.") . ""; ?> @@ -442,14 +442,14 @@ | ||
* + | * = gettext("Start Date:") ?> | " . gettext("You must enter a start date.") . ""; ?> | -* + | * = gettext("Start Time:") ?> | @@ -491,9 +491,9 @@ ?> | ||
= ($aCountName[$c].": ") ?> | - - - + + + | ||||||
*= gettext("Event Status:") ?> | +*= gettext("Event Status:") ?> | - > Active > Inactive + > Active > Inactive " . gettext("Is this Active or Inactive?") . ""; ?> | |||||
class="btn"> | +" class="btn"> |
Name="Exit" onclick="javascript:document.location='Menu.php';"> | +" Name="Exit" onclick="javascript:document.location='Menu.php';"> |
- + | - + | - + | - + | @@ -1000,13 +1000,13 @@ | - | @@ -1014,15 +1014,15 @@ - + ?> + + ?>@@ -1074,6 +1074,4 @@ $("#WeddingDate").datepicker({format:'yyyy-mm-dd'}); - + diff --git a/churchinfo/FamilyList.php b/churchinfo/FamilyList.php index ac6ed26faa..2e4fa9fcbf 100644 --- a/churchinfo/FamilyList.php +++ b/churchinfo/FamilyList.php @@ -46,19 +46,19 @@ extract($aRow); ?> | |||||||
+ | - + - | + = $fam_Name ?> ".$fam_HomePhone.""; echo "".$fam_Address1." ".$fam_Address2." | "; diff --git a/churchinfo/FamilyView.php b/churchinfo/FamilyView.php index 336205b0f3..01c649d95e 100644 --- a/churchinfo/FamilyView.php +++ b/churchinfo/FamilyView.php @@ -185,9 +185,9 @@ function getFamilyPhoto($iFamilyID) { ?>- + = getRoleLabel($Row["sFamRole"]) ?> | - + = FormatBirthDate($Row["per_BirthYear"], $Row["per_BirthMonth"], $Row["per_BirthDay"],"-",$Row["per_Flags"]) ?> |
= gettext("Assign a New Property:") ?>
-
+ = $payType ?>
|
-
+ = $aut_NextPayDate ?>
|
-
+ = $aut_Amount ?>
|
-
+ = $aut_Interval ?>
|
-
+ = $fundName ?>
|
- Edit
+ Edit
|
- Delete
+ Delete
|
= $aut_DateLastEdited ?>
@@ -572,7 +572,7 @@ function getFamilyPhoto($iFamilyID) {
| |
- = gettext("Add a new automatic payment") ?> + = gettext("Add a new automatic payment") ?>
@@ -650,29 +650,29 @@ function getFamilyPhoto($iFamilyID) { $sRowClass = "PaymentRowColorB"; } - ?> + ?> -- = gettext("Add a new pledge") ?> - = gettext("Add a new payment") ?> + = gettext("Add a new pledge") ?> + = gettext("Add a new payment") ?>
@@ -712,7 +712,7 @@ function getFamilyPhoto($iFamilyID) {- = MakeFYString ($_SESSION['idefaultFY']) . gettext(" Canvass Entry") ?> + = MakeFYString ($_SESSION['idefaultFY']) . gettext(" Canvass Entry") ?>
@@ -735,7 +735,7 @@ function getFamilyPhoto($iFamilyID) { //Loop through all the notes while($aRow = mysql_fetch_array($rsNotes)){ extract($aRow); - ?> + ?>