holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unset drag_mail actions from display and preview toolbar, and set view_rang for display toolbar to 6 actions

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-25 13:50:58 +00:00
parent a021f998e0
commit fdd747fe35
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_ui.inc.php
View File

@ -1846,6 +1846,7 @@ unset($query['actions']);
else $data["flags"][$flag] = $flag;
}
}
unset($actionsenabled['drag_mail']);
$data['attachmentsPresent'] = $imageTag;
$data['attachmentsBlock'] = $imageHTMLBlock;
$data['toolbaractions'] = json_encode($actionsenabled);
@ -2005,6 +2006,7 @@ unset($query['actions']);
unset($actionsenabled['mark']['children']['read']);
unset($actionsenabled['mark']['children']['unread']);
unset($actionsenabled['mark']['children']['undelete']);
unset($actionsenabled['drag_mail']);
$actionsenabled['mark']['children']['flagged']=array(
'group' => $actionsenabled['mark']['children']['flagged']['group'],
'caption' => 'Flagged',

2
mail/templates/default/display.xet
View File

@ -5,7 +5,7 @@
<html id="msg"/>
<vbox class="mailDisplay">
<hbox>
<toolbar id="displayToolbar" width="100%" view_range="8" flat_list="false"/>
<toolbar id="displayToolbar" width="100%" view_range="6" flat_list="false"/>
</hbox>
<hbox>
<hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM" width="70%">