From f1ed6304a4c3bfcd1c778b0c43cafe6808829286 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 22:21:16 +0200 Subject: - Admin Panel / Layout / Custom HTML after start, and Custom HTML before end. In progress, does not work yet. Thanks to xet7 ! --- client/components/boards/boardBody.jade | 2 ++ client/components/settings/settingBody.jade | 6 ++++++ client/components/settings/settingBody.js | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'client') diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 9e4b9c61..4631f999 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -12,6 +12,7 @@ template(name="board") +spinner template(name="boardBody") + | {{currentSetting.customHTMLafterBodyStart}} .board-wrapper(class=currentBoard.colorClass) +sidebar .board-canvas.js-swimlanes.js-perfect-scrollbar( @@ -27,6 +28,7 @@ template(name="boardBody") +listsGroup if isViewCalendar +calendarView + | {{currentSetting.customHTMLbeforeBodyEnd}} template(name="calendarView") .calendar-view.swimlane diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index bc6e0f50..153649fc 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -145,5 +145,11 @@ template(name='layoutSettings') .title {{_ 'custom-product-name'}} .form-group input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}") + li.layout-form + .title {{_ 'add-custom-html-after-body-start'}} + textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart + li.layout-form + .title {{_ 'add-custom-html-before-body-end'}} + textarea#customHTMLbeforeBodyEnd.form-control= currentSetting.customHTMLbeforeBodyEnd li button.js-save-layout.primary {{_ 'save'}} diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index ba5b4f47..4f07c84c 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -140,6 +140,8 @@ BlazeComponent.extendComponent({ const productName = $('#product-name').val().trim(); const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true'); + const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim(); + const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim(); try { @@ -147,6 +149,8 @@ BlazeComponent.extendComponent({ $set: { productName, hideLogo: hideLogoChange, + customHTMLafterBodyStart, + customHTMLbeforeBodyEnd, }, }); } catch (e) { -- cgit v1.2.3-1-g7c22 From bd1df642fa2a3d5962ca1ceba8decd6516811361 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 22:50:23 +0200 Subject: - Maybe custom html should be here. But it still does not work yet. Thanks to xet7 ! --- client/components/boards/boardBody.jade | 2 -- client/components/main/layouts.jade | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 4631f999..9e4b9c61 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -12,7 +12,6 @@ template(name="board") +spinner template(name="boardBody") - | {{currentSetting.customHTMLafterBodyStart}} .board-wrapper(class=currentBoard.colorClass) +sidebar .board-canvas.js-swimlanes.js-perfect-scrollbar( @@ -28,7 +27,6 @@ template(name="boardBody") +listsGroup if isViewCalendar +calendarView - | {{currentSetting.customHTMLbeforeBodyEnd}} template(name="calendarView") .calendar-view.swimlane diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index d0c27da5..b2c23920 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -38,7 +38,9 @@ template(name="userFormsLayout") template(name="defaultLayout") +header #content + | {{{currentSetting.customHTMLafterBodyStart}}} +Template.dynamic(template=content) + | {{{currentSetting.customHTMLbeforeBodyEnd}}} if (Modal.isOpen) #modal .overlay -- cgit v1.2.3-1-g7c22 From 7f74e72cea111f6a776a12e6447847056af53fea Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 23:46:04 +0200 Subject: - Trying to get custom HTML working as described at https://guide.meteor.com/v1.3/blaze.html#rendering-html Still does not work yet. Thanks to xet7 ! --- client/components/main/layouts.jade | 4 ++-- client/components/main/layouts.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index b2c23920..55ee2686 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -38,9 +38,9 @@ template(name="userFormsLayout") template(name="defaultLayout") +header #content - | {{{currentSetting.customHTMLafterBodyStart}}} + | {{{afterBodyStart}}} +Template.dynamic(template=content) - | {{{currentSetting.customHTMLbeforeBodyEnd}}} + | {{{beforeBodyEnd}}} if (Modal.isOpen) #modal .overlay diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index d4a9d6d1..a50d167e 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -42,6 +42,15 @@ Template.userFormsLayout.helpers({ return Settings.findOne(); }, + + afterBodyStart() { + return currentSetting.customHTMLafterBodyStart; + }, + + beforeBodyEnd() { + return currentSetting.customHTMLbeforeBodyEnd; + }, + languages() { return _.map(TAPi18n.getLanguages(), (lang, code) => { const tag = code; -- cgit v1.2.3-1-g7c22