crmMailing,crmMailingAB - Rename scope.help() to scope.hs()

diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index edbfdce694a14953aee8b3f1ddab9596a6bc2c3c..b111c3969a1866d605dc28f9af5e05c7baa45963 100644 (file)
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -338,7 +338,7 @@
   //   - "fields" (list of fields)
   angular.module('crmMailing').controller('EditRecipOptionsDialogCtrl', function EditRecipOptionsDialogCtrl($scope, crmUiHelp) {
     $scope.ts = CRM.ts(null);
-    $scope.help = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
+    $scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
   });
 
   // Controller for the "Preview Mailing Component" segment

diff --git a/js/angular-crmMailing/directives.js b/js/angular-crmMailing/directives.js
index e9ed9198342fab0f5bcf7d620a7c9ecfea624244..3a4a48ab283f6e4ea02d81113e147c2223cf9e6a 100644 (file)
--- a/js/angular-crmMailing/directives.js
+++ b/js/angular-crmMailing/directives.js
@@ -28,7 +28,7 @@
           });
           scope.crmMailingConst = CRM.crmMailing;
           scope.ts = CRM.ts(null);
-          scope.help = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
+          scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
           scope[directiveName] = attr[directiveName] ? scope.$parent.$eval(attr[directiveName]) : {};
           $q.when(crmMetadata.getFields('Mailing'), function(fields) {
             scope.mailingFields = fields;
@@ -49,7 +49,7 @@
         });
         scope.crmMailingConst = CRM.crmMailing;
         scope.ts = CRM.ts(null);
-        scope.help = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
+        scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
         scope.testContact = {email: CRM.crmMailing.defaultTestEmail};
         scope.testGroup = {gid: null};
 

diff --git a/js/angular-crmMailingAB/directives.js b/js/angular-crmMailingAB/directives.js
index d46c3885aa9a7caadc15b70e46bba3cb4c7474ad..014f8f4ce59a09ddc76da13bd54aa42e8242540b 100644 (file)
--- a/js/angular-crmMailingAB/directives.js
+++ b/js/angular-crmMailingAB/directives.js
@@ -21,7 +21,7 @@
           scope.crmMailingConst = CRM.crmMailing;
           scope.crmMailingABCriteria = crmMailingABCriteria;
           scope.ts = CRM.ts(null);
-          scope.help = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
+          scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
 
           var fieldsModel = $parse(attr[directiveName]);
           scope.fields = fieldsModel(scope.$parent);

diff --git a/partials/crmMailing/dialog/recipientOptions.html b/partials/crmMailing/dialog/recipientOptions.html
index 3f5dba823829173aa88779061ff78b9640c7697a..53d2c15b88c258d0aba963d754f1847beed4d1cb 100644 (file)
--- a/partials/crmMailing/dialog/recipientOptions.html
+++ b/partials/crmMailing/dialog/recipientOptions.html
@@ -2,7 +2,7 @@
   <div class="crm-block" ng-form="editRecipOptionsForm" crm-ui-id-scope>
     <div class="crm-group">
 
-      <div crm-ui-field="{title: ts('Dedupe by email'), help: help('dedupe_email')}" crm-layout="checkbox">
+      <div crm-ui-field="{title: ts('Dedupe by email'), help: hs('dedupe_email')}" crm-layout="checkbox">
         <input
           type='checkbox'
           ng-model='model.mailing.dedupe_email'

diff --git a/partials/crmMailing/headerFooter.html b/partials/crmMailing/headerFooter.html
index c6df982a64191d44172718f50bffe8dca3748cb1..45c47ee32ab509c86942c38c12fd9073636ecf5f 100644 (file)
--- a/partials/crmMailing/headerFooter.html
+++ b/partials/crmMailing/headerFooter.html
@@ -4,7 +4,7 @@ Required vars: mailing, crmMailingConst
 -->
 <div class="crm-block"  ng-form="subform" crm-ui-id-scope>
   <div class="crm-group" ng-controller="EmailBodyCtrl">
-    <div crm-ui-field="{name: 'subform.header_id', title: ts('Mailing Header'), help: help('header')}">
+    <div crm-ui-field="{name: 'subform.header_id', title: ts('Mailing Header'), help: hs('header')}">
       <select
         crm-ui-id="subform.header_id"
         name="header_id"
