Skip to content

Commit

Permalink
Merge pull request #1996 from ChurchCRM/self-reg-defaults
Browse files Browse the repository at this point in the history
Self Registration default values Defaults #1167
  • Loading branch information
crossan007 authored Feb 26, 2017
2 parents 65d9396 + 6da807d commit 1565709
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions demo/ChurchCRM-Database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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 */;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/Include/FooterNotLoggedIn.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<strong><?= gettext('Copyright') ?> &copy; 2015-2017 <a href="http://www.churchcrm.io" target="_blank"><b>Church</b>CRM</a>.</strong> <?= gettext('All rights reserved')?>.
</div>


<script src="<?= SystemURLs::getRootPath() ?>/skin/adminlte/plugins/select2/select2.full.min.js"></script>

<!-- Bootstrap 3.3.5 -->
<script src="<?= SystemURLs::getRootPath() ?>/skin/adminlte/bootstrap/js/bootstrap.min.js"></script>
<!-- iCheck -->
Expand Down
12 changes: 8 additions & 4 deletions src/external/templates/registration/family-register.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<div class="form-group has-feedback">
<div class="row">
<div class="col-lg-6">
<input name="familyCity" class="form-control" placeholder="<?= gettext('City') ?>" required>
<input name="familyCity" class="form-control" placeholder="<?= gettext('City') ?>" required value="<?= SystemConfig::getValue('sDefaultCity') ?>">
</div>
<div class="col-lg-6">
<input name="familyState" class="form-control" placeholder="<?= gettext('State') ?>" required>
<input name="familyState" class="form-control" placeholder="<?= gettext('State') ?>" required value="<?= SystemConfig::getValue('sDefaultState') ?>">
</div>
</div>
</div>
Expand All @@ -51,7 +51,7 @@
<input name="familyZip" class="form-control" placeholder="<?= gettext('Zip') ?>" required>
</div>
<div class="col-lg-9">
<select name="familyCountry" class="form-control">
<select id="familyCountry" class="form-control select2">
<?php foreach (Countries::getNames() as $county) {
?>
<option value="<?= $county ?>" <?php if (SystemConfig::getValue('sDefaultCountry') == $county) {
Expand Down Expand Up @@ -102,7 +102,11 @@
</div>
<!-- /.form-box -->
</div>

<script type="text/javascript">
$(document).ready(function() {
$("#familyCountry").select2();
});
</script>
<?php
// Add the page footer
require(SystemURLs::getDocumentRoot(). "/Include/FooterNotLoggedIn.php");

0 comments on commit 1565709

Please sign in to comment.