From 00eee619dad3e8dbbbcd3111c1baee63a9bdbfb4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 27 Apr 2015 11:41:52 -0600
Subject: [PATCH] CaseType UI styling improvements

---
 ang/crmCaseType.css                     | 1 -
 ang/crmCaseType.js                      | 6 ++++--
 ang/crmCaseType/activitySetDetails.html | 4 ++--
 ang/crmCaseType/activityTypesTable.html | 2 +-
 ang/crmCaseType/rolesTable.html         | 2 +-
 ang/crmCaseType/sequenceTable.html      | 2 +-
 ang/crmCaseType/timelineTable.html      | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ang/crmCaseType.css b/ang/crmCaseType.css
index b6035ebfed..b149493706 100644
--- a/ang/crmCaseType.css
+++ b/ang/crmCaseType.css
@@ -18,7 +18,6 @@
 .crmCaseType tr.addRow td {
     background: #ddddff;
     padding: 0.5em 1em;
-    text-align: center;
 }
 
 .crmCaseType input.number {
diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js
index d7b9b2086a..8174e43c1b 100644
--- a/ang/crmCaseType.js
+++ b/ang/crmCaseType.js
@@ -82,7 +82,7 @@
   crmCaseType.directive('crmAddName', function() {
     return {
       restrict: 'AE',
-      template: '<input class="add-activity" type="hidden" />',
+      template: '<input class="add-activity crm-action-menu action-icon-plus" type="hidden" />',
       link: function(scope, element, attrs) {
         /// Format list of options for select2's "data"
         var getFormattedOptions = function() {
@@ -105,7 +105,8 @@
           data: getFormattedOptions,
           createSearchChoice: function(term) {
             return {id: term, text: term};
-          }
+          },
+          placeholder: attrs.placeholder
         });
         $(input).on('select2-selecting', function(e) {
           scope[attrs.crmVar] = e.val;
@@ -128,6 +129,7 @@
     $scope.activityStatuses = _.values(apiCalls.actStatuses.values);
     $scope.activityTypes = apiCalls.actTypes.values;
     $scope.activityTypeNames = _.pluck(apiCalls.actTypes.values, 'name');
+    $scope.activityTypes = apiCalls.actTypes.values;
     $scope.relationshipTypeNames = _.pluck(apiCalls.relTypes.values, CRM.crmCaseType.REL_TYPE_CNAME); // CRM_Case_XMLProcessor::REL_TYPE_CNAME
     $scope.locks = {caseTypeName: true, activitySetName: true};
 
diff --git a/ang/crmCaseType/activitySetDetails.html b/ang/crmCaseType/activitySetDetails.html
index 44a6c061b9..58701a19a3 100644
--- a/ang/crmCaseType/activitySetDetails.html
+++ b/ang/crmCaseType/activitySetDetails.html
@@ -7,13 +7,13 @@ Required vars: activitySet
   <tr>
     <td class="label">{{ts('Label')}}</td>
     <td>
-      <input type="text" name="label" ng-model="activitySet.label"/>
+      <input type="text" name="label" class="crm-form-text" ng-model="activitySet.label"/>
     </td>
   </tr>
   <tr>
     <td class="label">{{ts('Name')}}</td>
     <td>
-      <input type="text" name="name" ng-model="activitySet.name" ng-disabled="locks.activitySetName" />
+      <input type="text" name="name" class="crm-form-text" ng-model="activitySet.name" ng-disabled="locks.activitySetName" />
       <a crm-ui-lock binding="locks.activitySetName"></a>
 
     </td>
diff --git a/ang/crmCaseType/activityTypesTable.html b/ang/crmCaseType/activityTypesTable.html
index a721292472..d603527cde 100644
--- a/ang/crmCaseType/activityTypesTable.html
+++ b/ang/crmCaseType/activityTypesTable.html
@@ -29,11 +29,11 @@ Required vars: caseType
   <tfoot>
   <tr class="addRow">
     <td colspan="3">
-      {{ts('Add activity type:')}}
       <span crm-add-name
            crm-options="activityTypeNames"
            crm-var="newActivity"
            crm-on-add="addActivityType(newActivity)"
+           placeholder="{{ts('Add activity type')}}"
               />
     </td>
   </tr>
diff --git a/ang/crmCaseType/rolesTable.html b/ang/crmCaseType/rolesTable.html
index a0ffdda3fa..98d8c80d18 100644
--- a/ang/crmCaseType/rolesTable.html
+++ b/ang/crmCaseType/rolesTable.html
@@ -25,11 +25,11 @@ Required vars: caseType
   <tfoot>
 	  <tr class="addRow">
 	    <td colspan="4">
-	      {{ts('Add role:')}}
 	      <span crm-add-name
 	           crm-options="relationshipTypeNames"
 	           crm-var="newRole"
 	           crm-on-add="addRole(caseType.definition.caseRoles, newRole)"
+             placeholder="{{ts('Add role')}}"
 	              />
 	    </td>
 	  </tr>
diff --git a/ang/crmCaseType/sequenceTable.html b/ang/crmCaseType/sequenceTable.html
index a472078f41..2b7372c499 100644
--- a/ang/crmCaseType/sequenceTable.html
+++ b/ang/crmCaseType/sequenceTable.html
@@ -25,11 +25,11 @@ Required vars: activitySet
   <tfoot>
   <tr class="addRow">
     <td colspan="3">
-      {{ts('Add activity:')}}
       <span crm-add-name
            crm-options="activityTypeNames"
            crm-var="newActivity"
            crm-on-add="addActivity(activitySet, newActivity)"
+           placeholder="{{ts('Add activity')}}"
               />
     </td>
   </tr>
diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html
index b05a816903..94d2cc2a7f 100644
--- a/ang/crmCaseType/timelineTable.html
+++ b/ang/crmCaseType/timelineTable.html
@@ -76,11 +76,11 @@ Required vars: activitySet
   <tfoot>
   <tr class="addRow">
     <td colspan="6">
-      {{ts('Add activity:')}}
       <span crm-add-name
            crm-options="activityTypeNames"
            crm-var="newActivity"
            crm-on-add="addActivity(activitySet, newActivity)"
+           placeholder="{{ts('Add activity')}}"
               />
     </td>
   </tr>
-- 
2.25.1