[Libreoffice-commits] online.git: 2 commits - loleaflet/html loleaflet/js

[Libreoffice Gerrit user]

 loleaflet/html/loleaflet.html.m4 |    2 +-
 loleaflet/js/toolbar.js          |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit edc5b6678cccda2d5f1359886e16b49ee4ec37a4
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Feb 18 21:08:39 2019 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 1 15:02:59 2019 +0100

    leaflet: hide print option when the disabled or hidden via wopi
    
    Change-Id: I989f1dbf7002e4ac27a9a0f16bb5d56a9e80218b
    Reviewed-on: https://gerrit.libreoffice.org/67999
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 730438f42..a04a67cd4 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1522,6 +1522,9 @@ function onWopiProps(e) {
 	if (e.HideExportOption) {
 		w2ui['presentation-toolbar'].hide('presentation', 'presentationbreak');
 	}
+	if (e.HidePrintOption) {
+		w2ui['editbar'].hide('print');
+	}
 	if (e.DisableCopy) {
 		$('input#formulaInput').bind('copy', function(evt) {
 			evt.preventDefault();
commit dce675a96112b33a23429c20ebe0728a3bef2e02
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Feb 21 20:50:19 2019 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 1 15:02:33 2019 +0100

    leaflet: add class to the logo div to allow for customization
    
    This restores the class, which was lost at some point.
    
    To customize the logo, users need to define new logo properties
    in branding.css for the document-logo class (or id) and
    set them as !important to override the default values.
    
    For example:
    
    .document-logo {
        width: 125px !important;
        height: 39px !important;
        background-image: url('images/logo.png') !important;
        background-position: left !important;
        background-repeat: no-repeat !important;
        background-size: 125px 39px !important;
    }
    
    Change-Id: If93c53987915eb54fac1018443178d331f418470
    Reviewed-on: https://gerrit.libreoffice.org/68187
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index f43dd488f..4985a29ac 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -84,7 +84,7 @@ ifelse(MOBILEAPP,[true],
 
      <nav class="main-nav" role="navigation">
        <div id="document-header">
-        <div id="document-logo"></div>
+        <div id="document-logo" class="document-logo"></div>
        </div>
        <!-- Mobile menu toggle button (hamburger/x icon) -->
        <input id="main-menu-state" type="checkbox" style="display: none"/>