extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

new save and save-new icons based on Bootstrap icons floppy composed with either x-square-filled or plus-circle-filled

Browse Source
This commit is contained in:
ralf 2024-08-27 11:03:47 +02:00
parent e6593a101b
commit e4b073dfa3
6 changed files with 118 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/templates/default/index.xet
View File

@ -101,7 +101,7 @@
</et2-vbox> </et2-vbox>
</row> </row>
<row class="$row_cont[class] $row_cont[cat_id]" valign="top"> <row class="$row_cont[class] $row_cont[cat_id]" valign="top">
<et2-image align="center" label="$row_cont[type_label]" src="$row_cont[type]" noLang="1" style="font-size: 200%"/> <et2-image align="center" label="$row_cont[type_label]" src="$row_cont[type]" noLang="1" style="font-size: 22px"/>
<et2-vbox id="${row}[id]"> <et2-vbox id="${row}[id]">
<et2-description id="${row}[line1]" noLang="1"></et2-description> <et2-description id="${row}[line1]" noLang="1"></et2-description>
<et2-description id="${row}[line2]" noLang="1"></et2-description> <et2-description id="${row}[line2]" noLang="1"></et2-description>

13
api/js/jsapi/egw_images.js
View File

@ -104,11 +104,20 @@ egw.extend('images', egw.MODULE_GLOBAL, function()
} }
tries['global'] = _name; tries['global'] = _name;
if (_name !== 'navbar' && // do NOT overwrite navbar images of all apps with placeholder if (_name !== 'navbar' && // do NOT overwrite navbar images of all apps with placeholder
typeof images['global'] !== 'undefined' && typeof images['global'][_name] === 'string'&& typeof images['global'] !== 'undefined' && typeof images['global'][_name] === 'string')
typeof images['bootstrap'] !== 'undefined' && typeof images['bootstrap'][images['global'][_name]] == 'string') {
if (typeof images['bootstrap'] !== 'undefined' && typeof images['bootstrap'][images['global'][_name]] == 'string')
{ {
return this.webserverUrl+images['bootstrap'][images['global'][_name]]; 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; tries[_app + (_app == 'phpgwapi' ? " (current app)" : "")] = _name;
if (typeof images[_app] != 'undefined' && typeof images[_app][_name] == 'string') if (typeof images[_app] != 'undefined' && typeof images[_app][_name] == 'string')
{ {

2
api/js/jsapi/egw_message.js
View File

@ -57,7 +57,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
/** /**
* Display an error or regular message * 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} _msg message to show or empty to remove previous message
* @param {string} _type 'help', 'info', 'error', 'warning' or 'success' (default) * @param {string} _type 'help', 'info', 'error', 'warning' or 'success' (default)

2
api/src/Image.php
View File

@ -133,6 +133,8 @@ class Image
'priority' => 'dash-circle', 'priority' => 'dash-circle',
'private' => 'key', 'private' => 'key',
'reload' => 'arrow-clockwise', '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', 'save_zip' => 'file-zip',
//'search' => 'search', //'search' => 'search',
'security-update' => 'shield-exclamation', 'security-update' => 'shield-exclamation',

50
api/templates/default/images/bi-save-new.svg Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="16"
height="16"
fill="currentColor"
class="bi bi-floppy"
viewBox="0 0 16 16"
version="1.1"
id="svg2"
sodipodi:docname="bi-save-new.svg"
xml:space="preserve"
inkscape:version="1.3.2 (091e20e, 2023-11-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs2" /><sodipodi:namedview
id="namedview2"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="51.6875"
inkscape:cx="7.9903265"
inkscape:cy="7.9903265"
inkscape:window-width="1392"
inkscape:window-height="1067"
inkscape:window-x="2462"
inkscape:window-y="25"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" /><path
d="M11 2H9v3h2z"
id="path1" /><path
d="M1.5 0h11.586a1.5 1.5 0 0 1 1.06.44l1.415 1.414A1.5 1.5 0 0 1 16 2.914V14.5a1.5 1.5 0 0 1-1.5 1.5h-13A1.5 1.5 0 0 1 0 14.5v-13A1.5 1.5 0 0 1 1.5 0M1 1.5v13a.5.5 0 0 0 .5.5H2v-4.5A1.5 1.5 0 0 1 3.5 9h9a1.5 1.5 0 0 1 1.5 1.5V15h.5a.5.5 0 0 0 .5-.5V2.914a.5.5 0 0 0-.146-.353l-1.415-1.415A.5.5 0 0 0 13.086 1H13v4.5A1.5 1.5 0 0 1 11.5 7h-7A1.5 1.5 0 0 1 3 5.5V1H1.5a.5.5 0 0 0-.5.5m3 4a.5.5 0 0 0 .5.5h7a.5.5 0 0 0 .5-.5V1H4zM3 15h10v-4.5a.5.5 0 0 0-.5-.5h-9a.5.5 0 0 0-.5.5z"
id="path2" /><rect
style="fill:#fefefe;stroke-width:2.026;paint-order:markers stroke fill"
id="rect2"
width="5.7654171"
height="5.1850061"
x="9.1124544"
y="9.3446188" /><g
style="fill:currentColor"
id="g2"
transform="matrix(0.51995163,0,0,0.51027811,7.6711004,7.8258767)"><path
d="m 16,8 c 0,4.418281 -3.581722,7.999997 -8,7.999997 C 3.5817221,15.999997 0,12.418281 0,8 0,3.581719 3.5817221,3.4729399e-6 8,3.4729399e-6 12.418278,3.4729399e-6 16,3.581719 16,8 M 9.1325581,3.4763033 C 9.1253787,2.8096771 7.0090997,2.7717624 7.0162791,3.4383886 l 0.037209,3.4549763 -3.8186047,0.037915 C 2.568249,6.9378986 2.531008,8.8791469 3.1976744,8.8791469 L 7.0162791,8.8412322 7.0534884,12.7891 c 0.00628,0.666635 2.1225622,0.70455 2.116279,0.03791 l -0.037209,-3.9478671 3.5581399,0 c 0.666666,0 0.703842,-1.9411168 0.03721,-1.9478673 l -3.5581396,0 z"
id="path1-6"
sodipodi:nodetypes="cssscsscsscsscsscs" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

51
api/templates/default/images/bi-save.svg Normal file
View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="16"
height="16"
fill="currentColor"
class="bi bi-floppy"
viewBox="0 0 16 16"
version="1.1"
id="svg2"
sodipodi:docname="bi-save2.svg"
xml:space="preserve"
inkscape:version="1.3.2 (091e20e, 2023-11-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs2" /><sodipodi:namedview
id="namedview2"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="51.6875"
inkscape:cx="7.9903265"
inkscape:cy="7.9903265"
inkscape:window-width="1392"
inkscape:window-height="1067"
inkscape:window-x="3273"
inkscape:window-y="25"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" /><path
d="M11 2H9v3h2z"
id="path1" /><path
d="M1.5 0h11.586a1.5 1.5 0 0 1 1.06.44l1.415 1.414A1.5 1.5 0 0 1 16 2.914V14.5a1.5 1.5 0 0 1-1.5 1.5h-13A1.5 1.5 0 0 1 0 14.5v-13A1.5 1.5 0 0 1 1.5 0M1 1.5v13a.5.5 0 0 0 .5.5H2v-4.5A1.5 1.5 0 0 1 3.5 9h9a1.5 1.5 0 0 1 1.5 1.5V15h.5a.5.5 0 0 0 .5-.5V2.914a.5.5 0 0 0-.146-.353l-1.415-1.415A.5.5 0 0 0 13.086 1H13v4.5A1.5 1.5 0 0 1 11.5 7h-7A1.5 1.5 0 0 1 3 5.5V1H1.5a.5.5 0 0 0-.5.5m3 4a.5.5 0 0 0 .5.5h7a.5.5 0 0 0 .5-.5V1H4zM3 15h10v-4.5a.5.5 0 0 0-.5-.5h-9a.5.5 0 0 0-.5.5z"
id="path2" /><rect
style="fill:#fefefe;stroke-width:2.026;paint-order:markers stroke fill"
id="rect2"
width="5.1076179"
height="5.126965"
x="9.6154776"
y="9.6928654" /><g
style="fill:currentColor"
id="g2"
transform="matrix(0.49939541,0,0,0.49939541,8,8)"><path
d="M 2,0 C 0.8954305,0 0,0.8954305 0,2 v 12 c 0,1.104569 0.8954305,2 2,2 h 12 c 1.104569,0 2,-0.895431 2,-2 V 2 C 16,0.8954305 15.104569,0 14,0 Z M 5.2377772,3.7162179 8,6.2857361 10.762223,3.4450315 c 0.472,-0.4719998 2.226005,1.0883004 1.754005,1.5603002 l -2.8019641,3.149632 2.6857411,2.6847403 c 0.471999,0.472 -0.933337,2.109783 -1.405337,1.637783 L 8.1937046,9.675523 5.6251864,12.516228 C 5.1531866,12.988227 3.4766637,11.311704 3.9486634,10.839705 L 6.5956634,8 3.7936998,5.2377772 C 3.3217,4.7657774 4.8045184,3.2829591 5.2765182,3.7549588"
id="path1-6"
style="display:inline"
sodipodi:nodetypes="sssssssssccccccccccccc" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB