From ebf2b57bca91b8bc7f1d9bf76059744dba42c457 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 29 Oct 2014 15:16:09 +1300 Subject: [PATCH] whitespace fixups --- api/v3/Contribution.php | 2 +- api/v3/Country.php | 2 +- api/v3/Generic/Getlist.php | 4 +- css/civicrm.css | 2 +- sql/civicrm_upgradedb_v1.6_v1.7_41.mysql | 54 +++++------ sql/civicrm_upgradedb_v1.7_v1.8_41.mysql | 92 +++++++++---------- templates/CRM/Form/basicForm.tpl | 4 +- templates/CRM/Grant/Page/Tab.tpl | 4 +- templates/CRM/Mailing/Form/Subscribe.tpl | 2 +- templates/CRM/Profile/Form/Dynamic.tpl | 2 +- .../Page/MultipleRecordFieldsListing.tpl | 2 +- templates/CRM/common/jsortable.tpl | 2 +- tools/bin/scripts/ajax.php | 4 +- tools/bin/scripts/runStressTest.sh.txt | 8 +- tools/templates/CRM/Auction/Page/Item.tpl | 8 +- .../contribution_offline_receipt_html.tpl | 2 +- .../contribution_online_receipt_html.tpl | 2 +- .../event_offline_receipt_text.tpl | 2 +- .../event_online_receipt_text.tpl | 2 +- 19 files changed, 100 insertions(+), 100 deletions(-) diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php index 64ced69349..68840577b2 100644 --- a/api/v3/Contribution.php +++ b/api/v3/Contribution.php @@ -69,7 +69,7 @@ function civicrm_api3_contribution_create(&$params) { // make sure tax calculation is handled via api $params = CRM_Contribute_BAO_Contribution::checkTaxAmount($params); - + return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'Contribution'); } diff --git a/api/v3/Country.php b/api/v3/Country.php index f1954810bb..cd397385af 100644 --- a/api/v3/Country.php +++ b/api/v3/Country.php @@ -56,7 +56,7 @@ function civicrm_api3_country_create($params) { /** * Adjust Metadata for Create action - * + * * The metadata is used for setting defaults, documentation & validation * @param array $params array or parameters determined by getfields */ diff --git a/api/v3/Generic/Getlist.php b/api/v3/Generic/Getlist.php index b7383bb0f7..8f27f2cf28 100644 --- a/api/v3/Generic/Getlist.php +++ b/api/v3/Generic/Getlist.php @@ -34,9 +34,9 @@ function civicrm_api3_generic_getList($apiRequest) { $entity = _civicrm_api_get_entity_name_from_camel($apiRequest['entity']); $request = $apiRequest['params']; - + _civicrm_api3_generic_getList_defaults($entity, $request); - + // Hey api, would you like to format the search params? $fnName = "_civicrm_api3_{$entity}_getlist_params"; $fnName = function_exists($fnName) ? $fnName : '_civicrm_api3_generic_getlist_params'; diff --git a/css/civicrm.css b/css/civicrm.css index 528c269859..bfdcd47499 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -4559,6 +4559,6 @@ span.crm-status-icon { padding: 5px 8px; text-align: center; border-radius: 2px; - cursor: pointer; + cursor: pointer; font-size: 11px !important; } diff --git a/sql/civicrm_upgradedb_v1.6_v1.7_41.mysql b/sql/civicrm_upgradedb_v1.6_v1.7_41.mysql index a9569a7992..70d365600e 100644 --- a/sql/civicrm_upgradedb_v1.6_v1.7_41.mysql +++ b/sql/civicrm_upgradedb_v1.6_v1.7_41.mysql @@ -49,12 +49,12 @@ CREATE TABLE civicrm_event ( is_monetary tinyint DEFAULT 0 COMMENT 'Is this a PAID event? If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.', contribution_type_id int unsigned DEFAULT 0 COMMENT 'Contribution type assigned to paid event registrations for this event. Required if is_monetary is true.', is_map tinyint DEFAULT 0 COMMENT 'Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?', - is_active tinyint DEFAULT 0 COMMENT 'Is this Event enabled or disabled/cancelled?' + is_active tinyint DEFAULT 0 COMMENT 'Is this Event enabled or disabled/cancelled?' , PRIMARY KEY ( id ) -, +, CONSTRAINT FK_civicrm_event_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -81,10 +81,10 @@ CREATE TABLE civicrm_event_page ( default_fee_id int unsigned NOT NULL COMMENT 'FK to civicrm_custom_option.', thankyou_title varchar(255) DEFAULT NULL COMMENT 'Title for ThankYou page.', thankyou_text text COMMENT 'ThankYou Text.', - thankyou_footer_text text COMMENT 'Footer message.' + thankyou_footer_text text COMMENT 'Footer message.' , PRIMARY KEY ( id ) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -103,14 +103,14 @@ CREATE TABLE civicrm_participant ( register_date datetime COMMENT 'When did contact register for event?', source varchar(128) COMMENT 'Source of this event registration.', event_level varchar(255) COMMENT 'Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that we store the label value rather than an FK as the label stored in custom_option may change, but we dont want that to change the label in place at time of this registration.', - is_test tinyint DEFAULT 0 + is_test tinyint DEFAULT 0 , PRIMARY KEY ( id ) -, +, CONSTRAINT FK_civicrm_participant_contact_id FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id) -, +, CONSTRAINT FK_civicrm_participant_event_id FOREIGN KEY (event_id) REFERENCES civicrm_event(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -124,16 +124,16 @@ CREATE TABLE civicrm_participant_payment ( id int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Participant Payment Id', participant_id int unsigned NOT NULL COMMENT 'Participant Id (FK)', payment_entity_table varchar(128) COMMENT 'Table being referenced for payment entity (expected usage is civicrm_contribution).', - payment_entity_id int unsigned NOT NULL COMMENT 'FK to table with payment record (e.g. civicrm_contribution.id).' + payment_entity_id int unsigned NOT NULL COMMENT 'FK to table with payment record (e.g. civicrm_contribution.id).' , PRIMARY KEY ( id ) -, +, CONSTRAINT FK_civicrm_participant_payment_participant_id FOREIGN KEY (participant_id) REFERENCES civicrm_participant(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* --- * +-- * -- * civicrm_currency -- * -- *******************************************************/ @@ -142,14 +142,14 @@ CREATE TABLE civicrm_currency ( id int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Currency Id', name varchar(64) COMMENT 'Currency Name', - symbol varchar(8) COMMENT 'Currency Symbol' + symbol varchar(8) COMMENT 'Currency Symbol' , PRIMARY KEY ( id ) ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* --- * --- * Insert sample data to +-- * +-- * Insert sample data to -- * -- *******************************************************/ INSERT INTO `civicrm_currency` VALUES (1,'AUD','$'),(2,'CAD','$'),(3,'EUR','€'),(4,'GBP','£'),(5,'ILS','₪'),(6,'INR','₨'),(7,'JPY','¥'),(8,'KRW','₩'),(9,'LAK','₭'),(10,'MNT','₮'),(11,'NGN','₦'),(12,'PLN','zł'),(13,'THB','฿'),(14,'USD','$'),(15,'VND','₫'),(16,'ZAR','R'); @@ -170,7 +170,7 @@ CREATE TABLE civicrm_currency ( -- * civicrm_contact -- * -- *******************************************************/ - + ALTER TABLE `civicrm_contact` ADD INDEX `UI_external_identifier` (`external_identifier`); -- /******************************************************* @@ -193,7 +193,7 @@ CREATE TABLE civicrm_currency ( -- /******************************************************* -- * -- * civicrm_custom_value --- * +-- * -- *******************************************************/ ALTER TABLE `civicrm_custom_value` MODIFY float_data double NULL DEFAULT NULL COMMENT 'stores data for ext property data_type = float.'; @@ -238,7 +238,7 @@ CREATE TABLE civicrm_currency ( -- * -- *******************************************************/ - ALTER TABLE civicrm_mapping_field ADD `relationship_direction` varchar(6) NULL DEFAULT NULL COMMENT ''; + ALTER TABLE civicrm_mapping_field ADD `relationship_direction` varchar(6) NULL DEFAULT NULL COMMENT ''; UPDATE `civicrm_mapping_field` SET `relationship_direction`='a_b'; @@ -260,7 +260,7 @@ CREATE TABLE civicrm_currency ( ALTER TABLE `civicrm_contribution` ADD INDEX `received_date` (`receive_date`); ALTER TABLE `civicrm_contribution` ADD `amount_level` varchar(255) NULL DEFAULT NULL COMMENT '' AFTER source; - ALTER TABLE `civicrm_contribution` DROP `note`; + ALTER TABLE `civicrm_contribution` DROP `note`; -- /******************************************************* -- * @@ -270,7 +270,7 @@ CREATE TABLE civicrm_currency ( ALTER TABLE `civicrm_uf_group` ADD `is_uf_link` tinyint(4) NULL DEFAULT '0' COMMENT 'Should we display a link to the website profile in profile selector' AFTER is_edit_link; ALTER TABLE `civicrm_uf_group` ADD `is_update_dupe` tinyint(4) NULL DEFAULT '0' COMMENT 'Should we update the contact record if we find a duplicate' AFTER is_uf_link; - + -- /******************************************************* -- * -- * civicrm_uf_match @@ -326,12 +326,12 @@ CREATE TABLE civicrm_currency ( -- *******************************************************/ SELECT @domain_id := id from civicrm_domain; - INSERT INTO `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) - VALUES + INSERT INTO `civicrm_option_group` (`domain_id`, `name`, `description`, `is_reserved`, `is_active`) + VALUES (@domain_id, 'participant_status', 'Participant Status', 0, 1), (@domain_id, 'participant_role', 'Participant Role', 0, 1), (@domain_id, 'event_type', 'Event Type', 0, 1); - + -- /******************************************************* -- * @@ -342,8 +342,8 @@ CREATE TABLE civicrm_currency ( SELECT @option_group_id_ps := max(id) from civicrm_option_group where name = 'participant_status'; SELECT @option_group_id_pRole := max(id) from civicrm_option_group where name = 'participant_role'; SELECT @option_group_id_etype := max(id) from civicrm_option_group where name = 'event_type'; - - INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) + + INSERT INTO `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`) VALUES (@option_group_id_ps, 'Registered', 1, 'Registered', NULL, 0, NULL, 1, NULL, 0, 1, 1), (@option_group_id_ps, 'Attended', 2, 'Attended', NULL, 0, NULL, 2, NULL, 0, 0, 1), @@ -354,7 +354,7 @@ CREATE TABLE civicrm_currency ( (@option_group_id_pRole, 'Volunteer', 2, 'Volunteer', NULL, 0, NULL, 2, NULL, 0, 0, 1), (@option_group_id_pRole, 'Host', 3, 'Host', NULL, 0, NULL, 3, NULL, 0, 0, 1), (@option_group_id_pRole, 'Speaker', 4, 'Speaker', NULL, 0, NULL, 4, NULL, 0, 0, 1), - + (@option_group_id_etype, 'Conference', 1, 'Conference', NULL, 0, NULL, 1, NULL, 0, 0, 1 ), (@option_group_id_etype, 'Exhibition', 2, 'Exhibition', NULL, 0, NULL, 2, NULL, 0, 0, 1 ), (@option_group_id_etype, 'Fundraiser', 3, 'Fundraiser', NULL, 0, NULL, 3, NULL, 0, 0, 1 ), diff --git a/sql/civicrm_upgradedb_v1.7_v1.8_41.mysql b/sql/civicrm_upgradedb_v1.7_v1.8_41.mysql index 34a529cd71..d6b6c1eac7 100644 --- a/sql/civicrm_upgradedb_v1.7_v1.8_41.mysql +++ b/sql/civicrm_upgradedb_v1.7_v1.8_41.mysql @@ -40,12 +40,12 @@ CREATE TABLE civicrm_dedupe_rule_group ( id int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe rule group id', domain_id int unsigned NOT NULL COMMENT 'The id of the domain this rule group belongs to', contact_type enum('Individual', 'Organization', 'Household') COMMENT 'The type of contacts this group applies to', - threshold int NOT NULL COMMENT 'The weight threshold the sum of the rule weights has to cross to consider two contacts the same' + threshold int NOT NULL COMMENT 'The weight threshold the sum of the rule weights has to cross to consider two contacts the same' , PRIMARY KEY ( id ) , CONSTRAINT FK_civicrm_dedupe_rule_group_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -62,12 +62,12 @@ CREATE TABLE civicrm_dedupe_rule ( rule_table varchar(64) NOT NULL COMMENT 'The name of the table this rule is about', rule_field varchar(64) NOT NULL COMMENT 'The name of the field of the table referenced in rule_table', rule_length int unsigned COMMENT 'The lenght of the matching substring', - rule_weight int NOT NULL COMMENT 'The weight of the rule' + rule_weight int NOT NULL COMMENT 'The weight of the rule' , PRIMARY KEY ( id ) , CONSTRAINT FK_civicrm_dedupe_rule_dedupe_rule_group_id FOREIGN KEY (dedupe_rule_group_id) REFERENCES civicrm_dedupe_rule_group(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -103,14 +103,14 @@ CREATE TABLE civicrm_payment_processor ( subject varchar(255), class_name varchar(255), billing_mode int unsigned NOT NULL COMMENT 'Billing Mode', - is_recur tinyint COMMENT 'Can process recurring contributions' + is_recur tinyint COMMENT 'Can process recurring contributions' , PRIMARY KEY ( id ) - + , UNIQUE INDEX UI_name_test( name, is_test ) - + , CONSTRAINT FK_civicrm_payment_processor_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -119,7 +119,7 @@ CREATE TABLE civicrm_payment_processor ( -- * -- *******************************************************/ CREATE TABLE civicrm_payment_processor_type ( - + id int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Processor Type ID', domain_id int unsigned NOT NULL COMMENT 'Which Domain owns this payment processor.', name varchar(64) COMMENT 'Payment Processor Name.', @@ -139,14 +139,14 @@ CREATE TABLE civicrm_payment_processor_type ( url_recur_test_default varchar(255), url_button_test_default varchar(255), billing_mode int unsigned NOT NULL COMMENT 'Billing Mode', - is_recur tinyint COMMENT 'Can process recurring contributions' + is_recur tinyint COMMENT 'Can process recurring contributions' , PRIMARY KEY ( id ) - + , UNIQUE INDEX UI_name( name ) - + , CONSTRAINT FK_civicrm_payment_processor_type_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; @@ -175,10 +175,10 @@ CREATE TABLE civicrm_preferences ( individual_name_format text COMMENT 'Format to display a individual name', address_standardization_provider varchar(64) COMMENT 'object name of provider for address standarization', address_standardization_userid varchar(64) COMMENT 'user id for provider login', - address_standardization_url varchar(255) COMMENT 'url of address standardization service' + address_standardization_url varchar(255) COMMENT 'url of address standardization service' , PRIMARY KEY ( id ) - + , INDEX index_contact_view_options( contact_view_options ) @@ -194,12 +194,12 @@ CREATE TABLE civicrm_preferences ( , INDEX index_address_options( address_options ) - -, + +, CONSTRAINT FK_civicrm_preferences_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id) -, +, CONSTRAINT FK_civicrm_preferences_contact_id FOREIGN KEY (contact_id) REFERENCES civicrm_contact(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; @@ -217,16 +217,16 @@ CREATE TABLE civicrm_price_set ( is_active tinyint DEFAULT 1 COMMENT 'Is this price set active', help_pre text COMMENT 'Description and/or help text to display before fields in form.', help_post text COMMENT 'Description and/or help text to display after fields in form.', - javascript varchar(64) COMMENT 'Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional' + javascript varchar(64) COMMENT 'Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional' , PRIMARY KEY ( id ) - + , UNIQUE INDEX UI_name( name ) , UNIQUE INDEX UI_title( title ) - + , CONSTRAINT FK_civicrm_price_set_domain_id FOREIGN KEY (domain_id) REFERENCES civicrm_domain(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; -- /******************************************************* @@ -251,14 +251,14 @@ CREATE TABLE civicrm_price_field ( is_required tinyint DEFAULT 1 COMMENT 'Is this price field required (value must be > 1)', active_on datetime DEFAULT 0 COMMENT 'If non-zero, do not show this field before the date specified', expire_on datetime DEFAULT 0 COMMENT 'If non-zero, do not show this field after the date specified', - javascript varchar(255) COMMENT 'Optional scripting attributes for field' + javascript varchar(255) COMMENT 'Optional scripting attributes for field' , PRIMARY KEY ( id ) , INDEX index_name( name ) - + , CONSTRAINT FK_civicrm_price_field_price_set_id FOREIGN KEY (price_set_id) REFERENCES civicrm_price_set(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; @@ -272,14 +272,14 @@ CREATE TABLE civicrm_price_set_entity ( id int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Set Entity', entity_table varchar(64) NOT NULL COMMENT 'Table which uses this price set', entity_id int unsigned NOT NULL COMMENT 'Item in table', - price_set_id int unsigned NOT NULL COMMENT 'price set being used' + price_set_id int unsigned NOT NULL COMMENT 'price set being used' , PRIMARY KEY ( id ) - + , UNIQUE INDEX UI_entity( entity_table, entity_id ) - + , CONSTRAINT FK_civicrm_price_set_entity_price_set_id FOREIGN KEY (price_set_id) REFERENCES civicrm_price_set(id) - + ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; @@ -320,7 +320,7 @@ CREATE TABLE civicrm_line_item ( -- * civicrm_activity_history -- * -- *******************************************************/ - ALTER TABLE civicrm_activity_history + ALTER TABLE civicrm_activity_history ADD is_test tinyint(4) NULL DEFAULT '0'; @@ -395,7 +395,7 @@ CREATE TABLE civicrm_line_item ( -- *******************************************************/ ALTER TABLE civicrm_location MODIFY location_type_id int(10) unsigned NULL DEFAULT NULL; - + -- /******************************************************* -- * @@ -447,9 +447,9 @@ CREATE TABLE civicrm_line_item ( -- * -- *******************************************************/ - INSERT INTO civicrm_payment_processor_type + INSERT INTO civicrm_payment_processor_type (domain_id, name, title, description, is_active, is_default, user_name_label, password_label, signature_label, subject_label, class_name, url_site_default, url_recur_default, url_button_default, url_site_test_default, url_recur_test_default, url_button_test_default, billing_mode, is_recur ) - VALUES + VALUES (@domain_id,'Dummy','Dummy Payment Processor',NULL,1,1,'User Name',NULL,NULL,NULL,'Payment_Dummy',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL), (@domain_id,'PayPal_Standard','PayPal - Website Payments Standard',NULL,1,0,'Merchant Account Email',NULL,NULL,NULL,'Payment_PayPalImpl','https://www.paypal.com/','https://www.paypal.com/',NULL,'https://www.sandbox.paypal.com/','https://www.sandbox.paypal.com/',NULL,4,1), (@domain_id,'PayPal','PayPal - Website Payments Pro',NULL,1,0,'User Name','Password','Signature',NULL,'Payment_PayPalImpl','https://www.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif','https://www.sandbox.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif',3,NULL), @@ -464,7 +464,7 @@ CREATE TABLE civicrm_line_item ( -- * civicrm_uf_group -- * -- *******************************************************/ - ALTER TABLE civicrm_uf_group + ALTER TABLE civicrm_uf_group ADD is_cms_user tinyint(4) NULL DEFAULT '0', ADD notify varchar(255) NULL DEFAULT NULL COMMENT 'If you want member(s) of your organization to receive a notification email whenever this Profile form is used to enter or update contact information, enter one or more email addresses here separated by a comma'; @@ -475,24 +475,24 @@ CREATE TABLE civicrm_line_item ( -- * -- *******************************************************/ - INSERT INTO - civicrm_option_group (domain_id, name, description, is_reserved, is_active) - VALUES + INSERT INTO + civicrm_option_group (domain_id, name, description, is_reserved, is_active) + VALUES (@domain_id, 'contact_view_options', 'Contact View Options', 0, 1), (@domain_id, 'contact_edit_options', 'Contact Edit Options', 0, 1), (@domain_id, 'advanced_search_options', 'Advanced Search Options', 0, 1), (@domain_id, 'user_dashboard_options', 'User Dashboard Options', 0, 1), (@domain_id, 'address_options', 'Addressing Options', 0, 1); - + SELECT @option_group_id_cvOpt := max(id) from civicrm_option_group where name = 'contact_view_options'; SELECT @option_group_id_ceOpt := max(id) from civicrm_option_group where name = 'contact_edit_options'; SELECT @option_group_id_asOpt := max(id) from civicrm_option_group where name = 'advanced_search_options'; SELECT @option_group_id_udOpt := max(id) from civicrm_option_group where name = 'user_dashboard_options'; SELECT @option_group_id_adOpt := max(id) from civicrm_option_group where name = 'address_options'; - INSERT INTO - civicrm_option_value (option_group_id, label, value, name, grouping, filter, is_default, weight, description, is_optgroup, is_reserved, is_active) - VALUES + INSERT INTO + civicrm_option_value (option_group_id, label, value, name, grouping, filter, is_default, weight, description, is_optgroup, is_reserved, is_active) + VALUES (@option_group_id_cvOpt, 'Activities' , 1, NULL, NULL, 0, NULL, 1, NULL, 0, 0, 1 ), (@option_group_id_cvOpt, 'Relationships', 2, NULL, NULL, 0, NULL, 2, NULL, 0, 0, 1 ), (@option_group_id_cvOpt, 'Groups' , 3, NULL, NULL, 0, NULL, 3, NULL, 0, 0, 1 ), @@ -507,7 +507,7 @@ CREATE TABLE civicrm_line_item ( (@option_group_id_ceOpt, 'Demographics' , 2, NULL, NULL, 0, NULL, 2, NULL, 0, 0, 1 ), (@option_group_id_ceOpt, 'Tags and Groups' , 3, NULL, NULL, 0, NULL, 3, NULL, 0, 0, 1 ), (@option_group_id_ceOpt, 'Notes' , 4, NULL, NULL, 0, NULL, 4, NULL, 0, 0, 1 ), - + (@option_group_id_asOpt, 'Address Fields' , 1, NULL, NULL, 0, NULL, 1, NULL, 0, 0, 1 ), (@option_group_id_asOpt, 'Custom Fields' , 2, NULL, NULL, 0, NULL, 2, NULL, 0, 0, 1 ), (@option_group_id_asOpt, 'Activity History' , 3, NULL, NULL, 0, NULL, 3, NULL, 0, 0, 1 ), @@ -542,9 +542,9 @@ CREATE TABLE civicrm_line_item ( -- * civicrm_preferences -- * -- *******************************************************/ - INSERT INTO + INSERT INTO civicrm_preferences(domain_id, contact_id, is_domain, location_count, contact_view_options, contact_edit_options, advanced_search_options, user_dashboard_options, address_options, address_format, mailing_format, individual_name_format, address_standardization_provider, address_standardization_userid, address_standardization_url ) - VALUES + VALUES (@domain_id,NULL,1,1,'123456789','1234','12345678910','1234','123456891011','{street_address}\n{supplemental_address_1}\n{supplemental_address_2}\n{city}{, }{state_province}{ }{postal_code}\n{country}','{street_address}\n{supplemental_address_1}\n{supplemental_address_2}\n{city}{, }{state_province}{ }{postal_code}\n{country}','{individual_prefix}{ } {first_name}{ }{middle_name}{ }{last_name}{ }{individual_suffix}',NULL,NULL,NULL); -- /******************************************************* @@ -566,7 +566,7 @@ INSERT INTO civicrm_dedupe_rule_group (domain_id, contact_type, threshold) VALUE SELECT @dedupe_rule_group_id := MAX(id) FROM civicrm_dedupe_rule_group; INSERT INTO civicrm_dedupe_rule (dedupe_rule_group_id, rule_table, rule_field, rule_weight) - VALUES + VALUES (@dedupe_rule_group_id, 'civicrm_individual', 'first_name', 5), (@dedupe_rule_group_id, 'civicrm_individual', 'last_name', 7), (@dedupe_rule_group_id, 'civicrm_email', 'email', 10); diff --git a/templates/CRM/Form/basicForm.tpl b/templates/CRM/Form/basicForm.tpl index 28550a622e..0208ee1a60 100644 --- a/templates/CRM/Form/basicForm.tpl +++ b/templates/CRM/Form/basicForm.tpl @@ -74,7 +74,7 @@ cj("#invoicing_blocks").hide(); } }); - cj(function () { + cj(function () { cj("input[type=checkbox]").click(function() { if (cj("#invoicing").is(":checked")) { cj("#invoicing_blocks").show(); @@ -86,4 +86,4 @@ }); {/literal} -{/if} \ No newline at end of file +{/if} diff --git a/templates/CRM/Grant/Page/Tab.tpl b/templates/CRM/Grant/Page/Tab.tpl index 36c58e04bc..92c991baca 100644 --- a/templates/CRM/Grant/Page/Tab.tpl +++ b/templates/CRM/Grant/Page/Tab.tpl @@ -34,7 +34,7 @@ {/if}
-

{ts 1=$displayName}This page lists all grants for %1 since inception.{/ts} +

{ts 1=$displayName}This page lists all grants for %1 since inception.{/ts} {if $permission EQ 'edit'} {capture assign=link}accesskey='N' href='{$newGrantURL}' class='action-item'{/capture} {ts 1=$link}Click Add Grant to record a Grant for this contact.{/ts} @@ -47,7 +47,7 @@

{/if} {if $rows} - + {include file="CRM/Grant/Form/Selector.tpl"} {else}
diff --git a/templates/CRM/Mailing/Form/Subscribe.tpl b/templates/CRM/Mailing/Form/Subscribe.tpl index 0e8a468990..77f5cd3cbd 100644 --- a/templates/CRM/Mailing/Form/Subscribe.tpl +++ b/templates/CRM/Mailing/Form/Subscribe.tpl @@ -50,7 +50,7 @@ {$row.title}   {$row.description}  - {/foreach} + {/foreach} {/if} diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl index dff4c3f48d..c15821e52c 100644 --- a/templates/CRM/Profile/Form/Dynamic.tpl +++ b/templates/CRM/Profile/Form/Dynamic.tpl @@ -204,7 +204,7 @@ {/if} {/if}{* end of main if field name if *} {/foreach} - + {if $isCaptcha && ( $mode eq 8 || $mode eq 4 || $mode eq 1 ) } {include file='CRM/common/ReCAPTCHA.tpl'} diff --git a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl index 2ed5361afb..08428d18d4 100644 --- a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl +++ b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl @@ -78,7 +78,7 @@ {if !$reachedMax} {if $pageViewType eq 'customDataView'} -
{ts 1=$customGroupTitle}Add %1 Record{/ts} {else} {strip} {include file="CRM/common/pager.tpl" location="top"} - {include file="CRM/common/pagerAToZ.tpl} + {include file="CRM/common/pagerAToZ.tpl} @@ -50,11 +50,11 @@ - {/foreach} + {/foreach}
{$row.retail_value|crmMoney} {$row.bid_end_date|crmDate}
{include file="CRM/common/pager.tpl" location="bottom"} {/strip} - +
{else} {if $isSearch eq 1} @@ -80,6 +80,6 @@
{ts 1=$newAuctionURL}There are no auctions created yet. You can add one.{/ts}
- + {/if} {/if} diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl index f24045b0dc..829afa01e3 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl @@ -115,7 +115,7 @@ {foreach from=$dataArray item=value key=priceset} {if $priceset || $priceset == 0 || $value != ''} -  {$taxTerm} {$priceset|string_format:"%.2f"}% +  {$taxTerm} {$priceset|string_format:"%.2f"}%  {$value|crmMoney:$currency} {else}  {ts}No{/ts} {$taxTerm} diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl index 9e583abde0..537f2557d3 100644 --- a/xml/templates/message_templates/contribution_online_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl @@ -112,7 +112,7 @@ {foreach from=$dataArray item=value key=priceset} {if $priceset || $priceset == 0} -  {$taxTerm} {$priceset|string_format:"%.2f"}% +  {$taxTerm} {$priceset|string_format:"%.2f"}%  {$value|crmMoney:$currency} {else}  {ts}No{/ts} {$taxTerm} diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index f359f7e72e..89eada777d 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -83,7 +83,7 @@ registration process.{/ts} {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} {/if} -{if $event.is_public} +{if $event.is_public} {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} {ts}Download iCalendar File:{/ts} {$icalFeed} {/if} diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index a8434ccfc9..38830ee1e3 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -105,7 +105,7 @@ registration process.{/ts} {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} {/if} -{if $event.is_public} +{if $event.is_public} {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} {ts}Download iCalendar File:{/ts} {$icalFeed} {/if} -- 2.25.1