From d9f57ab1a8a551b3b51621a82a86704b26fbd571 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 19 Mar 2019 12:50:23 -0400
Subject: [PATCH] Add fieldset and help for activity assignee setting

---
 ang/crmCaseType.js                   |  3 ++-
 ang/crmCaseType/caseTypeDetails.html | 38 ++++++++++++++++------------
 templates/CRM/Case/CaseType.hlp      | 11 ++++++++
 3 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 templates/CRM/Case/CaseType.hlp

diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js
index ab8e2d4c12..986b1ccaed 100644
--- a/ang/crmCaseType.js
+++ b/ang/crmCaseType.js
@@ -237,7 +237,7 @@
     };
   });
 
-  crmCaseType.controller('CaseTypeCtrl', function($scope, crmApi, apiCalls) {
+  crmCaseType.controller('CaseTypeCtrl', function($scope, crmApi, apiCalls, crmUiHelp) {
     var REL_TYPE_CNAME, defaultAssigneeDefaultValue, ts;
 
     (function init () {
@@ -245,6 +245,7 @@
       REL_TYPE_CNAME = CRM.crmCaseType.REL_TYPE_CNAME;
 
       ts = $scope.ts = CRM.ts(null);
+      $scope.hs = crmUiHelp({file: 'CRM/Case/CaseType'});
       $scope.locks = { caseTypeName: true, activitySetName: true };
       $scope.workflows = { timeline: 'Timeline', sequence: 'Sequence' };
       defaultAssigneeDefaultValue = _.find(apiCalls.defaultAssigneeTypes.values, { is_default: '1' }) || {};
diff --git a/ang/crmCaseType/caseTypeDetails.html b/ang/crmCaseType/caseTypeDetails.html
index 99f91f3807..0f74ff9a9b 100644
--- a/ang/crmCaseType/caseTypeDetails.html
+++ b/ang/crmCaseType/caseTypeDetails.html
@@ -41,22 +41,28 @@ The original form used table layout; don't know if we have an alternative, CSS-b
     <div crm-ui-field="{title: ts('Enabled?')}">
       <input name="is_active" type="checkbox" ng-model="caseType.is_active" ng-true-value="'1'" ng-false-value="'0'"/>
     </div>
-    <div crm-ui-field="{name: 'caseTypeDetailForm.activityAsgmtGrps', title: ts('Restrict Assignment to Groups')}">
-      <input
-        name="activityAsgmtGrps"
-        crm-ui-id="caseTypeDetailForm.activityAsgmtGrps"
-        crm-entityref="{entity: 'Group', api: {params: {is_hidden: 0, is_active: 1}}, select: {allowClear: true, multiple: true, placeholder: ts('Select Group')}}"
-        ng-model="caseType.definition.activityAsgmtGrps"
-      />
-    </div>
-    <div crm-ui-field="{title: ts('Restrict Assignment to Website Users')}">
-      <input
-        name="restrictActivityAsgmtToCmsUser"
-        type="checkbox"
-        ng-model="caseType.definition.restrictActivityAsgmtToCmsUser"
-        ng-true-value="'1'"
-        ng-false-value="'0'"
-      />
+    <fieldset class="crm-collapsible">
+      <legend class="collapsible-title">{{ ts('Activity assignment settings') }}</legend>
+      <div>
+        <div crm-ui-field="{name: 'caseTypeDetailForm.activityAsgmtGrps', title: ts('Restrict to Groups'), help: hs('activityAsgmtGrps')}">
+          <input
+            name="activityAsgmtGrps"
+            crm-ui-id="caseTypeDetailForm.activityAsgmtGrps"
+            crm-entityref="{entity: 'Group', api: {params: {is_hidden: 0, is_active: 1}}, select: {allowClear: true, multiple: true, placeholder: ts('Select Group')}}"
+            ng-model="caseType.definition.activityAsgmtGrps"
+          />
+        </div>
+        <div crm-ui-field="{title: ts('Restrict to Website Users'), help: hs('restrictActivityAsgmtToCmsUser')}">
+          <input
+            name="restrictActivityAsgmtToCmsUser"
+            type="checkbox"
+            ng-model="caseType.definition.restrictActivityAsgmtToCmsUser"
+            ng-true-value="'1'"
+            ng-false-value="'0'"
+          />
+        </div>
+      </div>
+    </fieldset>
     </div>
   </div>
 </div>
diff --git a/templates/CRM/Case/CaseType.hlp b/templates/CRM/Case/CaseType.hlp
new file mode 100644
index 0000000000..561836e75e
--- /dev/null
+++ b/templates/CRM/Case/CaseType.hlp
@@ -0,0 +1,11 @@
+{htxt id="activityAsgmtGrps"}
+  <p>
+    {ts}Selecting one or more groups here will limit the choices when assigning an activity.{/ts}
+  </p>
+{/htxt}
+
+{htxt id="restrictActivityAsgmtToCmsUser"}
+  <p>
+    {ts}This will limit the choices when selecting an activity assignee to contacts with a user account on this website.{/ts}
+  </p>
+{/htxt}
-- 
2.25.1