Merge pull request #9490 from eileenmcnaughton/report

[civicrm-core.git] / ang / crmMailing / BlockMailing.html

diff --git a/ang/crmMailing/BlockMailing.html b/ang/crmMailing/BlockMailing.html
index a41d6a1be90954c83b9f110ee14d1722dcd61036..abf890a4070059bc63ee14fb7c0b8f86d9789878 100644 (file)
--- a/ang/crmMailing/BlockMailing.html
+++ b/ang/crmMailing/BlockMailing.html
@@ -11,6 +11,7 @@ It could perhaps be thinned by 30-60% by making more directives.
         <select
           crm-ui-id="subform.msg_template_id"
           name="msg_template_id"
+          class="fa-clipboard"
           crm-ui-select="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Message Template')}"
           ng-model="mailing.msg_template_id"
           ng-change="loadTemplate(mailing, mailing.msg_template_id)"
@@ -60,7 +61,7 @@ It could perhaps be thinned by 30-60% by making more directives.
           ng-model="mailing.recipients.groups.base[0]"
           ng-required="true"
           >
-          <option ng-repeat="grp in crmMailingConst.groupNames | orderBy:'title'" value="{{grp.id}}">{{grp.title}}</option>
+          <option ng-repeat="grp in crmMailingConst.groupNames | filter:{is_hidden:0} | orderBy:'title'" value="{{grp.id}}">{{grp.title}}</option>
         </select>
       </div>
     </span>
@@ -78,5 +79,19 @@ It could perhaps be thinned by 30-60% by making more directives.
         placeholder="Subject"
         name="subject" />
     </div>
+    <div ng-if="crmMailingConst.isMultiLingual">
+      <div crm-ui-field="{name: 'subform.language', title: ts('Language')}">
+        <select
+          crm-ui-id="subform.language"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('- choose language -')}"
+          name="language"
+          ng-model="mailing.language"
+          required
+          >
+          <option value=""></option>
+          <option ng-repeat="(key,val) in crmMailingConst.enabledLanguages" value="{{key}}">{{val}}</option>
+        </select>
+      </div>
+    </div>
   </div>
 </div>