diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet index 55c09ae0cf..b418f374e6 100644 --- a/addressbook/templates/default/index.xet +++ b/addressbook/templates/default/index.xet @@ -101,7 +101,7 @@ - + diff --git a/api/js/jsapi/egw_images.js b/api/js/jsapi/egw_images.js index 50eb1ea569..e12732d37d 100644 --- a/api/js/jsapi/egw_images.js +++ b/api/js/jsapi/egw_images.js @@ -104,10 +104,19 @@ egw.extend('images', egw.MODULE_GLOBAL, function() } tries['global'] = _name; if (_name !== 'navbar' && // do NOT overwrite navbar images of all apps with placeholder - typeof images['global'] !== 'undefined' && typeof images['global'][_name] === 'string'&& - typeof images['bootstrap'] !== 'undefined' && typeof images['bootstrap'][images['global'][_name]] == 'string') + typeof images['global'] !== 'undefined' && typeof images['global'][_name] === 'string') { - return this.webserverUrl+images['bootstrap'][images['global'][_name]]; + if (typeof images['bootstrap'] !== 'undefined' && typeof images['bootstrap'][images['global'][_name]] == 'string') + { + return this.webserverUrl+images['bootstrap'][images['global'][_name]]; + } + // global replaces image with non-bootstrap image like {"save": "api/save"} to NOT use bootstrap's "save" icon + if (images['global'][_name].indexOf('/') !== -1) + { + const split = images['global'][_name].split('/',2); + _app = split[0]; + _name = split[1]; + } } tries[_app + (_app == 'phpgwapi' ? " (current app)" : "")] = _name; if (typeof images[_app] != 'undefined' && typeof images[_app][_name] == 'string') diff --git a/api/js/jsapi/egw_message.js b/api/js/jsapi/egw_message.js index 1ab2f242e9..a58f485985 100644 --- a/api/js/jsapi/egw_message.js +++ b/api/js/jsapi/egw_message.js @@ -57,7 +57,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd) /** * Display an error or regular message * - * Alle messages but type "success" are displayed 'til next message or user clicks on it. + * All messages, but type "success", are displayed 'til next message or user clicks on it. * * @param {string} _msg message to show or empty to remove previous message * @param {string} _type 'help', 'info', 'error', 'warning' or 'success' (default) @@ -469,4 +469,4 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd) } }; -}); +}); \ No newline at end of file diff --git a/api/src/Image.php b/api/src/Image.php index e0e43785c2..ddb5c6d955 100644 --- a/api/src/Image.php +++ b/api/src/Image.php @@ -133,6 +133,8 @@ class Image 'priority' => 'dash-circle', 'private' => 'key', 'reload' => 'arrow-clockwise', + 'save' => 'api/bi-save', // composition of floppy=apply and x-square=cancel + 'save_new' => 'api/bi-save-new', 'save_zip' => 'file-zip', //'search' => 'search', 'security-update' => 'shield-exclamation', diff --git a/api/templates/default/images/bi-save-new.svg b/api/templates/default/images/bi-save-new.svg new file mode 100644 index 0000000000..edfeb3be50 --- /dev/null +++ b/api/templates/default/images/bi-save-new.svg @@ -0,0 +1,50 @@ + + diff --git a/api/templates/default/images/bi-save.svg b/api/templates/default/images/bi-save.svg new file mode 100644 index 0000000000..4cece8e82a --- /dev/null +++ b/api/templates/default/images/bi-save.svg @@ -0,0 +1,51 @@ + +