[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

Pedro Pinto Silva (via logerrit) logerrit at kemper.freedesktop.org
Tue Nov 26 08:10:13 UTC 2019


 loleaflet/css/toolbar.css                |    5 ++++-
 loleaflet/src/control/Control.Toolbar.js |    6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 8c8d8ff5ec5e2f73df393989032b1450590db2a0
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Mon Nov 25 17:47:26 2019 +0100
Commit:     Pedro Pinto da Silva <pedro.silva at collabora.com>
CommitDate: Tue Nov 26 09:09:55 2019 +0100

    Toolbar-down: status: Add default text and respective styling  when there is no value for :
    * insert mode
    * RowSelCount
    * Selectionmode
    
    Change-Id: I5e94aa539178b576c91cbebbf9b71a0d6d4fe30b
    Reviewed-on: https://gerrit.libreoffice.org/83704
    Reviewed-by: Pedro Pinto da Silva <pedro.silva at collabora.com>
    Tested-by: Pedro Pinto da Silva <pedro.silva at collabora.com>

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index f4ca398c5..9167625bb 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -62,7 +62,10 @@ w2ui-toolbar {
 		display: none;
 		overflow: visible !important;
 }
-
+#toolbar-down .ToolbarStatusInactive {
+	color: #696969;
+	box-shadow: inset 0px 0px 0px 10px #f2f2f2, 0px 0px 0px 2px #f2f2f2, 4px 0px 0px 1px #fff, -4px 0px 0px 1px #fff, 0px 0px 0px 5px #fff;
+}
 #spreadsheet-toolbar {
 		left: 0;
 		text-align: center;
diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index b40023cf8..69ff30db1 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1786,14 +1786,14 @@ function onCommandStateChanged(e) {
 	else if (commandName === '.uno:RowColSelCount') {
 		state = toLocalePattern('$1 rows, $2 columns selected', '(\\d+) rows, (\\d+) columns selected', state, '$1', '$2');
 		state = toLocalePattern('$1 of $2 records found', '(\\d+) of (\\d+) records found', state, '$1', '$2');
-		updateToolbarItem(statusbar, 'RowColSelCount', $('#RowColSelCount').html(state ? state : '    &nbsp').parent().html());
+		updateToolbarItem(statusbar, 'RowColSelCount', $('#RowColSelCount').html(state ? state : '<span class="ToolbarStatusInactive"> Select multiple cells </span>').parent().html());
 	}
 	else if (commandName === '.uno:InsertMode') {
-		updateToolbarItem(statusbar, 'InsertMode', $('#InsertMode').html(state ? L.Styles.insertMode[state].toLocaleString() : '    &nbsp').parent().html());
+		updateToolbarItem(statusbar, 'InsertMode', $('#InsertMode').html(state ? L.Styles.insertMode[state].toLocaleString() : '<span class="ToolbarStatusInactive"> Insert mode: inactive </span>').parent().html());
 	}
 	else if (commandName === '.uno:StatusSelectionMode' ||
 		 commandName === '.uno:SelectionMode') {
-		updateToolbarItem(statusbar, 'StatusSelectionMode', $('#StatusSelectionMode').html(state ? L.Styles.selectionMode[state].toLocaleString() : '    &nbsp').parent().html());
+		updateToolbarItem(statusbar, 'StatusSelectionMode', $('#StatusSelectionMode').html(state ? L.Styles.selectionMode[state].toLocaleString() : '<span class="ToolbarStatusInactive"> Selection mode: inactive </span>').parent().html());
 	}
 	else if (commandName == '.uno:StateTableCell') {
 		updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? localizeStateTableCell(state) : '    &nbsp').parent().html());


More information about the Libreoffice-commits mailing list