From e5908092115e2d1869c64d522c7875502205e621 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 9 Jan 2015 14:49:56 +0000
Subject: [PATCH] Set icons for the toolbar priority action in compose dialog

---
 mail/inc/class.mail_compose.inc.php | 13 +++++++++++++
 mail/templates/pixelegg/app.css     |  7 +++++--
 mail/templates/pixelegg/app.less    | 10 +++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 88c08d521d..fa98484cd8 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -175,6 +175,7 @@ class mail_compose
 			'prty' => array(
 				'caption' => 'Priority',
 				'group' => ++$group,
+				'icon' => 'priority',
 				'children' => array(),
 				'toolbarDefault' => true,
 				'hint' => 'Select the message priority tag'
@@ -191,7 +192,19 @@ class mail_compose
 		{
 			$actions['prty']['children'][$key] = array(
 						'caption' => $priority,
+						'icon' => 'prio_high'
 			);
+			switch ($priority)
+			{
+				case 'high':
+					$actions['prty']['children'][$key]['icon'] = 'prio_high';
+					break;
+				case 'normal':
+					$actions['prty']['children'][$key]['icon'] = 'prio_normal';
+					break;
+				case 'low':
+					$actions['prty']['children'][$key]['icon'] = 'prio_low';
+			}
 		}
 		return $actions;
 	}
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index df4849c244..ae3698da4a 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1584,10 +1584,13 @@ div.ui-toolbar-menulist {
   background-color: #e6e6e6 !important;
 }
 .et2_toolbar_actionlist .et2_toolbar-dropdown .et2_dropdown button img {
-  width: 20px;
-  height: 20px;
+  width: 16px;
+  height: 16px;
   top: 3px;
 }
+.et2_toolbar_actionlist .et2_toolbar-dropdown .et2_button_icon {
+  height: 12px;
+}
 div#displayToolbar-menulist .et2_dropdown {
   -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
   -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index dd6a5df72f..3cc10b9095 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -793,14 +793,18 @@ div.ui-toolbar-menulist{
                             &:hover{}
 
                             img {
-                                .dimension_width_height_sm;
+                                .dimension_width_height_s;
                                 top: 3px;
                             }
 
                         }
-
+						
              }
-
+			 .et2_button_icon
+			 {
+				.dimension_height_xs;
+			 }
+				
             ul> li{  }
 
             ul{          }