[Libreoffice-commits] online.git: 2 commits - loleaflet/debug loleaflet/dist loleaflet/src loolwsd/LOOLSession.cpp

[Mihai Varga]

 loleaflet/debug/document/document_simple_example.html |    9 --
 loleaflet/dist/leaflet.css                            |   77 +++++++++++++++++-
 loleaflet/src/control/Control.Buttons.js              |    4 
 loolwsd/LOOLSession.cpp                               |    3 
 4 files changed, 83 insertions(+), 10 deletions(-)

New commits:
commit f3d5b7c09c6e2e2d755dbbca2e684e8710212ee1
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Wed Jul 29 17:02:32 2015 +0300

    loleaflet: UI tweaks

diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html
index 90bfdf1..ec279af 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -31,10 +31,9 @@
         The "map" div is the actual document and it has the document's size
         and width, this being inside the smaller "document-container" will
         cause the content to overflow, creating scrollbars -->
-    <div id="toolbar" align="center">
-        <p style="margin:0px">This space is a placeholder for the future toolbar</p>
+    <div id="toolbar">
     </div>
-    <div id="document-container" style="top:100px">
+    <div id="document-container">
         <div id="map"></div>
     </div>
 
@@ -68,11 +67,11 @@
 
     ////// Controls /////
     map.addControl(L.control.buttons());
+    map.addControl(L.control.zoom());
+    map.addControl(L.control.parts());
     map.addControl(L.control.search());
     map.addControl(L.control.permissionSwitch());
     map.addControl(L.control.selection());
-    map.addControl(L.control.zoom());
-    map.addControl(L.control.parts());
     map.addControl(L.control.statusIndicator());
     map.addControl(L.control.scroll());
 
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index ca38896..dc6ae45 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -233,6 +233,7 @@
 	border-radius: 4px;
 	display: inline-block;
 	margin: 3px;
+	vertical-align: middle;
 	}
 .leaflet-bar a,
 .leaflet-bar a:hover {
@@ -308,7 +309,6 @@
 /* Toolbar buttons control */
 
 .leaflet-control-buttons-container {
-	float: left;
 	}
 
 .leaflet-control-buttons,
@@ -327,11 +327,20 @@ a.leaflet-control-buttons:hover {
 	margin-left: 3px;
 	}
 
+a.leaflet-control-buttons:first-child,
+a.leaflet-control-buttons:hover:first-child {
+	margin-left: 0px;
+	}
 .leaflet-control-buttons-active {
 	border: thin solid;
 	}
 
-
+.leaflet-control-button-separator {
+	width: 14px;
+	height: 1px;
+	float: left;
+	visibility: hidden;
+	}
 
 /* layers control */
 
@@ -546,7 +555,7 @@ a.leaflet-control-buttons:hover {
 #document-container {
 	background: #DFDFDF;
 	position: absolute;
-	top: 100px;
+	top: 65px;
 	bottom: 0px;
 	right: 0px;
 	left: 0px;
@@ -716,3 +725,65 @@ a.leaflet-control-buttons:hover {
 	color: #7E7E7E;
 	border-top: #FFF 1px solid;
 	}
+
+#toolbar {
+	border-bottom: 2px solid #B6B6B6;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	padding-bottom: 15px;
+	padding-top: 15px;
+	text-align: center;
+}
+
+.leaflet-bar a {
+    float: left;
+}
+
+div .leaflet-bar a:last-child {
+    border-bottom: 1px solid #ccc;
+}
+
+.leaflet-control-editviewswitch.leaflet-bar
+, leaflet-control-search.leaflet-bar {
+
+}
+
+label.leaflet-control-editviewswitch {
+    padding: 0.2em 0.4em 0.2em 0em;
+}
+
+input.leaflet-control-search-bar {
+    padding: 0.3em;
+}
+
+.leaflet-control-zoom.leaflet-bar {
+    margin-left: 0.5em;
+}
+
+div.leaflet-control-zoom leaflet-bar {
+    width: 53px;
+}
+
+button.leaflet-control-search-prev {
+    margin-left: 0.2em;
+}
+
+button.leaflet-control-search-next
+, leaflet-control-search-cancel {
+    margin-right: 0.2em;
+}
+
+#toolbar label
+, .leaflet-control-search {
+    background-color: #fff;
+}
+
+div .leaflet-bar a:first-child {
+    border-radius: 4px 0 0 4px;
+}
+
+div .leaflet-bar a:last-child {
+    border-radius: 0 4px 4px 0;
+}
diff --git a/loleaflet/src/control/Control.Buttons.js b/loleaflet/src/control/Control.Buttons.js
index d544ae9..076c642 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -25,6 +25,10 @@ L.Control.Buttons = L.Control.extend({
 		};
 		for (var key in this._buttons) {
 			var button = this._buttons[key];
+			if (key === 'alignleft' || key === 'save') {
+				// add a separator
+				L.DomUtil.create('span', 'leaflet-control-button-separator', container);
+			}
 			button.el = this._createButton(key, button.title, button.iconName,
 				buttonsName, container, this._onButtonClick);
 		}
commit 4ae546d7bd80076adfecf9012d8a31d53629f57b
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Wed Jul 29 16:58:43 2015 +0300

    loolwsd: don't move editing tiles to persistent on saveAs

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 7e029f8..cae2804 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -303,8 +303,7 @@ bool MasterProcessSession::handleInput(const char *buffer, int length)
             dispatchChild();
         forwardToPeer(buffer, length);
 
-        if ((tokens.count() > 1 && tokens[0] == "uno" && tokens[1] == ".uno:Save") ||
-               tokens[0] == "saveas") {
+        if ((tokens.count() > 1 && tokens[0] == "uno" && tokens[1] == ".uno:Save")) {
            _tileCache->documentSaved();
         }
     }