@@ -16,7 +16,7 @@ Required vars: mailing, crmMailingConst
         <option value=""></option>
       </select>
     </div>
-    <div crm-ui-field="{name: 'subform.footer_id', title: ts('Mailing Footer'), help: help('footer')}">
+    <div crm-ui-field="{name: 'subform.footer_id', title: ts('Mailing Footer'), help: hs('footer')}">
       <select
         crm-ui-id="subform.footer_id"
         name="footer_id"

diff --git a/partials/crmMailing/mailing.html b/partials/crmMailing/mailing.html
index 10655f3eb4afc9065db6697bbdb527f94b07a399..8e43ecdc4c92b521be4b889957b9341d46bb7a59 100644 (file)
--- a/partials/crmMailing/mailing.html
+++ b/partials/crmMailing/mailing.html
@@ -21,7 +21,7 @@ It could perhaps be thinned by 30-60% by making more directives.
         <a crm-icon="disk" ng-click="saveTemplate(mailing)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
-    <div crm-ui-field="{name: 'subform.fromAddress', title: ts('From'), help: help('from_email')}">
+    <div crm-ui-field="{name: 'subform.fromAddress', title: ts('From'), help: hs('from_email')}">
       <div ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="mailing">
         <select
           crm-ui-id="subform.fromAddress"

diff --git a/partials/crmMailing/preview.html b/partials/crmMailing/preview.html
index e75882ca77acfa60d57dad4fa2b198bb41394616..6831c7032a619844bf8ee045fad8439f9ee97195 100644 (file)
--- a/partials/crmMailing/preview.html
+++ b/partials/crmMailing/preview.html
@@ -25,7 +25,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
   <div class="preview-contact" ng-form>
     <div>
       {{ts('Send test email to:')}}
-      <a crm-ui-help="help({id: 'test'})"></a>
+      <a crm-ui-help="hs({id: 'test'})"></a>
     </div>
     <div>
       <input
@@ -41,7 +41,7 @@ Vars: mailing:obj, testContact:obj, testGroup:obj, crmMailing:FormController
   <div class="preview-group" ng-form>
     <div>
       {{ts('Send test email to group:')}}
-      <a crm-ui-help="help({id: 'test'})"></a>
+      <a crm-ui-help="hs({id: 'test'})"></a>
     </div>
     <div>
       <select

diff --git a/partials/crmMailing/publication.html b/partials/crmMailing/publication.html
index 4b89c62cb4fcbcc9ecd6d5c275b17f578a691760..6e82b9fa39cb3b8f6aa1915a7eecb8c1c0db6073 100644 (file)
--- a/partials/crmMailing/publication.html
+++ b/partials/crmMailing/publication.html
@@ -1,6 +1,6 @@
 <div class="crm-block" ng-form="subform" crm-ui-id-scope>
   <div class="crm-group">
-    <div crm-ui-field="{name: 'subform.visibility', title: ts('Mailing Visibility'), help: help('visibility')}">
+    <div crm-ui-field="{name: 'subform.visibility', title: ts('Mailing Visibility'), help: hs('visibility')}">
       <select
         crm-ui-id="subform.visibility"
         name="visibility"

diff --git a/partials/crmMailing/summary.html b/partials/crmMailing/summary.html
index 5fcfa0eca8a4ea43a64987117facc564a78286f0..5b8b8407861b5e0c3ee8a9fd11c8952a12c4c96c 100644 (file)
--- a/partials/crmMailing/summary.html
+++ b/partials/crmMailing/summary.html
@@ -5,7 +5,7 @@ FIXME: Don't hardcode table-based layout!
 -->
 <div class="crm-block" ng-form="subform" crm-ui-id-scope>
   <div class="crm-group">
-    <div crm-ui-field="{name: 'subform.mailingName', title: ts('Mailing Name'), help: help('name')}">
+    <div crm-ui-field="{name: 'subform.mailingName', title: ts('Mailing Name'), help: hs('name')}">
       <div>
         <input
           crm-ui-id="subform.mailingName"
