[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 3 commits - loleaflet/dist loleaflet/Makefile loleaflet/unocommands.js

[Pranav Kant]

 loleaflet/Makefile                                |    1 +
 loleaflet/dist/contextMenu/jquery.contextMenu.css |    1 +
 loleaflet/dist/toolbar.css                        |    8 +++++++-
 loleaflet/unocommands.js                          |   11 +++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 904dc8d685ebb396ffb0d4e8a61ab751741e38e3
Author: Pranav Kant <pranavk at collabora.com>
Date:   Tue May 24 16:13:22 2016 +0530

    bccu#1824 - Move closedoc button in line with menubar
    
    Change-Id: I711e4a724ea5b886469f6f69aa27bd53d84ccebf
    (cherry picked from commit a02937751928e67dadec908ea2edd7a0f2400273)

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 42ae366..3c51c1e 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -71,7 +71,13 @@
     height: 29px;
     width: 800px;
 }
-
+#tb_toolbar-up_item_close {
+    position: absolute;
+    padding-right: 6px;
+    margin-top: -25px;
+    z-index: 1050;
+    right: 0;
+}
 #tb_toolbar-up_item_right {
     width: 100%;
 }
commit 1dd10ab726415b232d992853978778f6c4fb7f52
Author: Pranav Kant <pranavk at collabora.com>
Date:   Tue May 24 12:17:30 2016 +0530

    bccu#1832: Increase z-index of context menu overlay
    
    ... so that it could come *over* the menubar when space is
    scarce.
    
    Change-Id: I218ec359d37f42174c5b7035a2d6da9a11da2cd1
    (cherry picked from commit f95dbb177d8bd6c18980cf34dbfa214ebddc3355)

diff --git a/loleaflet/dist/contextMenu/jquery.contextMenu.css b/loleaflet/dist/contextMenu/jquery.contextMenu.css
index b74941f..25ec406 100644
--- a/loleaflet/dist/contextMenu/jquery.contextMenu.css
+++ b/loleaflet/dist/contextMenu/jquery.contextMenu.css
@@ -99,6 +99,7 @@
   border-radius: 3px;
   -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
           box-shadow: 0 2px 5px rgba(0, 0, 0, .5);
+  z-index: 1040 !important;
 }
 
 .context-menu-item {
commit aa04d26d98c14a2a2437f3191ceba712341d7d76
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 24 08:53:07 2016 +0200

    loleaflet: enable l10n of context menu items which come from src files from LO
    
    (cherry picked from commit fa8acdc8577abe337fcf80f3ebc493d57172c123)

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index b42cc4e..56ede5c 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -30,6 +30,7 @@ dist: all
 
 pot:
 	xgettext --from-code=UTF-8 --keyword=_ --output=po/loleaflet-ui.pot \
+		unocommands.js \
 		dist/errormessages.js \
 		dist/toolbar/toolbar.js \
 		src/control/Control.Tabs.js \
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
new file mode 100644
index 0000000..af53d00
--- /dev/null
+++ b/loleaflet/unocommands.js
@@ -0,0 +1,11 @@
+var CopyHyperlinkLocation = _('Copy Hyperlink');
+var DecrementLevel = _('Down One Level');
+var IncrementLevel = _('Up One Level');
+var EditAnnotation = _('Edit Comment');
+var InsertAnnotation = _('Insert Comment');
+var Merge = _('Merge');
+var MergeCells = _('Merge Cells...');
+var ObjectBackOne = _('Bring Forward');
+var ObjectForwardOne = _('Send Backward');
+var PasteSpecial = _('Paste Special');
+var PasteUnformatted = _('Unformatted Text');