Merge pull request #80 from systopia/dev_ui

UI improvements

CRM/Civirules/Form/Rule.php

@@ -244,7 +244,7 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
       $this->add('text', 'rule_created_contact', ts('Created By'));
       $triggerList = array(' - select - ') + CRM_Civirules_Utils::buildTriggerList();
       asort($triggerList);
-      $this->add('select', 'rule_trigger_select', ts('Select Trigger'), $triggerList);
+      $this->add('select', 'rule_trigger_select', ts('Select Trigger'), $triggerList, true, array('class' => 'crm-select2'));
       if ($this->_action == CRM_Core_Action::UPDATE) {
         $this->createUpdateFormElements();
       }

CRM/Civirules/Form/RuleAction.php

@@ -124,9 +124,9 @@ class CRM_Civirules_Form_RuleAction extends CRM_Core_Form {
     }
     $actionList = array(' - select - ') + CRM_Civirules_Utils::buildActionList();
     asort($actionList);
-    $attributes = array();
+    $attributes = array('class' => 'crm-select2');
     if (empty($this->ruleActionId)) {
-      $this->add('select', 'rule_action_select', ts('Select Action'), $actionList, $attributes);
+      $this->add('select', 'rule_action_select', ts('Select Action'), $actionList, true, $attributes);
     }
 
 

CRM/Civirules/Form/RuleCondition.php

@@ -87,7 +87,7 @@ class CRM_Civirules_Form_RuleCondition extends CRM_Core_Form {
     $this->add('select', 'rule_condition_link_select', ts('Select Link Operator'), $linkList);
     $conditionList = array(' - select - ') + CRM_Civirules_Utils::buildConditionList();
     asort($conditionList);
-    $this->add('select', 'rule_condition_select', ts('Select Condition'), $conditionList);
+    $this->add('select', 'rule_condition_select', ts('Select Condition'), $conditionList, true, array('class' => 'crm-select2'));
 
     $this->addButtons(array(
       array('type' => 'next', 'name' => ts('Save'), 'isDefault' => TRUE,),

CRM/CivirulesConditions/Form/FieldValueComparison.php

@@ -110,7 +110,7 @@ class CRM_CivirulesConditions_Form_FieldValueComparison extends CRM_CivirulesCon
 
     $this->add('hidden', 'rule_condition_id');
     $this->add('select', 'entity', ts('Entity'), $this->getEntityOptions(), true);
-    $this->add('select', 'field', ts('Field'), $this->getFields(), true);
+    $this->add('select', 'field', ts('Field'), $this->getFields(), true, array('class' => 'crm-select2'));
     $this->assign('entities', $this->getEntities());
     $this->assign('custom_field_multi_select_html_types', CRM_Civirules_Utils_CustomField::getMultiselectTypes());
   }

templates/CRM/Civirules/Form/RuleBlocks/ActionBlock.tpl

@@ -49,7 +49,7 @@
   </div>
   <div class="crm-submit-buttons">
     <a class="add button" title="Add Action" href="{$ruleActionAddUrl}">
-      <span><div class="icon add-icon"></div>Add Action</span></a>
+      <span><div class="icon add-icon ui-icon-circle-plus"></div>Add Action</span></a>
   </div>
 </div>
 

templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl

@@ -44,6 +44,6 @@
   </div>
   <div class="crm-submit-buttons">
     <a class="add button" title="Add Condition" href="{$ruleConditionAddUrl}">
-      <span><div class="icon add-icon"></div>Add Condition</span></a>
+      <span><div class="icon add-icon ui-icon-circle-plus"></div>Add Condition</span></a>
   </div>
 </div>

templates/CRM/Civirules/Page/Rule.tpl

@@ -4,7 +4,7 @@
   </div>
   <div class="action-link">
     <a class="button new-option" href="{$add_url}">
-      <span><div class="icon add-icon"></div>{ts}Add CiviRule{/ts}</span>
+      <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add CiviRule{/ts}</span>
     </a>
   </div>
   <div id="civirule_wrapper" class="dataTables_wrapper">
@@ -47,7 +47,7 @@
   </div>
   <div class="action-link">
     <a class="button new-option" href="{$add_url}">
-      <span><div class="icon add-icon"></div>{ts}Add CiviRule{/ts}</span>
+      <span><div class="icon add-icon ui-icon-circle-plus"></div>{ts}Add CiviRule{/ts}</span>
     </a>
   </div>
 </div>