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

using egw_framework::opener_refresh|window_close and some other small fixes

Browse Source
This commit is contained in:
Ralf Becker 2013-08-20 13:12:18 +00:00
parent 1c4f65120c
commit 8e2d5d0985
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -134,8 +134,7 @@ class filemanager_ui
'caption' => lang('Edit settings'), 'caption' => lang('Edit settings'),
'group' => $group, 'group' => $group,
'allowOnMultiple' => false, 'allowOnMultiple' => false,
'url' => 'menuaction=filemanager.filemanager_ui.file&path=$id', 'onExecute' => 'javaScript:app.filemanager.editprefs',
'popup' => '495x425',
), ),
'mail' => array( 'mail' => array(
'caption' => lang('Mail files'), 'caption' => lang('Mail files'),
@ -1047,12 +1046,8 @@ class filemanager_ui
} }
} }
} }
$js = "opener.egw_refresh('".str_replace("'","\\'",$msg)."','filemanager','". egw_framework::refresh_opener($msg, 'filemanager', $refresh_path ? $refresh_path : $path, 'edit', null, '&path=[^&]*');
str_replace("'","\\'",$refresh_path ? $refresh_path : $path)."','edit',null,/&path=[^&]*/);"; if ($button == 'save') egw_framework::window_close(true); // true = call common::egw_exit();
if ($button == 'save') $js .= "window.close();";
echo "<html>\n<body>\n<script>\n$js\n</script>\n</body>\n</html>\n";
if ($button == 'save') common::egw_exit();
} }
if ($content['is_link'] && !egw_vfs::stat($path)) if ($content['is_link'] && !egw_vfs::stat($path))
{ {

7
filemanager/js/app.js
View File

@ -457,10 +457,13 @@ app.filemanager = AppJS.extend(
/** /**
* Edit prefs of current directory * Edit prefs of current directory
*
* @param _action
* @param _senders
*/ */
editprefs: function() editprefs: function(_action, _senders)
{ {
var path = this.path_widget.getValue(); var path = typeof _senders != 'undefined' ? this.id2path(_senders[0].id) : this.path_widget.getValue();
egw().open_link(egw.link('/index.php', { egw().open_link(egw.link('/index.php', {
menuaction: 'filemanager.filemanager_ui.file', menuaction: 'filemanager.filemanager_ui.file',

2
filemanager/templates/default/file.xet
View File

@ -278,7 +278,7 @@
<button label="Apply" id="button[apply]"/> <button label="Apply" id="button[apply]"/>
<buttononly label="Cancel" id="button[cancel]" onclick="window.close();"/> <buttononly label="Cancel" id="button[cancel]" onclick="window.close();"/>
</hbox> </hbox>
<buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudo" onclick="set_style_by_class('fieldset','superuser','display','inline'); document.getElementById(form::name('sudo[user]')).focus();"/> <buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudo" onclick="\$j('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();"/>
</hbox> </hbox>
</row> </row>
<row> <row>

2
filemanager/templates/default/index.xet
View File

@ -72,7 +72,7 @@
</hbox> </hbox>
</template> </template>
<template id="filemanager.index" template="" lang="" group="0" version="1.9.003"> <template id="filemanager.index" template="" lang="" group="0" version="1.9.003">
<description id="msg" class="redItalic"/> <description id="msg" class="message"/>
<nextmatch id="nm" template="filemanager.index.rows" header_left="filemanager.index.header_left"/> <nextmatch id="nm" template="filemanager.index.rows" header_left="filemanager.index.header_left"/>
<styles> <styles>
input[type='file'] { input[type='file'] {