extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-14 03:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into web-components

Browse Source
This commit is contained in:
nathan 2021-09-14 14:17:48 -06:00
commit d9fe73f979
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/js/app.ts
View File

@ -374,8 +374,7 @@ class AddressbookApp extends EgwApp
view_actions(_action, _widget)
{
var app_id = _widget.dom_id.split('_');
var et2 = etemplate2.getById(app_id[0]);
var et2 = _widget.getInstanceManager();
var id = et2.widgetContainer.getArrayMgr('content').data.id;
switch(_widget.id)
@ -1326,8 +1325,7 @@ class AddressbookApp extends EgwApp
*/
getWindowTitle()
{
var widget = this.et2.getWidgetById('n_fn');
if(widget) return widget.options.value;
return this.et2.getValueById('n_fn');
}
/**

12
filemanager/inc/class.filemanager_admin.inc.php
View File

@ -70,6 +70,7 @@ class filemanager_admin extends filemanager_ui
{
$this->versioning = Versioning\StreamWrapper::SCHEME;
}
Api\Translation::add_app('filemanager');
}
/**
@ -312,15 +313,16 @@ class filemanager_admin extends filemanager_ui
$sel_options['scheme'] = [
"webdavs" => "WebDAVs",
"smb" => "SMB",
"filesystem" => "Filesystem",
"filesystem" => lang("Filesystem"),
"sqlfs" => "SQLfs",
"links" => "Links",
"stylite.versioning" => "Versioning",
"stylite.links" => "Links+Versioning",
"links" => lang("Links"),
"stylite.versioning" => lang("Versioning"),
"stylite.links" => lang("Links").'+'.lang("Versioning"),
"vfs" => "VFS",
];
foreach($sel_options['scheme'] as $scheme => $label)
foreach($sel_options['scheme'] as $scheme => &$label)
{
$label = ['label' => $label, 'title' => $scheme.'://...'];
if (!Vfs::load_wrapper($scheme) || !self::$is_setup && $scheme === 'filesystem')
{
unset($sel_options['scheme'][$scheme]);

4
filemanager/lang/egw_de.lang
View File

@ -158,6 +158,7 @@ files common de Dateien
files from links filemanager de Zeige Dateien aus verknüpften Einträgen
files from subdirectories filemanager de Dateien aus Unterverzeichnissen
files in this directory filemanager de Dateien in diesem Verzeichnis
filesystem filemanager de Dateisystem
filesystem check reported no problems. filemanager de Überprüfung des Dateisystems ergab keine Probleme
filesystem: mount directory (inside /var/lib/egroupware!) from host filesystem filemanager de Dateisystem: mounted Verzeichnisse (innerhalb von /var/lib/egroupware) vom Dateisystem des Hosts
finally delete filemanager de Endgültig löschen
@ -224,6 +225,7 @@ operation filemanager de Vorgang
password for webdav and smb, use $pass for password of logged in user filemanager de Passwort für WebDAV und SMB, benutzer $pass für das Passwort des angemeldeten Benutzers
paste link filemanager de Als Verknüpfung einfügen
path %1 not found or not a directory! filemanager de Pfad %1 nicht gefunden oder kein Verzeichnis!
path and query-parameters, smb: share and optional path (with /) filemanager de Pfad und Suchparameter, SMB: Freigabe und optionaler Pfad (mit /)
percentage filemanager de Prozentual
permission denied! filemanager de Zugriff verweigert!
permissions filemanager de Zugriffsrechte
@ -278,7 +280,7 @@ show link "your home directory*" in side box menu?* filemanager de Möchten Sie
show link to filemanagers basedirectory (/) in side box menu? filemanager de Zeige die Verknüpfung zum Basisverzeichnis (/) des Dateimanagers im Seitenmenü?
size filemanager de Größe
smb, webdavs and vfs require a username! filemanager de SMB, WebDAVs und VFS benötigen einen Benutzernamen!
smb: mount samba of windows fileserver shares filemanager de SMB: mounten von Freigaben eines Samba oder Windows Dateiservern
smb: mount samba or windows fileserver shares filemanager de SMB: mounten von Freigaben eines Samba oder Windows Dateiserver
some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup. filemanager de Einige Funktionalitäten benötigen Superuser-Rechte. Bitte loggen sie sich hier als Dateimanager Superuser ein (Zulässige Benutzer werden im Setup festgelegt).
sqlfs statistics filemanager de sqlFS Statistik
start search filemanager de Suche starten

4
filemanager/lang/egw_en.lang
View File

@ -158,6 +158,7 @@ files common en Files
files from links filemanager en Files from links
files from subdirectories filemanager en Files from sub directories
files in this directory filemanager en Files in this directory
filesystem filemanager en Filesystem
filesystem check reported no problems. filemanager en Filesystem check reported no problems.
filesystem: mount directory (inside /var/lib/egroupware!) from host filesystem filemanager en Filesystem: mount directory (inside /var/lib/egroupware!) from host filesystem
finally delete filemanager en Finally delete
@ -224,6 +225,7 @@ operation filemanager en Operation
password for webdav and smb, use $pass for password of logged in user filemanager en Password for WebDAV and SMB, use $pass for password of logged in user
paste link filemanager en Paste Link
path %1 not found or not a directory! filemanager en Path %1 not found or not a directory!
path and query-parameters, smb: share and optional path (with /) filemanager en Path and query-parameters, SMB: share and optional path (with /)
percentage filemanager en Percentage
permission denied! filemanager en Permission denied!
permissions filemanager en Permissions
@ -279,7 +281,7 @@ show link "your home directory*" in side box menu?* filemanager en Show link "Yo
show link to filemanagers basedirectory (/) in side box menu? filemanager en Show link to File Manager's base directory (/) in side menu?
size filemanager en Size
smb, webdavs and vfs require a username! filemanager en SMB, WebDAVs and VFS require a username!
smb: mount samba of windows fileserver shares filemanager en SMB: mount Samba of Windows fileserver shares
smb: mount samba or windows fileserver shares filemanager en SMB: mount Samba or Windows fileserver shares
some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup. filemanager en Some functionalities require superuser permissions, please login here as filemanager superuser - allowed users are defined in setup.
sqlfs statistics filemanager en sqlFS Statistics
start search filemanager en Start search

6
filemanager/templates/default/admin.xet
View File

@ -49,13 +49,13 @@
<description value="Mount" align="center"/>
</row>
<row disabled="!@@is_root" part="footer" valign="bottom">
<textbox id="path" size="64"/>
<textbox id="path" size="48"/>
<vbox width="100%">
<groupbox>
<caption label="Protocols"/>
<vbox class="filemanager_protocols">
<description value="WebDAVs: mount EGroupware or *Cloud shares"/>
<description value="SMB: mount Samba of Windows fileserver shares"/>
<description value="SMB: mount Samba or Windows fileserver shares"/>
<description value="{Versioning}: {Versioning requires EGroupware EPL}"
extra_link_target="_blank" href="https://www.egroupware.org/EPL"/>
<description value="Filesystem: mount directory (inside /var/lib/egroupware!) from host filesystem"
@ -70,7 +70,7 @@
<passwd id="url[pass]" blur="password" statustext="Password for WebDAV and SMB, use $pass for password of logged in user" class="filemanager_password" size="12"/>
<description id="at"/>
<textbox id="url[host]" blur="host" statustext="Hostname/IP for WebDAV and SMB"/>
<textbox id="url[path]" blur="Path and query-parameters, SMB: share and optional path (with slashes!)" size="64"/>
<textbox id="url[path]" blur="Path and query-parameters, SMB: share and optional path (with /)" size="64"/>
</hbox>
</vbox>
<button label="Enable" id="enable" statustext="Enable versioning for given mountpoint" class="filemanager_smallButton" align="center"/>