From 941539e78a89e3f62386a0aa68d8677681b81ea1 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 11 Apr 2014 17:26:40 -0400 Subject: [PATCH] Update action-menu styles --- CRM/Case/Form/CaseView.php | 6 +++--- CRM/Contact/Form/GroupContact.php | 2 +- css/civicrm.css | 9 +++++++++ templates/CRM/Activity/Form/ActivityLinks.tpl | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php index ba9998ce2f..e4336207f1 100644 --- a/CRM/Case/Form/CaseView.php +++ b/CRM/Case/Form/CaseView.php @@ -276,17 +276,17 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { $activityLinks[$url] = $label; } - $this->add('select', 'add_activity_type_id', '', $activityLinks, FALSE, array('class' => 'crm-select2 crm-action-menu twenty')); + $this->add('select', 'add_activity_type_id', '', $activityLinks, FALSE, array('class' => 'crm-select2 crm-action-menu action-icon-plus twenty')); if ($this->_hasAccessToAllCases) { $this->add('select', 'report_id', '', array('' => ts('Run QA Audit / Redact')) + $reports, FALSE, - array('class' => 'crm-select2 crm-action-menu') + array('class' => 'crm-select2 crm-action-menu action-icon-clipboard') ); $this->add('select', 'timeline_id', '', array('' => ts('Add Timeline')) + $reports, FALSE, - array('class' => 'crm-select2 crm-action-menu') + array('class' => 'crm-select2 crm-action-menu action-icon-play') ); } $this->addElement('submit', $this->getButtonName('next'), ' ', array('class' => 'hiddenElement')); diff --git a/CRM/Contact/Form/GroupContact.php b/CRM/Contact/Form/GroupContact.php index 0411156adf..a6ad2c36c2 100644 --- a/CRM/Contact/Form/GroupContact.php +++ b/CRM/Contact/Form/GroupContact.php @@ -102,7 +102,7 @@ class CRM_Contact_Form_GroupContact extends CRM_Core_Form { $msg = ts('Add to a group'); } - $this->add('select', 'group_id', '', $groupSelect, TRUE, array('class' => 'crm-select2 crm-action-menu', 'placeholder' => $msg)); + $this->add('select', 'group_id', '', $groupSelect, TRUE, array('class' => 'crm-select2 crm-action-menu action-icon-plus', 'placeholder' => $msg)); $this->addButtons(array( array( diff --git a/css/civicrm.css b/css/civicrm.css index 2b03a8291f..ea52917184 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -3932,6 +3932,15 @@ div.m ul#civicrm-menu, position: relative; top: 3px; } +.crm-container .crm-action-menu.action-icon-plus .select2-default span.select2-chosen:before { + background-position: -16px -128px; +} +.crm-container .crm-action-menu.action-icon-play .select2-default span.select2-chosen:before { + background-position: 0 -160px; +} +.crm-container .crm-action-menu.action-icon-clipboard .select2-default span.select2-chosen:before { + background-position: -160px -128px; +} /* Special styling for specific form buttons */ #crm-container span.crm-button_qf_Main_upload input, diff --git a/templates/CRM/Activity/Form/ActivityLinks.tpl b/templates/CRM/Activity/Form/ActivityLinks.tpl index fa86d88cbe..3eaff3d901 100644 --- a/templates/CRM/Activity/Form/ActivityLinks.tpl +++ b/templates/CRM/Activity/Form/ActivityLinks.tpl @@ -30,7 +30,7 @@ {/if} {if $as_select} {* on 3.2, the activities can be either a drop down select (on the activity tab) or a list (on the action menu) *} - {foreach from=$activityTypes key=k item=link} -- 2.25.1