"Shortcut" actions are displayed as buttons on the same line as the usual "Actions" button.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1437 a333f486-631f-4898-b8df-5754b55c2be0

application/displayblock.class.inc.php

@@ -1231,8 +1231,23 @@ class MenuBlock extends DisplayBlock
 		$aFavorites = array('UI:Menu:Modify', 'UI:Menu:New', /*'UI:Menu:Delete'*/);
 		$aCallSpec = array($sClass, 'GetShortcutActions');
 		$aShortcutActions = call_user_func($aCallSpec);
+		foreach ($aActions as $key => $aAction)
+		{
+			if (in_array($key, $aShortcutActions))
+			{
+				$aFavoriteActions[] = $aAction;
+				unset($aActions[$key]);
+			}
+		}
 		
-		$sHtml .= "<div class=\"itop_popup\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
+		if (count($aFavoriteActions) > 0)
+		{
+			$sHtml .= "<div class=\"itop_popup\"><ul>\n<li>".Dict::S('UI:Menu:OtherActions')."\n<ul>\n";
+		}
+		else
+		{
+			$sHtml .= "<div class=\"itop_popup\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
+		}	
 		$sPrevUrl = '';
 		foreach ($aActions as $key => $aAction)
 		{

css/light-grey.css

@@ -402,8 +402,10 @@ div.itop_popup {
 
 div.itop_popup > ul {
 	height:19px;
+	line-height: 17px;
+	vertical-align: middle;
 	display:block;
-	width:70px; /* Nasty work-around for IE... en attendant mieux */
+	nowidth:70px; /* Nasty work-around for IE... en attendant mieux */
 	padding-left: 5px;
 	background: url(../images/actions_left.png) no-repeat top left;
 	cursor: pointer;
@@ -414,7 +416,7 @@ div.itop_popup > ul > li {
 	list-style: none;
 	font-size: 11px;
 	font-family: Tahoma,sans-serif;
-	height: 19px;
+	height: 17px;
 	padding-right: 16px;
 	padding-left: 4px;
 	background: url(../images/actions_right.png) no-repeat top right transparent;
@@ -1100,5 +1102,6 @@ div.actions_button a, .actions_button a:hover, .actions_button a:visited {
 	padding-left: 4px;
 	text-decoration: none;
 	height:17px;
+	line-height: 17px;
 	display: block;
 }

dictionaries/de.dictionary.itop.ui.php

@@ -447,7 +447,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:History:StatsDeletes' => 'Deleted',
 	'UI:History:StatsDeletes+' => 'Count of objects deleted',
 	'UI:Loading' => 'Laden...',
-	'UI:Menu:Actions' => 'Aktionen',
+	'UI:Menu:Actions' => 'Aktionen', 
+	'UI:Menu:OtherActions' => 'Andere Aktionen', 
 	'UI:Menu:New' => 'Neu...',
 	'UI:Menu:Add' => 'Hinzufügen...',
 	'UI:Menu:Manage' => 'Verwalten...',

dictionaries/dictionary.itop.ui.php

@@ -416,6 +416,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:History:StatsDeletes+' => 'Count of objects deleted',
 	'UI:Loading' => 'Loading...',
 	'UI:Menu:Actions' => 'Actions',
+	'UI:Menu:OtherActions' => 'Other Actions',
 	'UI:Menu:New' => 'New...',
 	'UI:Menu:Add' => 'Add...',
 	'UI:Menu:Manage' => 'Manage...',

dictionaries/es_cr.dictionary.itop.ui.php

@@ -414,6 +414,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:History:Changes+' => 'Chambios hechos al objeto',
 	'UI:Loading' => 'Cargando...',
 	'UI:Menu:Actions' => 'Acciones',
+	'UI:Menu:OtherActions' => 'Otras Acciones',
 	'UI:Menu:New' => 'Nuevo...',
 	'UI:History:StatsCreations' => 'Created',
 	'UI:History:StatsCreations+' => 'Count of objects created',

dictionaries/fr.dictionary.itop.ui.php

@@ -303,6 +303,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:History:StatsDeletes+' => 'Nombre d\'objets effacés',
 	'UI:Loading' => 'Chargement...',
 	'UI:Menu:Actions' => 'Actions',
+	'UI:Menu:OtherActions' => 'Autres Actions',
 	'UI:Menu:New' => 'Créer...',
 	'UI:Menu:Add' => 'Ajouter...',
 	'UI:Menu:Manage' => 'Gérer...',

dictionaries/hu.dictionary.itop.ui.php

@@ -302,6 +302,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:History:StatsDeletes+' => '',
 	'UI:Loading' => 'Betöltés...',
 	'UI:Menu:Actions' => 'Akciók',
+	'UI:Menu:OtherActions' => 'Egyéb Akciók',
 	'UI:Menu:New' => 'Új...',
 	'UI:Menu:Add' => 'Hozzáad...',
 	'UI:Menu:Manage' => 'Kezel...',

dictionaries/it.dictionary.itop.ui.php

@@ -305,6 +305,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:History:StatsDeletes+' => '',
 	'UI:Loading' => 'Caricamento...',
 	'UI:Menu:Actions' => 'Azioni',
+	'UI:Menu:OtherActions' => 'Altre Azioni',
 	'UI:Menu:New' => 'Nuovo...',
 	'UI:Menu:Add' => 'Aggiungi...',
 	'UI:Menu:Manage' => 'Gestischi...',

dictionaries/ja.dictionary.itop.ui.php

@@ -418,6 +418,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 					       'UI:History:StatsDeletes+' => '削除されたオブジェクト数', //'Count of objects deleted',
 					       'UI:Loading' => '読み込み...', //'Loading...',
 					       'UI:Menu:Actions' => '実行...', //'Actions',
+       'UI:Menu:OtherActions' => '実行...', //'Actions',
 					       'UI:Menu:New' => '新規...', //'New...',
 					       'UI:Menu:Add' => '追加...', //'Add...',
 					       'UI:Menu:Manage' => '管理する...', //'Manage...',

dictionaries/pt_br.dictionary.itop.ui.php

@@ -304,6 +304,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:History:StatsDeletes+' => 'Count of objects deleted',
 	'UI:Loading' => 'Carregando...',
 	'UI:Menu:Actions' => 'Ações',
+	'UI:Menu:OtherActions' => 'Outras Ações',
 	'UI:Menu:New' => 'Novo...',
 	'UI:Menu:Add' => 'Adicionar...',
 	'UI:Menu:Manage' => 'Gerencia...',

dictionaries/ru.dictionary.itop.ui.php

@@ -406,6 +406,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:History:Changes+' => 'Изменения, внесенные в объект',
 	'UI:Loading' => 'Загрузка...',
 	'UI:Menu:Actions' => 'Действия',
+	'UI:Menu:OtherActions' => 'Другие Действия',
 	'UI:Menu:New' => 'Новый...',
 	'UI:Menu:Add' => 'Добавить...',
 	'UI:Menu:Manage' => 'Управление...',

dictionaries/tr.dictionary.itop.ui.php

@@ -405,6 +405,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:History:Changes+' => 'Nesneye yapılan değişiklikler',
 	'UI:Loading' => 'Yükleniyor...',
 	'UI:Menu:Actions' => 'İşlemler',
+	'UI:Menu:OtherActions' => 'Diğer İşlemler',
 	'UI:Menu:New' => 'Yeni...',
 	'UI:Menu:Add' => 'Ekle...',
 	'UI:Menu:Manage' => 'Yönet...',

dictionaries/zh.dictionary.itop.ui.php

@@ -404,6 +404,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:History:Changes+' => '对该对象所做的变更',
 	'UI:Loading' => '载入...',
 	'UI:Menu:Actions' => '动作',
+	'UI:Menu:OtherActions' => '其他操作',
 	'UI:Menu:New' => '新建...',
 	'UI:Menu:Add' => '添加...',
 	'UI:Menu:Manage' => '管理...',