From 8497be84bfa6032244663657f84d1f36818035fd Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 25 Feb 2017 06:59:08 -0800 Subject: [PATCH 1/4] Updated Default Values --- demo/ChurchCRM-Database.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/ChurchCRM-Database.sql b/demo/ChurchCRM-Database.sql index b539cfacbf..0c17b49760 100644 --- a/demo/ChurchCRM-Database.sql +++ b/demo/ChurchCRM-Database.sql @@ -3,7 +3,7 @@ -- Host: localhost Database: churchcrm -- ------------------------------------------------------ -- Server version 5.5.46-0ubuntu0.14.04.2 --- Date: Sun, 15 Jan 2017 19:40:49 -0500 +-- Date: Sat, 25 Feb 2017 09:54:45 -0500 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -130,7 +130,7 @@ CREATE TABLE `config_cfg` ( LOCK TABLES `config_cfg` WRITE; /*!40000 ALTER TABLE `config_cfg` DISABLE KEYS */; SET autocommit=0; -INSERT INTO `config_cfg` VALUES (6,'sDirRoleHead','1'),(10,'aFinanceQueries','28,30,31,32'),(27,'sSMTPHost','127.0.0.1:1025'),(48,'bHideFriendDate',''),(49,'bHideFamilyNewsletter',''),(50,'bHideWeddingDate',''),(51,'bHideLatLon',''),(52,'bUseDonationEnvelopes',''),(58,'bUseScannedChecks',''),(65,'sTimeZone','America/Detroit'),(67,'cfgForceUppercaseZip',''),(72,'bEnableNonDeductible',''),(80,'sEnableSelfRegistration','1'),(999,'bRegistered',''),(1003,'sChurchName','Demo Church'),(1004,'sChurchAddress','123 Main St'),(1005,'sChurchCity','Kansas City,'),(1006,'sChurchState','MO'),(1007,'sChurchZip','64105'),(1008,'sChurchPhone','555 123 4234'),(1009,'sChurchEmail','demo@churchcrm.io'),(1010,'sHomeAreaCode','555'),(1014,'sTaxSigner','Elder Joe Smith'),(1016,'sReminderSigner','Elder Joe Smith'),(1025,'sConfirmSigner','Elder Joe Smith'),(1027,'sPledgeSummary2','as of'),(1028,'sDirectoryDisclaimer1','Every effort was made to insure the accuracy of this directory. If there are any errors or omissions, please contact the church office.This directory is for the use of the people of'),(1034,'sChurchChkAcctNum','111111111'),(1035,'sEnableGravatarPhotos',''),(1036,'sEnableExternalBackupTarget',''),(1037,'sExternalBackupType','WebDAV'),(1046,'sLastIntegrityCheckTimeStamp','2017-02-11 13:15:26'),(1047,'sChurchCountry','United States'); +INSERT INTO `config_cfg` VALUES (23,'sDefaultCountry','United States'),(27,'sSMTPHost','127.0.0.1:1025'),(10,'aFinanceQueries','28,30,31,32'),(28,'sSMTPAuth',''),(48,'bHideFriendDate',''),(49,'bHideFamilyNewsletter',''),(50,'bHideWeddingDate',''),(51,'bHideLatLon',''),(52,'bUseDonationEnvelopes',''),(58,'bUseScannedChecks',''),(65,'sTimeZone','America/Detroit'),(67,'cfgForceUppercaseZip',''),(72,'bEnableNonDeductible',''),(80,'sEnableSelfRegistration','1'),(999,'bRegistered',''),(1003,'sChurchName','Main St. Cathedral'),(1004,'sChurchAddress','123 Main St'),(1005,'sChurchCity','Kansas City'),(1006,'sChurchState','MO'),(1007,'sChurchZip','64106'),(1008,'sChurchPhone','555 123 4234'),(1009,'sChurchEmail','demo@churchcrm.io'),(1010,'sHomeAreaCode','555'),(1014,'sTaxSigner','Elder Joe Smith'),(1016,'sReminderSigner','Elder Joe Smith'),(1025,'sConfirmSigner','Elder Joe Smith'),(1027,'sPledgeSummary2','as of'),(1028,'sDirectoryDisclaimer1','Every effort was made to insure the accuracy of this directory. If there are any errors or omissions, please contact the church office.This directory is for the use of the people of'),(1034,'sChurchChkAcctNum','111111111'),(1035,'sEnableGravatarPhotos','1'),(1036,'sEnableExternalBackupTarget',''),(1037,'sExternalBackupType','WebDAV'),(1046,'sLastIntegrityCheckTimeStamp','2017-02-11 13:15:26'),(1047,'sChurchCountry','United States'),(21,'sDefaultCity','Kansas City'),(22,'sDefaultState','MO'); /*!40000 ALTER TABLE `config_cfg` ENABLE KEYS */; UNLOCK TABLES; COMMIT; @@ -1520,4 +1520,4 @@ COMMIT; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on: Sat, 11 Feb 2017 13:16:32 -0500 +-- Dump completed on: Sat, 25 Feb 2017 09:54:45 -0500 From b645b53e1a3326c3a1ba7e3b21496ad54f1e0a0e Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 25 Feb 2017 07:07:31 -0800 Subject: [PATCH 2/4] added select2 --- src/Include/FooterNotLoggedIn.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Include/FooterNotLoggedIn.php b/src/Include/FooterNotLoggedIn.php index 695feef8c3..bf9be557b9 100644 --- a/src/Include/FooterNotLoggedIn.php +++ b/src/Include/FooterNotLoggedIn.php @@ -6,6 +6,9 @@ © 2015-2017 ChurchCRM. . + + + From 99b0c1d0141e6a89d36c38b7725e2d84e8143cee Mon Sep 17 00:00:00 2001 From: George Dawoud Date: Sat, 25 Feb 2017 07:08:07 -0800 Subject: [PATCH 3/4] using memeber default & select 2 for country using memeber default city/state & select 2 --- .../templates/registration/family-register.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/external/templates/registration/family-register.php b/src/external/templates/registration/family-register.php index 0d59a95736..3113dccdb4 100644 --- a/src/external/templates/registration/family-register.php +++ b/src/external/templates/registration/family-register.php @@ -38,10 +38,10 @@
- +
- +
@@ -51,7 +51,7 @@
-
- + Date: Sat, 25 Feb 2017 07:11:02 -0800 Subject: [PATCH 4/4] Apply fixes from StyleCI (#1995) --- src/FamilyView.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/FamilyView.php b/src/FamilyView.php index 9714ce84be..3428d797c0 100644 --- a/src/FamilyView.php +++ b/src/FamilyView.php @@ -315,6 +315,7 @@ class="fa fa-plus-square"> @@ -323,12 +324,14 @@ class="fa fa-list-ul">
@@ -959,11 +962,13 @@ class="fa fa-cart-plus">
- 0 && !empty(SystemConfig::getValue('sSMTPHost'))) { ?> + 0 && !empty(SystemConfig::getValue('sSMTPHost'))) { + ?> - +