[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist

ozturkemre ozturkemry at gmail.com
Thu May 24 08:34:28 UTC 2018


 loleaflet/dist/images/savemodified.svg |   10 ++++++++++
 loleaflet/dist/toolbar.css             |    1 +
 loleaflet/dist/toolbar/toolbar.js      |    2 ++
 3 files changed, 13 insertions(+)

New commits:
commit 6efcb8f0aaa5c5ba5369aa79a4a241b887b1f1f8
Author: ozturkemre <ozturkemry at gmail.com>
Date:   Fri Apr 27 15:42:49 2018 +0300

    tdf#115310 "Save button" changes while there is unsaved changes
    
    Change-Id: Ied761fe86e774371daf4e2d80328f756c0fc628f
    Reviewed-on: https://gerrit.libreoffice.org/53558
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit c879049f1f77484317b68082fefad9b452866f20)
    Reviewed-on: https://gerrit.libreoffice.org/53664
    Reviewed-by: Emre Öztürk <ozturkemry at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/images/savemodified.svg b/loleaflet/dist/images/savemodified.svg
new file mode 100644
index 000000000..559f944ef
--- /dev/null
+++ b/loleaflet/dist/images/savemodified.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path 
+     style="fill:#4d4d4d" 
+     d="M 4 3.9980469 L 4 4 L 4 5 L 4 20 L 5 20 L 14 20 L 14 19 L 8 19 L 8 13 L 16 13 L 17 13 L 17 12 L 16 12 L 8 12 L 7 12 L 7 19 L 5 19 L 5 5 L 8 5 L 8 9 L 8 10 L 16 10 L 16 9 L 16 5 L 16.292969 5 L 19 7.7070312 L 19 8 L 19 13 L 20 13 L 20 8 L 20 7.3007812 L 19.992188 7.3007812 L 20 7.2910156 L 16.707031 3.9980469 L 16.699219 4.0078125 L 16.699219 3.9980469 L 16 3.9980469 L 4 3.9980469 z M 9 5 L 12.900391 5 L 12.900391 9 L 9 9 L 9 5 z "
+     />
+ <path 
+     style="fill:#da4453" 
+     d="M 17 14 L 16.425781 15.613281 L 14.878906 14.878906 L 15.613281 16.425781 L 14 17 L 15.613281 17.574219 L 14.878906 19.121094 L 16.425781 18.386719 L 17 20 L 17.574219 18.386719 L 19.121094 19.121094 L 18.386719 17.574219 L 20 17 L 18.386719 16.425781 L 19.121094 14.878906 L 17.574219 15.613281 L 17 14 z "
+     />
+ </svg>
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 351f9c115..984014b66 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -286,6 +286,7 @@ button.leaflet-control-search-next
 .w2ui-icon.redo{ background: url('../images/lc_redo.svg') no-repeat center !important; }
 .w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center !important; }
 .w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center !important; }
+.w2ui-icon.savemodified{ background: url('../images/savemodified.svg') no-repeat center !important; }
 .w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat center !important; }
 .w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat center !important; }
 .w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index ec8cb155a..94a402310 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1281,9 +1281,11 @@ map.on('commandstatechanged', function (e) {
 		var html;
 		if (modifiedStatus) {
 			html = $('#modifiedstatuslabel').html('').parent().html();
+			w2ui['toolbar-up'].set('save', {img:'savemodified'});
 		}
 		else {
 			html = $('#modifiedstatuslabel').html(_('Document saved')).parent().html();
+			w2ui['toolbar-up'].set('save', {img:'save'});
 		}
 		updateToolbarItem(statusbar, 'modifiedstatuslabel', html);
 	}


More information about the Libreoffice-commits mailing list