diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php
index 1dd8086c93..6c4f33590d 100644
--- a/filemanager/inc/class.filemanager_hooks.inc.php
+++ b/filemanager/inc/class.filemanager_hooks.inc.php
@@ -46,10 +46,8 @@ class filemanager_hooks
// add "file a file" (upload) dialog
$file[] = array(
'text' => 'File a file',
- 'link' => "javascript:egw_openWindowCentered2('".Egw::link('/index.php',array(
- 'menuaction'=>'stylite.stylite_filemanager.upload',
- ),false)."','_blank',550,350)",
- 'app' => 'phpgwapi',
+ 'link' => "javascript:app.filemanager.fileafile()",
+ 'app' => 'api',
'icon' => 'upload',
);
}
diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index cfebac3071..27348dd6b0 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -972,5 +972,30 @@ app.classes.filemanager = AppJS.extend(
};
}
}
+ },
+
+ /**
+ * Open file a file dialog from EPL, warn if EPL is not available
+ *
+ * @param {jQuery.event} _event
+ * @param {et2_widget} _widget
+ */
+ fileafile: function(_event, _widget)
+ {
+ if (this.egw.user('apps').stylite)
+ {
+ this.egw.open_link('stylite.stylite_filemanager.upload', '_blank', '670x320');
+ }
+ else
+ {
+ et2_dialog.show_dialog(function(_button)
+ {
+ if (_button == et2_dialog.YES_BUTTON) window.open('http://www.egroupware.org/EPL', '_blank');
+ return true;
+ }, this.egw.lang('File a file is only available with an EPL subscription.')+"\n\n"+
+ this.egw.lang('You can use regular upload [+] button to upload files.')+"\n\n"+
+ this.egw.lang('Do you want more information about EPL subscription?'),
+ this.egw.lang('File a file'), undefined, et2_dialog.BUTTONS_YES_NO, et2_dialog.QUESTION_MESSAGE);
+ }
}
});
diff --git a/filemanager/lang/egw_de.lang b/filemanager/lang/egw_de.lang
index 1c466f3c68..81761b6224 100644
--- a/filemanager/lang/egw_de.lang
+++ b/filemanager/lang/egw_de.lang
@@ -96,6 +96,7 @@ disable filemanager de Ausschalten
disable versioning for this mountpoint filemanager de Versionierung für diesen Mountpoint ausschalten
display and modification of content filemanager de Anzeigen und Verändern des Inhaltes
display of content filemanager de Anzeigen des Inhaltes
+do you want more information about epl subscription? common de Wollen Sie mehr Informationen über die EGroupware Vollversion EPL?
do you want to overwrite existing file %1 in directory %2? filemanager de Wollen Sie die bestehende Datei %1 im Verzeichnis %2 überschreiben?
do you want to overwrite the existing file %1? filemanager de Wollen Sie die existierende Datei %1 überschreiben?
download filemanager de Herunterladen
@@ -131,6 +132,7 @@ file common de Datei
file %1 already exists filemanager de Es gibt schon eine Datei %1
file %1 could not be created. filemanager de Die Datei %1 konnte nicht erzeugt werden
file %1 may be too big. contact your systemadministrator for further info filemanager de Die Datei %1 ist eventuell zu gross. Kontaktieren Sie Ihren Systemadministrator für weiterreichende Informationen.
+file a file is only available with an epl subscription. filemanager de Datei ablegen ist nur mit einem EPL Vertrag verfügbar.
file deleted. filemanager de Datei gelöscht.
file names cannot contain "%1" filemanager de Dateinamen dürfen "%1" nicht enthalten
file or directory not found! filemanager de Datei oder Verzeichnis nicht gefunden!
@@ -282,6 +284,7 @@ wrong username or password! filemanager de Falscher Benutzername oder Passwort!
you are not allowed to finally delete older versions and deleted files! filemanager de Sie haben nicht die Berechtigung ältere Versionen oder gelöschte Dateien endgültig zu löschen!
you are not allowed to upload a script! filemanager de Sie dürfen KEINE Skripte hochladen!
you can only grant additional rights, you can not take rights away! filemanager de Sie können nur zusätzliche Rechte gewähren, Rechte können NICHT weg genommen werden!
+you can use regular upload [+] button to upload files. filemanager de Sie können Dateien über den regulären [+] Button hochladen.
you do not have access to %1 filemanager de Sie besitzen keine Zugriffsrechte für %1
you need to become root, to enable or disable versioning on a directory! filemanager de Sie müssen Superuser sein, um die Versionierung für ein Verzeichnis ein- oder auszuschalten!
you need to select an owner! filemanager de Sie müssen einen Eigentümer auswählen!
diff --git a/filemanager/lang/egw_en.lang b/filemanager/lang/egw_en.lang
index ca7b4df320..1b6d1b7455 100644
--- a/filemanager/lang/egw_en.lang
+++ b/filemanager/lang/egw_en.lang
@@ -96,6 +96,7 @@ disable filemanager en Disable
disable versioning for this mountpoint filemanager en Disable versioning for this mountpoint
display and modification of content filemanager en Display and modification of content
display of content filemanager en Display of content
+do you want more information about epl subscription? common en Do you want more information about EPL subscription?
do you want to overwrite existing file %1 in directory %2? filemanager en Do you want to overwrite existing file %1 in directory %2?
do you want to overwrite the existing file %1? filemanager en Do you want to overwrite the existing file %1?
download filemanager en Download
@@ -131,6 +132,7 @@ file common en File
file %1 already exists filemanager en File %1 already exists
file %1 could not be created. filemanager en File %1 could not be created.
file %1 may be too big. contact your systemadministrator for further info filemanager en File %1 might be too big.
+file a file is only available with an epl subscription. filemanager en File a file is only available with an EPL subscription.
file deleted. filemanager en File deleted.
file names cannot contain "%1" filemanager en File names cannot contain "%1"
file or directory not found! filemanager en File or directory not found!
@@ -282,6 +284,7 @@ wrong username or password! filemanager en Wrong username or password!
you are not allowed to finally delete older versions and deleted files! filemanager en You are NOT allowed to finally delete older versions and deleted files!
you are not allowed to upload a script! filemanager en You are NOT allowed to upload a script!
you can only grant additional rights, you can not take rights away! filemanager en You can only grant additional rights, you can NOT take rights away!
+you can use regular upload [+] button to upload files. filemanager en You can use regular upload [+] button to upload files.
you do not have access to %1 filemanager en You do not have access to %1
you need to become root, to enable or disable versioning on a directory! filemanager en You need to become root, to enable or disable versioning on a directory!
you need to select an owner! filemanager en You need to select an owner!
@@ -289,4 +292,4 @@ you need to select some files first! filemanager en You need to select some file
you will be redirected to your home directory. filemanager en You will be redirected to your home directory.
you will be redirected to your start folder. filemanager en You will be redirected to your start folder.
your home dir did not exist, egroupware created a new one. filemanager en Your Home Dir did not exist, EGroupware created a new one.
-your home directory filemanager en Home directory
\ No newline at end of file
+your home directory filemanager en Home directory
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index 383330f7ac..7de16dccbf 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -60,7 +60,7 @@
-
+