CRM-14481 - crmCaseType - Styling for accordion, trash icon

diff --git a/partials/crmCaseType/activityTypesTable.html b/partials/crmCaseType/activityTypesTable.html
index d600c2f19df4aa0b9f8a222b35bb15c8dd8d7f0c..1327078ad0e6fe6629c0cc6c3ca3fb4592d2bd0f 100644 (file)
--- a/partials/crmCaseType/activityTypesTable.html
+++ b/partials/crmCaseType/activityTypesTable.html
@@ -20,8 +20,9 @@ Required vars: caseType
       {{ activityType.max_instances }}
     </td>
     <td>
-      <a class="ui-icon ui-icon-trash" title="Remove"
-         ng-click="removeItem(caseType.definition.activityTypes, activityType)"></a>
+      <a class="crm-hover-button" ng-click="removeItem(caseType.definition.activityTypes, activityType)">
+        <span class="icon delete-icon" title="Remove"></span>
+      </a>
     </td>
   </tr>
   </tbody>

diff --git a/partials/crmCaseType/edit.html b/partials/crmCaseType/edit.html
index 7f82988c69ef7d61c30a0e770bc1defa87fb2c78..9a27e3f1d6cf7c8cb245087d54be5e9935db905e 100644 (file)
--- a/partials/crmCaseType/edit.html
+++ b/partials/crmCaseType/edit.html
@@ -17,7 +17,12 @@ Required vars: caseType
       <li ng-repeat="activitySet in caseType.definition.activitySets">
         <a href="#acttab-{{$index}}">{{ activitySet.label }}</a>
         <span class="ui-icon ui-icon-trash" title="Remove"
-           ng-click="removeItem(caseType.definition.activitySets, activitySet)">Remove</span>
+          ng-click="removeItem(caseType.definition.activitySets, activitySet)">Remove</span>
+        <!-- Weird spacing:
+        <a class="crm-hover-button" ng-click="removeItem(caseType.definition.activitySets, activitySet)">
+          <span class="ui-icon delete-icon" title="Remove">Remove</span>
+        </a>
+        -->
       </li>
       <select ng-model="newActivitySetWorkflow" ng-change="addActivitySet(newActivitySetWorkflow); newActivitySetWorkflow='';">
         <option value="">(Add)</option>
@@ -33,9 +38,9 @@ Required vars: caseType
     <div ng-repeat="activitySet in caseType.definition.activitySets" id="acttab-{{$index}}">
       <div ng-include="activityTableTemplate(activitySet)"></div>
 
-      <div ui-jq="accordion" ui-options="{collapsible: true, active: false, heightStyle: 'fill'}">
-        <h3>Advanced</h3>
-        <div ng-include="partialUrl('activitySetDetails.html')" style="display:none;"></div>
+      <div class="crm-accordion-wrapper">
+        <h3 class="crm-accordion-header">Advanced</h3>
+        <div class="crm-accordion-body" ng-include="partialUrl('activitySetDetails.html')"></div>
       </div>
     </div>
   </div>

diff --git a/partials/crmCaseType/pipelineTable.html b/partials/crmCaseType/pipelineTable.html
index bd7834c0629f4f446fd50e9eebcae21d9cf94e53..05db80c49f89f160f5b062cb94f8c243c1510e83 100644 (file)
--- a/partials/crmCaseType/pipelineTable.html
+++ b/partials/crmCaseType/pipelineTable.html
@@ -14,8 +14,9 @@ Required vars: activitySet
   <tr ng-repeat="activity in activitySet.activityTypes">
     <td>{{ activity.name }}</td>
     <td>
-      <a class="ui-icon ui-icon-trash" title="Remove"
-         ng-click="removeItem(activitySet.activityTypes, activity)"></a>
+      <a class="crm-hover-button" ng-click="removeItem(activitySet.activityTypes, activity)">
+        <span class="icon delete-icon" title="Remove"></span>
+      </a>
     </td>
   </tr>
   </tbody>

diff --git a/partials/crmCaseType/rolesTable.html b/partials/crmCaseType/rolesTable.html
index 2b9e3c1f59c8c98c4b123d4e4baf0c920361c4ad..52e63e178e3fd5905ce322c184e2062788b92438 100644 (file)
--- a/partials/crmCaseType/rolesTable.html
+++ b/partials/crmCaseType/rolesTable.html
@@ -17,8 +17,9 @@ Required vars: caseType
     <td><input type="checkbox" ng-model="relType.creator" ng-true-value="1" ng-false-value="0"/></td>
     <td><input type="radio" ng-model="relType.manager" value="1" ng-change="onManagerChange(relType)"/></td>
     <td>
-      <a class="ui-icon ui-icon-trash" title="Remove"
-         ng-click="removeItem(caseType.definition.caseRoles, relType)"></a>
+      <a class="crm-hover-button" ng-click="removeItem(caseType.definition.caseRoles,relType)">
+        <span class="icon delete-icon" title="Remove"></span>
+      </a>
     </td>
   </tr>
   </tbody>

diff --git a/partials/crmCaseType/timelineTable.html b/partials/crmCaseType/timelineTable.html
index 877362d3589395e8a2cf4f1bd51663278888d83b..ec8ea5b1c459d37067bd37f3c50698d7f69bd0cf 100644 (file)
--- a/partials/crmCaseType/timelineTable.html
+++ b/partials/crmCaseType/timelineTable.html
@@ -32,8 +32,9 @@ Required vars: activitySet
       {{ activity.reference_select }}
     </td>
     <td>
-      <a class="ui-icon ui-icon-trash" title="Remove"
-         ng-click="removeItem(activitySet.activityTypes, activity)"></a>
+      <a class="crm-hover-button" ng-click="removeItem(activitySet.activityTypes, activity)">
+        <span class="icon delete-icon" title="Remove"></span>
+      </a>
     </td>
   </tr>
   </tbody>