holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP of background & logo image upload into instance dir:

Browse Source 
- Add some translation
- Add filemtime timestamp into url
This commit is contained in:
Hadi Nategh 2017-04-28 16:30:01 +02:00
parent af780e5168
commit 9f98d0fe56
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_config.inc.php
View File

@ -41,7 +41,7 @@ class admin_config
if ($success) if ($success)
{ {
$response->data(array( $response->data(array(
'path' => $GLOBALS['egw_info']['server']['webserver_url'].'/api/anon_images.php?src='.urlencode($file[$tmp_file[0]]['name']) 'path' => $GLOBALS['egw_info']['server']['webserver_url'].'/api/anon_images.php?src='.urlencode($file[$tmp_file[0]]['name']).'&'.filemtime($destination)
)); ));
} }
else else

7
admin/lang/egw_de.lang
View File

@ -270,8 +270,8 @@ description can not exceed 255 characters in length ! admin de Die Beschreibung
destination account #%1 does exist and is not renamed itself! can not merge accounts, it will violate unique contains. delete with transfer of data instead. admin de Zielkonto #%1 besteht und wurde nicht umbenannt. Konten wurden nicht zusammengeführt, da die eindeutige Kennzeichnung gestört würde. Alternativ sollten Sie löschen mit übertragen des Inhalts anwählen. destination account #%1 does exist and is not renamed itself! can not merge accounts, it will violate unique contains. delete with transfer of data instead. admin de Zielkonto #%1 besteht und wurde nicht umbenannt. Konten wurden nicht zusammengeführt, da die eindeutige Kennzeichnung gestört würde. Alternativ sollten Sie löschen mit übertragen des Inhalts anwählen.
determines the order the fields are displayed admin de bestimmt die Reihenfolge der angezeigten Felder determines the order the fields are displayed admin de bestimmt die Reihenfolge der angezeigten Felder
disable admin de abschalten disable admin de abschalten
disable all admin de Alle Videos deaktivieren
disable "auto completion" of the login form admin de Automatisches Vervollständigen der Logindaten abschalten disable "auto completion" of the login form admin de Automatisches Vervollständigen der Logindaten abschalten
disable all admin de Alle Videos deaktivieren
disable minifying of javascript and css files admin de Komprimierung von Javascript und CSS Dateien deaktivieren disable minifying of javascript and css files admin de Komprimierung von Javascript und CSS Dateien deaktivieren
disable wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) abschalten disable wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) abschalten
disabled (not recomended) admin de abgeschaltet (nicht empfohlen) disabled (not recomended) admin de abgeschaltet (nicht empfohlen)
@ -347,8 +347,6 @@ enter the site password for peer servers admin de Site-Passwort für Peer-Server
enter the site username for peer servers admin de Site-Benutzername für Peer-Server enter the site username for peer servers admin de Site-Benutzername für Peer-Server
enter the title for your site admin de Titel der EGroupware-Installation enter the title for your site admin de Titel der EGroupware-Installation
enter the title of your logo admin de Titel Ihres Logos enter the title of your logo admin de Titel Ihres Logos
enter the url or filename (in api/templates/default/images) of your logo admin de URL oder Dateiname (in api/templates/default/images) Ihres Logos
enter the url or filename (in your templates image directory) of your favicon (the little icon that appears in the browsers tabs) admin de Geben Sie eine URL oder einen Dateinamen (in Ihrem Templates Bilder Verzeichnis) für Ihrem Favoriten (das kleine Icon oben links im Browserfenster) an.
enter the url where your logo should link to admin de URL mit der das Logo verlinkt werden soll enter the url where your logo should link to admin de URL mit der das Logo verlinkt werden soll
enter the vfs-path where additional images, icons or logos can be placed (and found by egroupwares applications). the path must start with /,and be readable by all users admin de Geben Sie den VFS-Pfad an, in dem noch mehr Bilder oder Icons abgelegt und von EGroupware Applikationen verwendet werden können. Der Pfad muss mit einem "/" beginnen und von allen Benutzern lesbar sein. enter the vfs-path where additional images, icons or logos can be placed (and found by egroupwares applications). the path must start with /,and be readable by all users admin de Geben Sie den VFS-Pfad an, in dem noch mehr Bilder oder Icons abgelegt und von EGroupware Applikationen verwendet werden können. Der Pfad muss mit einem "/" beginnen und von allen Benutzern lesbar sein.
enter your default ftp server admin de Standard-FTP-Server enter your default ftp server admin de Standard-FTP-Server
@ -820,6 +818,9 @@ unwilling to save category with current settings. check for inconsistency: admin
up admin de hoch up admin de hoch
update current email address: admin de Aktualisiere aktuelle E-Mail-Adresse update current email address: admin de Aktualisiere aktuelle E-Mail-Adresse
updated admin de aktualisiert updated admin de aktualisiert
upload your background image or enter the url admin de Laden Sei ein Hintergrundbild hoch oder geben Sie eine entsprechende URL ein
upload your favicon or enter the url admin de Laden Sie ein Favicon hoch oder geben Sie eine URL dafür ein
upload your logo or enter the url admin de Laden Sie Ihr Logo hoch oder geben Sie eine URL dafür ein
uppercase, lowercase, number, special char admin de Großbuchstaben, kleine Buchstaben, Zahlen, Sonderzeichen uppercase, lowercase, number, special char admin de Großbuchstaben, kleine Buchstaben, Zahlen, Sonderzeichen
url of the egroupware installation, eg. http://domain.com/egroupware admin de URL der EGroupware Installation, z.B. http://domain.com/egroupware url of the egroupware installation, eg. http://domain.com/egroupware admin de URL der EGroupware Installation, z.B. http://domain.com/egroupware
usage admin de Einsatz usage admin de Einsatz

