extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-05 04:49:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set view_range for toolbar in mail display popup, and set the actions from the client-side

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-05 16:17:37 +00:00
parent d78bd208cb
commit 37c6013619
3 changed files with 7 additions and 3 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

@ -1856,7 +1856,7 @@ unset($query['actions']);
$actionsenabled = array_reverse($actionsenabled,true); $actionsenabled = array_reverse($actionsenabled,true);
$actionsenabled['composeasnew']=$cAN; $actionsenabled['composeasnew']=$cAN;
$actionsenabled = array_reverse($actionsenabled,true); $actionsenabled = array_reverse($actionsenabled,true);
$etpl->setElementAttribute('toolbar','actions', $actionsenabled); $content['displayToolbaractions'] = json_encode($actionsenabled);
if (empty($subject)) $subject = lang('no subject'); if (empty($subject)) $subject = lang('no subject');
$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg); $content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
// Send mail ID so we can use it for actions // Send mail ID so we can use it for actions

2
mail/js/app.js
View File

@ -603,6 +603,8 @@ app.classes.mail = AppJS.extend(
dataElem.data = jQuery.extend(dataElem.data, content); dataElem.data = jQuery.extend(dataElem.data, content);
this.url_email_expandOnClick(expand_content, dataElem); this.url_email_expandOnClick(expand_content, dataElem);
var toolbaractions = ((typeof dataElem != 'undefined' && typeof dataElem.data != 'undefined' && typeof dataElem.data.displayToolbaractions != 'undefined')?JSON.parse(dataElem.data.displayToolbaractions):undefined);
if (toolbaractions) this.et2.getWidgetById('displayToolbar').set_actions(toolbaractions);
} }
}, },

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

@ -3,10 +3,12 @@
<overlay> <overlay>
<template id="mail.display" template="" lang="" group="0" version="1.9.001"> <template id="mail.display" template="" lang="" group="0" version="1.9.001">
<html id="msg"/> <html id="msg"/>
<vbox class="mailDisplay"> <vbox class="mailDisplayToolbar">
<hbox> <hbox>
<toolbar id="toolbar"/> <toolbar id="displayToolbar" view_range="12"/>
</hbox> </hbox>
</vbox>
<vbox class="mailDisplay">
<hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM" width="100%"> <hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM" width="100%">
<description value="From"/> <description value="From"/>
<url-email id="FROM" readonly="true"/> <url-email id="FROM" readonly="true"/>