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

[Andras Timar]

 loleaflet/dist/loleaflet.css      |    1 +
 loleaflet/dist/toolbar.css        |    8 ++++++--
 loleaflet/dist/toolbar/toolbar.js |   29 +++++++++++++++--------------
 3 files changed, 22 insertions(+), 16 deletions(-)

New commits:
commit a15877094ba6d56d5af8bbac3bb8f119bceaf768
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 24 08:09:11 2016 +0200

    loleaflet: unify casing of tooltips of toolbar buttons
    
    (cherry picked from commit 8f35af58213788eff74f0795665d018d9ea4b181)

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index e9c4cec..f6a1d5d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -30,7 +30,7 @@ $(function () {
 			{ type: 'button',  id: 'strikeout', img: 'strikeout', hint: _("Strikeout"), uno: 'Strikeout' },
 			{ type: 'break' },
 			{ type: 'html',  id: 'fontcolor-html', html: '<input id="fontColorPicker" style="display:none;">' },
-			{ type: 'button',  id: 'fontcolor', img: 'color', hint: _("Font Color") },
+			{ type: 'button',  id: 'fontcolor', img: 'color', hint: _("Font color") },
 			{ type: 'html',  id: 'backcolor-html', html: '<input id="backColorPicker" style="display:none;">' },
 			{ type: 'button',  id: 'backcolor', img: 'backcolor', hint: _("Highlighting") },
 			{ type: 'break' },
@@ -42,18 +42,18 @@ $(function () {
 			{ type: 'button',  id: 'bullet',  img: 'bullet', hint: _("Bullets on/off"), uno: 'DefaultBullet' },
 			{ type: 'button',  id: 'numbering',  img: 'numbering', hint: _("Numbering on/off"), uno: 'DefaultNumbering' },
 			{ type: 'break' },
-			{ type: 'button',  id: 'incrementindent',  img: 'incrementindent', hint: _("Increase Indent"), uno: 'IncrementIndent' },
-			{ type: 'button',  id: 'decrementindent',  img: 'decrementindent', hint: _("Decrease Indent"), uno: 'DecrementIndent' },
+			{ type: 'button',  id: 'incrementindent',  img: 'incrementindent', hint: _("Increase indent"), uno: 'IncrementIndent' },
+			{ type: 'button',  id: 'decrementindent',  img: 'decrementindent', hint: _("Decrease indent"), uno: 'DecrementIndent' },
 			{ type: 'break', id: 'incdecindent' },
-			{ type: 'button',  id: 'annotation', img: 'annotation', hint: _("Insert Comment"), uno: 'InsertAnnotation' },
-			{ type: 'button',  id: 'insertgraphic',  img: 'insertgraphic', hint: _("Insert Graphic") },
+			{ type: 'button',  id: 'annotation', img: 'annotation', hint: _("Insert comment"), uno: 'InsertAnnotation' },
+			{ type: 'button',  id: 'insertgraphic',  img: 'insertgraphic', hint: _("Insert graphic") },
 			{ type: 'html',  id: 'inserttable-html', html: '<div id="tablePicker" class="evo-pop loleaflet-font" style="position:absolute !important;display:none"><div id="tpstatus"></div><table id="insert-table"></table></div>' },
-			{ type: 'button',  id: 'inserttable',  img: 'inserttable', hint: _("Insert Table") },
+			{ type: 'button',  id: 'inserttable',  img: 'inserttable', hint: _("Insert table") },
 			{ type: 'break' },
 			{ type: 'button',  id: 'help',  img: 'help', hint: _("Help") },
 			{ type: 'html', id: 'right' },
 			{ type: 'button',  id: 'more', img: 'more', hint: _("More") },
-			{ type: 'button',  id: 'close',  img: 'closedoc', hint: _("Close Document"), hidden: true }
+			{ type: 'button',  id: 'close',  img: 'closedoc', hint: _("Close document"), hidden: true }
 		],
 		onClick: function (e) {
 			onClick(e.target);
@@ -89,10 +89,10 @@ $(function () {
 	$('#spreadsheet-toolbar').w2toolbar({
 		name: 'spreadsheet-toolbar',
 		items: [
-			{ type: 'button',  id: 'firstrecord',  img: 'firstrecord', hidden: true, hint: _("First Sheet") },
-			{ type: 'button',  id: 'prevrecord',  img: 'prevrecord', hidden: true, hint: _("Previous Sheet") },
-			{ type: 'button',  id: 'nextrecord',  img: 'nextrecord', hidden: true, hint: _("Next Sheet") },
-			{ type: 'button',  id: 'lastrecord',  img: 'lastrecord', hidden: true, hint: _("Last Sheet") }
+			{ type: 'button',  id: 'firstrecord',  img: 'firstrecord', hidden: true, hint: _("First sheet") },
+			{ type: 'button',  id: 'prevrecord',  img: 'prevrecord', hidden: true, hint: _("Previous sheet") },
+			{ type: 'button',  id: 'nextrecord',  img: 'nextrecord', hidden: true, hint: _("Next sheet") },
+			{ type: 'button',  id: 'lastrecord',  img: 'lastrecord', hidden: true, hint: _("Last sheet") }
 		],
 		onClick: function (e) {
 			onClick(e.target);
@@ -104,9 +104,9 @@ $(function () {
 			{ type: 'html',  id: 'left' },
 			{ type: 'button',  id: 'presentation', img: 'presentation', hidden:true, hint: _("Fullscreen presentation") },
 			{ type: 'break', id: 'presentationbreak', hidden:true },
-			{ type: 'button',  id: 'insertpage', img: 'insertpage', hidden:true, hint: _("Insert Page") },
-			{ type: 'button',  id: 'duplicatepage', img: 'duplicatepage', hidden:true, hint: _("Duplicate Page") },
-			{ type: 'button',  id: 'deletepage', img: 'deletepage', hidden:true, hint: _("Delete Page") },
+			{ type: 'button',  id: 'insertpage', img: 'insertpage', hidden:true, hint: _("Insert slide") },
+			{ type: 'button',  id: 'duplicatepage', img: 'duplicatepage', hidden:true, hint: _("Duplicate slide") },
+			{ type: 'button',  id: 'deletepage', img: 'deletepage', hidden:true, hint: _("Delete slide") },
 			{ type: 'html',  id: 'right' }
 		],
 		onClick: function (e) {
commit 9dee731bb3f72dd2ea5d2ce52990ea2f2aa6efee
Author: Pranav Kant <pranavk at collabora.com>
Date:   Tue May 24 11:27:12 2016 +0530

    loleaflet: Leave 125px from left for branding logo
    
    Change-Id: I92dbf92e4d140c8975198b14f6560c1d309202a8
    (cherry picked from commit 37b71b2289d1f465d8d5096fec8f803ba5f1942c)

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 15d7f9e..c7b4bed 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -23,6 +23,7 @@
     height: 25px;
     right: 0;
     left: 0;
+    padding-left: 125px;
     z-index: 1030;
 }
 
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index d5545af..42ae366 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -58,10 +58,14 @@
 }
 
 /* center the toolbar */
-#tb_presentation-toolbar_item_left,
-#tb_toolbar-up_item_left {
+#tb_presentation-toolbar_item_left {
     width: 50%;
 }
+/* leave space for branding logo */
+#tb_toolbar-up_item_left {
+    width: 0;
+    padding-left: 125px;
+}
 
 #formulaInput {
     height: 29px;
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index d1d0c92..e9c4cec 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -14,6 +14,7 @@ $(function () {
 	$('#toolbar-up').w2toolbar({
 		name: 'toolbar-up',
 		items: [
+			{ type: 'html', id: 'left' },
 			{ type: 'button',  id: 'save', img: 'save', hint: _("Save"), uno: 'Save' },
 			{ type: 'break' },
 			{ type: 'button',  id: 'undo',  img: 'undo', hint: _("Undo"), uno: 'Undo' },