@@ -17,7 +17,7 @@ FIXME: Don't hardcode table-based layout!
           name="mailingName" />
       </div>
     </div>
-    <div crm-ui-field="{name: 'subform.campaign', title: ts('Campaign'), help: help({id: 'id-campaign_id', file: 'CRM/Campaign/Form/addCampaignToComponent'})}" ng-show="crmMailingConst.campNames.length > 0">
+    <div crm-ui-field="{name: 'subform.campaign', title: ts('Campaign'), help: hs({id: 'id-campaign_id', file: 'CRM/Campaign/Form/addCampaignToComponent'})}" ng-show="crmMailingConst.campNames.length > 0">
       <select
         crm-ui-id="subform.campaign"
         name="campaign"

diff --git a/partials/crmMailingAB/joint-mailing.html b/partials/crmMailingAB/joint-mailing.html
index d328376ab9f115cb04f8093a86f4d7e780d48265..cdab76cccbbe5215d33bff8ffb73034db901096b 100644 (file)
--- a/partials/crmMailingAB/joint-mailing.html
+++ b/partials/crmMailingAB/joint-mailing.html
@@ -62,7 +62,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
     </div>
 
 
-    <div crm-ui-field="{name: 'subform.fromAddress', title: ts('From'), help: help('from_email')}" ng-if="fields.fromAddress">
+    <div crm-ui-field="{name: 'subform.fromAddress', title: ts('From'), help: hs('from_email')}" ng-if="fields.fromAddress">
       <span ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="abtest.mailings.a">
         <select
           crm-ui-id="subform.fromAddress"
@@ -75,7 +75,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
         </select>
       </span>
     </div>
-    <div crm-ui-field="{name: 'subform.fromAddressA', title: ts('From (A)'), help: help('from_email')}" ng-if="fields.fromAddressA">
+    <div crm-ui-field="{name: 'subform.fromAddressA', title: ts('From (A)'), help: hs('from_email')}" ng-if="fields.fromAddressA">
       <span ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="abtest.mailings.a">
         <select
           crm-ui-id="subform.fromAddressA"
@@ -88,7 +88,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
         </select>
       </span>
     </div>
-    <div crm-ui-field="{name: 'subform.fromAddressB', title: ts('From (B)'), help: help('from_email')}" ng-if="fields.fromAddressB">
+    <div crm-ui-field="{name: 'subform.fromAddressB', title: ts('From (B)'), help: hs('from_email')}" ng-if="fields.fromAddressB">
       <span ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="abtest.mailings.b">
         <select
           crm-ui-id="subform.fromAddressB"

diff --git a/partials/crmMailingAB/setup.html b/partials/crmMailingAB/setup.html
index 7058a2854a508f838d12c914df216fc10044b473..8e18587842aacdabc804bc2b185a433a409f8c26 100644 (file)
--- a/partials/crmMailingAB/setup.html
+++ b/partials/crmMailingAB/setup.html
@@ -4,7 +4,7 @@
       {{ts('A/B testing allows you to send two test mailings to a random subset of your recipients. After collecting and
       comparing metrics, the more successful mailing will be sent to the remaining recipients.')}}
     </div>
-    <div crm-ui-field="{name: 'setupForm.abName', title: ts('Name'), help: help('name')}" ng-if="fields.abName">
+    <div crm-ui-field="{name: 'setupForm.abName', title: ts('Name'), help: hs('name')}" ng-if="fields.abName">
       <input
         crm-ui-id="setupForm.abName"
         name="abName"
@@ -13,7 +13,7 @@
         placeholder="A/B Test Name"
         required/>
     </div>
-    <div crm-ui-field="{name: 'setupForm.campaign', title: ts('Campaign'), help: help({id: 'id-campaign_id', file: 'CRM/Campaign/Form/addCampaignToComponent'})}" ng-show="crmMailingConst.campNames.length > 0"
+    <div crm-ui-field="{name: 'setupForm.campaign', title: ts('Campaign'), help: hs({id: 'id-campaign_id', file: 'CRM/Campaign/Form/addCampaignToComponent'})}" ng-show="crmMailingConst.campNames.length > 0"
          ng-if="fields.campaign">
       <select
         crm-ui-id="setupForm.campaign"