[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.21 cla
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.21 class.uiaction_base.inc.php, 1.5 class.bofilemanager.inc.php, 1.15 |
|
Date: |
Thu, 24 Feb 2005 15:06:51 -0000 |
Update of filemanager/inc
Modified Files:
Branch: MAIN
class.uifilemanager.inc.php lines: +20 -7
class.uiaction_base.inc.php lines: +6 -1
class.bofilemanager.inc.php lines: +24 -10
Log Message:
update
====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.20
filemanager/inc/class.uifilemanager.inc.php:1.21
--- filemanager/inc/class.uifilemanager.inc.php:1.20 Thu Jan 27 02:25:58 2005
+++ filemanager/inc/class.uifilemanager.inc.php Thu Jan 27 13:24:02 2005
@@ -639,7 +639,7 @@
if
($file['mime_type']=='Directory')
{
$href = array('menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
-
'path' =>
$this->bofilemanager->path.SEP.$file['name']
+
'path' => $this->bofilemanager->path .
$this->bofilemanager->dispsep . $file['name']
);
}
else
@@ -704,20 +704,31 @@
'help_home' => array('widget' =>
array('type' => 'help','onClick' => $this->bofilemanager->build_help('home'))),
'current_dir' => $this->bofilemanager->path,
'help_dir' => array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('current_dir'))),
+ 'img_dir' => array('widget' =>
array('type' => 'image',
+
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,($this->bofilemanager->homestr?'folder_home':'folder')),
+
'title' => lang('current directory'))),
'img_upload' => array('widget' =>
array('type' => 'image',
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'1uparrow'),
'title' => lang('upload files'),
'name' => 'params[upload]',
'value' => 'upload')),
'help_upload_files' => array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('upload_files'))),
+ 'lang_upload' => lang('upload'),
'img_refresh' => array('widget' =>
array('type' => 'image',
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'reload'),
'title' => lang('refresh'),
'link' => $GLOBALS['phpgw']->link('/index.php',Array(
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.update',
'path' =>
urlencode($this->bofilemanager->path))))),
- 'help_refresh' => array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('refresh')))
-
+ 'help_refresh' => array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('refresh'))),
+ 'img_dl' => array('widget' =>
array('type' => 'image',
+
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'bottom'),
+
'title' => lang('download files'),
+
'link' =>
$GLOBALS['phpgw']->link('/index.php',Array(
+
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
+
'path' =>
urlencode($this->bofilemanager->homedir))))),
+ 'help_dl' => array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('download'))),
+ 'lang_dl' => lang('download')
/*'add_moz_sidebar' => array
(
'url' =>
$GLOBALS['phpgw']->link('/index.php',array(
@@ -729,7 +740,7 @@
)*/
);
- if($this->bofilemanager->path != '/' &&
$this->bofilemanager->path != $this->bofilemanager->fakebase)
+ if($this->bofilemanager->path != '/')
{
$data['img_up'] = array('widget' =>
array('type' => 'image',
'src' =>
$GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'up'),
@@ -738,6 +749,9 @@
'menuaction' =>
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
'path' =>
urlencode($this->bofilemanager->lesspath)))));
$data['help_up'] = array('widget' =>
array('type' => 'help','onClick' => $this->bofilemanager->build_help('up')));
+
+ if($this->bofilemanager->path !=
$this->bofilemanager->fakebase)
+ {
$data['create_folder'] = array('widget' =>
array('type' => 'text',
'name' => 'createdir',
'maxlength' => '255',
@@ -764,6 +778,7 @@
));
$data['lang_create_file'] = lang('create
file');
$data['help_create_file'] =
array('widget' => array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('create_file')));
+ }
}
if (strlen($this->bofilemanager->errors))
@@ -819,10 +834,8 @@
$data['help_dir_list'] = array('widget' =>
array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('dir_list')));
$data['uploads'] =
$this->display_uploads();
}
-
$data['lang_show']
= lang('show');
$data['lang_upload_fields'] =
lang('upload fields');
- $data['lang_upload_files'] =
lang('upload files');
$data['help_upload_file'] =
array('widget' => array('type' => 'help','onClick' =>
$this->bofilemanager->build_help('upload_file')));
$data['lang_file']
= lang('file');
$data['lang_comment'] =
lang('comment');
====================================================
Index: filemanager/inc/class.uiaction_base.inc.php
diff -u filemanager/inc/class.uiaction_base.inc.php:1.4
filemanager/inc/class.uiaction_base.inc.php:1.5
--- filemanager/inc/class.uiaction_base.inc.php:1.4 Thu Jan 27 01:55:40 2005
+++ filemanager/inc/class.uiaction_base.inc.php Thu Jan 27 13:24:02 2005
@@ -46,6 +46,11 @@
$msg = $this->bofilemanager->help_info[$key];
}
+ $msg =
preg_replace("/\[(.*)\|(.*)\]/Ue","\$this->bofilemanager->build_help('\\1','\\2')",$msg);
+ $msg =
preg_replace("/\[(.*)\]/Ue","\$this->bofilemanager->build_help('\\1','\\1')",$msg);
+
+ //echo 'msg:' . $msg;
+
$help['lang_close'] = lang('close window');
$help['msg'] = $msg;
====================================================
Index: filemanager/inc/class.bofilemanager.inc.php
diff -u filemanager/inc/class.bofilemanager.inc.php:1.14
filemanager/inc/class.bofilemanager.inc.php:1.15
--- filemanager/inc/class.bofilemanager.inc.php:1.14 Thu Jan 27 01:55:40 2005
+++ filemanager/inc/class.bofilemanager.inc.php Thu Jan 27 13:24:02 2005
@@ -28,6 +28,7 @@
var $hostname;
var $userinfo = Array();
var $homedir;
+ var $homestr = False;
var $file_attributes;
var $help_info;
@@ -224,6 +225,11 @@
$this->lesspath = '/';
}
+ if(substr($this->path,0,strlen($this->homedir)) ==
$this->homedir)
+ {
+ $this->homestr = True;
+ }
+
$this->now = date('Y-m-d');
if($this->debug)
@@ -893,12 +899,20 @@
}
/**TODO : xslt-ise this */
- function build_help($help_option)
+ function build_help($help_option,$text = '')
{
if($this->settings['show_help'])
{
- $help = "open_popup('" .
$GLOBALS['phpgw']->link('/index.php',
- array('menuaction' =>
$this->appname.'.uiaction_base.help','help_name' => urlencode($help_option)))
. "','250','150')";
+ $link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
$this->appname.'.uiaction_base.help','help_name' =>
urlencode($help_option)));
+
+ if(strlen($text)>0)
+ {
+ $help = '<a href="' . $link . '">' .
$text . '</a>';
+ }
+ else
+ {
+ $help = "open_popup('" . $link .
"','250','150')";
+ }
return $help;
}
else
@@ -911,7 +925,7 @@
{
$this->help_info = array
(
- 'up' => 'The Up button takes you to the
directory above the current directory. For example, if you are in
/home/jdoe/mydir, the Up button would take you to /home/jdoe.',
+ 'up' => 'The Up button takes you to the
directory above the current directory. For example, if you are in
*/home/jdoe/mydir*, the Up button would take you to */home/jdoe*.',
'current_dir' => 'The name of the directory you
are currently in.',
'home' => 'The Home button takes you to your
personal home directory.',
'sort_by' => 'Click on any of the column
headers to sort the list by that column.',
@@ -930,10 +944,10 @@
'rename' => "Rename the selected file(s). You
can select as many files or directories as you want. You are presented with a
text field to enter the new name of each file or directory.",
'delete' => "Delete the selected file(s). You
can select as many files or directories as you want. When deleting
directories, the entire directory and all of its contents are deleted. You
will not be prompted to make sure you want to delete the file(s); make sure you
really want to delete them before clicking Delete.",
'edit_comments' => "Create a comment for a file
or directory, or edit an existing comment. You can select as many files or
directories as you want.",
- 'go_to' => 'The Go to button takes you to the
directory selected in the drop down [directory_list|Directory List].',
- 'copy_to' => 'This will copy all selected files
and directories to the directory selected in the drop down
[directory_list|Directory List].',
- 'move_to' => 'This will move all selected files
and directories to the directory selected in the drop down
[directory_list|Directory List].',
- 'dir_list' => 'The Directory List contains a
list of all directories you have (at least) read access to. Selecting [Go to]
[Copy to] [Move to] from the left Menu will perform the selected action on that
directory. For example, if you select */home/somegroup/reports* from the
Directory List, and choose [Copy to] from the left Menu, all selected files and
directories will be copied to */home/somegroup/reports*.',
+ 'go_to' => 'The Go to button takes you to the
directory selected in the drop down [dir_list|Directory List].',
+ 'copy_to' => 'This will copy all selected files
and directories to the directory selected in the drop down [dir_list|Directory
List].',
+ 'move_to' => 'This will move all selected files
and directories to the directory selected in the drop down [dir_list|Directory
List].',
+ 'dir_list' => 'The Directory List contains a
list of all directories you have (at least) read access to. Selecting [go_to|Go
to]/[copy_to|Copy to]/[move_to|Move to] from the left Menu will perform the
selected action on that directory. For example, if you select
*/home/somegroup/reports* from the Directory List, and choose [copy_to|Copy to]
from the left Menu, all selected files and directories will be copied to
*/home/somegroup/reports*.',
'download' => 'Download the first selected file
to your local computer. You can only download one file at a time. Directories
cannot be downloaded, only files.',
'create_folder' => "Creates a directory (folder
== directory). The name of the directory is specified in the text box next to
the Create Folder button.",
'create_file' => "Creates a file in the current
directory. The name of the file is specified in the text box next to the
Create File button. After clicking the Create File button you will be
presented with the [edit|Edit] screen, where you may edit the file you just
created. If you do not with to make any changes to the file at this time,
simply click the Save button and the file will be saved as an empty file.",
@@ -943,7 +957,7 @@
'file_stats' => "Various statistics on the
number and size of the files in the current directory. In some situations,
these reflect different statistics. For example, when in / or the base
directory.",
'upload_file' => 'The full path of the local
file to upload. You can type it in or use the Browse.. button to select it. The
file will be uploaded to the current directory. You cannot upload directories,
only files.',
'upload_comment' => 'The inital comment to use
for the newly uploaded file. Totally optional and completely arbitrary. You can
[edit_comments|create or edit the comment] at any time in the future.',
- 'upload_files' => 'This will upload the files
listed in the input boxes above, and store them in the current directory.',
+ 'upload_files' => 'This will upload the files
listed in the input boxes and store them in the current directory.',
'show_upload_fields' => 'This setting
determines how many fields for uploading files will be shown at once. You can
change the default number that will be shown by clicking one of the numbers or
in the preferences section.',
'refresh' => 'Clicking the button
refreshes the current window.',
'menu' => ''
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.21 class.uiaction_base.inc.php, 1.5 class.bofilemanager.inc.php, 1.15,
ceb <=