From 027c03b297fd4457223f46cc2ec96bfb6cce2419 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Wed, 14 Oct 2009 19:53:09 +0000
Subject: [PATCH] - commit all outstanding changes

---
 common.inc.php       |  2 +-
 db/db.update.146.sql |  7 ++++++-
 tableeditor.css      | 14 ++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common.inc.php b/common.inc.php
index d03fbdb..f53881b 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -461,7 +461,7 @@ if(is_array($nav)) {
 					echo "<li><h4 style=\"text-align: center;\">".i18n("Fundraising")."</h4></li>\n";
 					echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/fundraising.php\">".i18n("Fundraising Dashboard").'</a></li>';
 					echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/fundraising_setup.php\">".i18n("Fundraising Setup").'</a></li>';
-					echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/fundraising_campaigns.php\">".i18n("Manage Appeal").'</a></li>';
+					echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/fundraising_campaigns.php\">".i18n("Manage Appeals").'</a></li>';
 					echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/donors.php\">".i18n("Manage Donors/Sponsors").'</a></li>';
 					echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/reports.php?area=fundraising\">".i18n("Fundraising Reports").'</a></li>';
 					echo "</ul><br />\n";
diff --git a/db/db.update.146.sql b/db/db.update.146.sql
index 75b9aa3..5ad7019 100644
--- a/db/db.update.146.sql
+++ b/db/db.update.146.sql
@@ -53,7 +53,12 @@ UPDATE `reports_items` SET field = 'school_principal' WHERE field = 'school_cont
 UPDATE `reports_items` SET field = 'school_phone' WHERE field = 'school_contactphone';
 UPDATE `reports_items` SET field = 'school_email' WHERE field = 'school_contactemail';
 
-UPDATE `reports` SET `desc` = 'List of all schools in the database. Name, address, principal and phone.' WHERE `reports`.`system_report_id` =35  ;
+UPDATE `reports` SET `desc` = 'List of all schools in the database. Name, address, principal and phone.' WHERE `reports`.`system_report_id` =35;
 
 ALTER TABLE `fundraising_donations` ADD `supporttype` VARCHAR( 255 ) NOT NULL;
 
+ALTER TABLE `emails` CHANGE `type` `type` ENUM( 'system', 'user', 'fundraising' ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'system';
+ALTER TABLE `emails` ADD `fundraising_campaigns_id` INT UNSIGNED NULL DEFAULT NULL ,
+ADD `lastsent` DATETIME NULL DEFAULT NULL;
+ALTER TABLE `emails` ADD `bodyhtml` TEXT NULL DEFAULT NULL AFTER `body`;
+ALTER TABLE `emails` DROP INDEX `val`; 
diff --git a/tableeditor.css b/tableeditor.css
index d1a93d2..839cbfa 100644
--- a/tableeditor.css
+++ b/tableeditor.css
@@ -38,7 +38,8 @@ input {
 	font-weight: bold;
 	text-align: center;
 	color: #FFFFFF;
-	background-color: #5C6F90; 
+	/*background-color: #1B86B7; */
+	background-color: #1B86B7; 
 	padding: 3px;
 }
 
@@ -82,7 +83,8 @@ input {
 	font-weight: bold;
 	text-align: left;
 	color: #FFFFFF;
-	background-color: #5C6F90; 
+	/*background-color: #1B86B7; */
+	background-color: #1B86B7; 
 	padding: 1px;
 	vertical-align: top;
 }
@@ -95,7 +97,7 @@ input {
 	font-size: 0.8em;
 	border: 0px;
 	border-collapse: collapse;
-/*	width: 100%;*/
+	width: 95%;
 }
 
 .editor td {
@@ -106,7 +108,7 @@ input {
  * so that the text is in the middle of the first line compared
  * to an input box */
 .editor td.label {
-	width: 25%;
+/*	width: 25%;*/
 	text-align: right;
 /*	padding-right: 5px;
 	padding-top: 5px;*/
@@ -114,7 +116,7 @@ input {
 }
 
 .editor td.input {
-	width: 75%;
+/*	width: 75%;*/
 	text-align: left;
 	vertical-align: middle;
 }
@@ -123,7 +125,7 @@ input {
 	font-weight: bold;
 	text-align: left;
 	color: #FFFFFF;
-	background-color: #5C6F90; 
+	background-color: #1B86B7; 
 	padding: 1px;
 	vertical-align: top;
 }