5
admin/lang/egw_en.lang
View File

@ -347,8 +347,6 @@ enter the site password for peer servers admin en Enter the site password for pe
enter the site username for peer servers admin en Enter the site username for peer servers enter the site username for peer servers admin en Enter the site username for peer servers
enter the title for your site admin en Enter the title for site enter the title for your site admin en Enter the title for site
enter the title of your logo admin en Enter the title of logo enter the title of your logo admin en Enter the title of logo
enter the url or filename (in api/templates/default/images) of your logo admin en Enter the URL or file name of your logo
enter the url or filename (in your templates image directory) of your favicon (the little icon that appears in the browsers tabs) admin en Enter the URL or file name of your favicon
enter the url where your logo should link to admin en Enter the URL where the logo should link to enter the url where your logo should link to admin en Enter the URL where the logo should link to
enter the vfs-path where additional images, icons or logos can be placed (and found by egroupwares applications). the path must start with /,and be readable by all users admin en Enter the VFS path where additional images, icons or logos can be placed and found by EGroupware's applications.<br>The path MUST start with / and be readable by all users enter the vfs-path where additional images, icons or logos can be placed (and found by egroupwares applications). the path must start with /,and be readable by all users admin en Enter the VFS path where additional images, icons or logos can be placed and found by EGroupware's applications.<br>The path MUST start with / and be readable by all users
enter your default ftp server admin en Enter your default FTP server enter your default ftp server admin en Enter your default FTP server
@ -820,6 +818,9 @@ unwilling to save category with current settings. check for inconsistency: admin
up admin en Up up admin en Up
update current email address: admin en Update current email address: update current email address: admin en Update current email address:
updated admin en Updated updated admin en Updated
upload your background image or enter the URL admin en Upload your background image or enter the URL
upload your favicon or enter the URL admin en Upload your favicon or enter the URL
upload your logo or enter the URL admin en Upload your logo or enter the URL
uppercase, lowercase, number, special char admin en Uppercase, lowercase, number, special char uppercase, lowercase, number, special char admin en Uppercase, lowercase, number, special char
url of the egroupware installation, eg. http://domain.com/egroupware admin en URL of the EGroupware installation, e.g. http://domain.com/egroupware url of the egroupware installation, eg. http://domain.com/egroupware admin en URL of the EGroupware installation, e.g. http://domain.com/egroupware
usage admin en Usage usage admin en Usage

27
admin/templates/default/config.xet
View File

@ -51,11 +51,11 @@
<textbox id="newsettings[site_title]"/> <textbox id="newsettings[site_title]"/>
</row> </row>
<row> <row>
<description value="Enter the URL or filename (in api/templates/default/images) of your logo" label="%s:"/> <description value="Upload your logo or enter the URL" label="%s:"/>
<hbox> <vbox>
<textbox id="newsettings[login_logo_file]" width="70%"/> <textbox id="newsettings[login_logo_file]" width="100%"/>
<file onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value()], function(_data){widget._parent._children[0].set_value(_data.path)}).sendRequest()" width="30%" label="upload"/> <file onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value()], function(_data){widget._parent._children[0].set_value(_data.path)}).sendRequest()" width="100%" label="upload"/>
</hbox> </vbox>
</row> </row>
<row> <row>
<description value="Enter the url where your logo should link to" label="%s:"/> <description value="Enter the url where your logo should link to" label="%s:"/>
@ -66,15 +66,18 @@
<textbox id="newsettings[login_logo_title]" width="100%"/> <textbox id="newsettings[login_logo_title]" width="100%"/>
</row> </row>
<row> <row>
<description value="Enter the URL or filename (in api/templates/default/images) of your background image" label="%s:"/> <description value="Upload your background image or enter the URL" label="%s:"/>
<hbox> <vbox>
<textbox id="newsettings[login_background_file]" width="70%"/> <textbox id="newsettings[login_background_file]" width="100%"/>
<file width="30%" label="upload" onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value()], function(_data){widget._parent._children[0].set_value(_data.path)}).sendRequest()"/> <file width="100%" label="upload" onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value()], function(_data){widget._parent._children[0].set_value(_data.path)}).sendRequest()"/>
</hbox> </vbox>
</row> </row>
<row> <row>
<description value="Enter the URL or filename (in your templates image directory) of your favicon (the little icon that appears in the browsers tabs)" label="%s:"/> <description value="Upload your favicon or enter the URL" label="%s:"/>
<textbox id="newsettings[favicon_file]" class="et2_fullWidth"/> <vbox>
<textbox id="newsettings[favicon_file]" class="et2_fullWidth"/>
<file width="100%" label="upload" onchange="egw.json('admin.admin_config.ajax_upload_anon_images',[widget.get_value()], function(_data){widget._parent._children[0].set_value(_data.path)}).sendRequest()"/>
</vbox>
</row> </row>
<row> <row>
<description value="How big should thumbnails for linked images be (maximum in pixels) ?" label="%s:"/> <description value="How big should thumbnails for linked images be (maximum in pixels) ?" label="%s:"/>