loleaflet/html/loleaflet.html.m4 | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit c8aedbc21877b0c18791f20247b94b31fef8d99f
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Mar 6 12:35:16 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Mar 6 12:39:18 2019 +0200
No FileServer involved for the mobile apps, can't use <%FOO%> things
Move the <%FOO%> things to the non-mobileapp branches of the MOBILEAPP
m4 conditionals.
Change-Id: I3d6e51083f7926bb0c90b48367f284e99d64c3b4
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 270db259e..f87a180b4 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -53,9 +53,11 @@ ifelse(MOBILEAPP,[true],
foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet"
href="<%SERVICE_ROOT%>/loleaflet/<%VERSION%>/fileCSS" />
]),
[<style>syscmd([cat ]BUNDLE_CSS)</style>
- ])]dnl
+ ])
+ <%BRANDING_CSS%> <!-- add your logo here -->
+ ]dnl
)dnl
-<%BRANDING_CSS%> <!-- add your logo here -->
+
</head>
<body style="user-select: none;">
@@ -196,15 +198,15 @@ ifelse(ANDROIDAPP,[true],
ifelse(MOBILEAPP,[true],
ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
- [ <script src="fileJS<%LANG%>" defer></script>
+ [ <script src="fileJS" defer></script>
]),
- [ <script src="bundle.js<%LANG%>" defer></script>
+ [ <script src="bundle.js" defer></script>
]),
ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
[ <script src="<%SERVICE_ROOT%>/loleaflet/<%VERSION%>/fileJS<%LANG%>"
defer></script>
]),
[ <script src="<%SERVICE_ROOT%>/loleaflet/<%VERSION%>/bundle.js<%LANG%>"
defer></script>
])
+ <%BRANDING_JS%> <!-- logo onclick handler -->
)dnl
- <%BRANDING_JS%> <!-- logo onclick handler -->
</body></html>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
