Merge pull request #9864 from PalanteJon/CRM-19977

[civicrm-core.git] / ang / crmCaseType / timelineTable.html

diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html
index b329af5db8dace7cb7938b3a2d757042d167ce8b..c1ad99adaea8dd2aa1b9ebad5d5b92826ae3250f 100644 (file)
--- a/ang/crmCaseType/timelineTable.html
+++ b/ang/crmCaseType/timelineTable.html
@@ -5,6 +5,7 @@ Required vars: activitySet
 <table>
   <thead>
   <tr>
+    <th></th>
     <th>{{ts('Activity')}}</th>
     <th>{{ts('Status')}}</th>
     <th>{{ts('Reference')}}</th>
@@ -18,14 +19,17 @@ Required vars: activitySet
   <tr ng-repeat="activity in activitySet.activityTypes">
     <td>
       <i class="crm-i fa-arrows grip-n-drag"></i>
-      {{ activity.name }}
+    </td>
+    <td>
+      <i class="crm-i {{ activityTypes[activity.name].icon }}"></i>
+      {{ activity.label }}
     </td>
     <td>
       <select
         ui-jq="select2"
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.status"
-        ng-options="actStatus.name as actStatus.name for actStatus in activityStatuses|orderBy:'name'"
+        ng-options="actStatus.name as actStatus.label for actStatus in activityStatuses|orderBy:'label'"
         >
         <option value=""></option>
       </select>
@@ -35,7 +39,7 @@ Required vars: activitySet
         ui-jq="select2"
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.reference_activity"
-        ng-options="actTypeName as actTypeName for actTypeName in activityTypeNames"
+        ng-options="activityType.name as activityType.label for activityType in activitySet.activityTypes"
         ng-hide="activity.name == 'Open Case'"
         ng-required="activity.name != 'Open Case'"
         >
@@ -43,7 +47,7 @@ Required vars: activitySet
     </td>
     <td>
       <input
-        class="number"
+        class="number crm-form-text"
         type="text"
         ng-pattern="/^-?[0-9]*$/"
         ng-model="activity.reference_offset"
@@ -56,7 +60,7 @@ Required vars: activitySet
         ui-jq="select2"
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.reference_select"
-        ng-options="key as value for (key,value) in {newest: 'Newest', oldest: 'Oldest'}"
+        ng-options="key as value for (key,value) in {newest: ts('Newest'), oldest: ts('Oldest')}"
         ng-hide="activity.name == 'Open Case'"
         ng-required="activity.name != 'Open Case'"
         >
@@ -77,7 +81,7 @@ Required vars: activitySet
   <tr class="addRow">
     <td colspan="6">
       <span crm-add-name
-           crm-options="activityTypeNames"
+           crm-options="activityTypeOptions"
            crm-var="newActivity"
            crm-on-add="addActivity(activitySet, newActivity)"
            placeholder="{{ts('Add activity')}}"