using two new icons for open as text/html and not mime icons

This commit is contained in:
Ralf Becker 2014-02-19 08:01:37 +00:00
parent ac653d6c9a
commit f510e9d333

View File

@ -192,7 +192,7 @@ class mail_ui
$validFolder = true; $validFolder = true;
$result = true; $result = true;
$nameSpaces = $this->mail_bo->_getNameSpaces(); $nameSpaces = $this->mail_bo->_getNameSpaces();
foreach($nameSpaces as $key => $value ) foreach($nameSpaces as $key => $value )
{ {
if (str_replace($value['delimiter'],"",$value['prefix']) == $folderName && if (str_replace($value['delimiter'],"",$value['prefix']) == $folderName &&
@ -236,21 +236,21 @@ class mail_ui
function subscription(array $content=null ,$msg='') function subscription(array $content=null ,$msg='')
{ {
$stmpl = new etemplate_new('mail.subscribe'); $stmpl = new etemplate_new('mail.subscribe');
$profileId = $_GET['acc_id']; $profileId = $_GET['acc_id'];
$sel_options['foldertree'] = $this->getFolderTree(false, $profileId,false,false); $sel_options['foldertree'] = $this->getFolderTree(false, $profileId,false,false);
$allFolders = $this->mail_bo->getFolderObjects(); $allFolders = $this->mail_bo->getFolderObjects();
if (!is_array($content)) if (!is_array($content))
{ {
if ($profileId) if ($profileId)
{ {
$content['foldertree'] = array(); $content['foldertree'] = array();
$content['profileId'] = $profileId; $content['profileId'] = $profileId;
foreach ($allFolders as $folder) foreach ($allFolders as $folder)
{ {
$folderName = $profileId . self::$delimiter . $folder->folderName; $folderName = $profileId . self::$delimiter . $folder->folderName;
@ -305,7 +305,7 @@ class mail_ui
} }
} }
} }
$preserv['profileId'] = $content['profileId']; $preserv['profileId'] = $content['profileId'];
$readonlys = array(); $readonlys = array();
@ -1172,7 +1172,7 @@ class mail_ui
'caption' => lang('Text mode'), 'caption' => lang('Text mode'),
'hint' => 'Open in Text mode', 'hint' => 'Open in Text mode',
'group' => ++$group, 'group' => ++$group,
'icon' => egw_vfs::mime_icon('text/plain'), 'icon' => 'textmode',
'onExecute' => 'javaScript:app.mail.mail_openAsText', 'onExecute' => 'javaScript:app.mail.mail_openAsText',
'allowOnMultiple' => false, 'allowOnMultiple' => false,
), ),
@ -1180,7 +1180,7 @@ class mail_ui
'caption' => lang('HTML mode'), 'caption' => lang('HTML mode'),
'hint' => 'Open in HTML mode', 'hint' => 'Open in HTML mode',
'group' => $group, 'group' => $group,
'icon' => egw_vfs::mime_icon('text/html'), 'icon' => 'htmlmode',
'onExecute' => 'javaScript:app.mail.mail_openAsHtml', 'onExecute' => 'javaScript:app.mail.mail_openAsHtml',
'allowOnMultiple' => false, 'allowOnMultiple' => false,
), ),