From e736b5cf2ecba96fa6407fe6e00400132d602ae1 Mon Sep 17 00:00:00 2001 From: sachin10101998 Date: Thu, 12 Mar 2020 01:13:28 +0530 Subject: [PATCH 1/3] FLUID-5590: fixed style and script links in non root folder --- src/layouts/post.html.hb.eco | 4 ++-- src/partials/scriptsNews.html | 2 ++ src/partials/stylesNews.html | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/partials/scriptsNews.html create mode 100644 src/partials/stylesNews.html diff --git a/src/layouts/post.html.hb.eco b/src/layouts/post.html.hb.eco index 613e3f33..48a415ab 100644 --- a/src/layouts/post.html.hb.eco +++ b/src/layouts/post.html.hb.eco @@ -1,8 +1,8 @@ - <%- @partial('scripts') %> - <%- @partial('styles') %> + <%- @partial('scriptsNews') %> + <%- @partial('stylesNews') %> <%= @document.title %> | fluid diff --git a/src/partials/scriptsNews.html b/src/partials/scriptsNews.html new file mode 100644 index 00000000..cc72341c --- /dev/null +++ b/src/partials/scriptsNews.html @@ -0,0 +1,2 @@ + + diff --git a/src/partials/stylesNews.html b/src/partials/stylesNews.html new file mode 100644 index 00000000..2e486673 --- /dev/null +++ b/src/partials/stylesNews.html @@ -0,0 +1,9 @@ + + + + + + + + + From a5cc06f517a6daf503dc3db90a59410bb63a3a81 Mon Sep 17 00:00:00 2001 From: sachin10101998 Date: Thu, 12 Mar 2020 11:49:28 +0530 Subject: [PATCH 2/3] FLUID-5590: fixed UIO when site deployed through non root url using docpad partials plugin --- src/layouts/post.html.hb.eco | 4 ++-- src/partials/scripts.html | 2 -- src/partials/scripts.html.eco | 2 ++ src/partials/scriptsNews.html | 2 -- src/partials/styles.html | 9 --------- src/partials/styles.html.eco | 9 +++++++++ src/partials/stylesNews.html | 9 --------- 7 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 src/partials/scripts.html create mode 100644 src/partials/scripts.html.eco delete mode 100644 src/partials/scriptsNews.html delete mode 100644 src/partials/styles.html create mode 100644 src/partials/styles.html.eco delete mode 100644 src/partials/stylesNews.html diff --git a/src/layouts/post.html.hb.eco b/src/layouts/post.html.hb.eco index 48a415ab..285f7ea0 100644 --- a/src/layouts/post.html.hb.eco +++ b/src/layouts/post.html.hb.eco @@ -1,8 +1,8 @@ - <%- @partial('scriptsNews') %> - <%- @partial('stylesNews') %> + <%- @partial('scriptsNews', {nonrooturl:'../'}) %> + <%- @partial('stylesNews', {nonrooturl:'../'}) %> <%= @document.title %> | fluid diff --git a/src/partials/scripts.html b/src/partials/scripts.html deleted file mode 100644 index dca76e05..00000000 --- a/src/partials/scripts.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/partials/scripts.html.eco b/src/partials/scripts.html.eco new file mode 100644 index 00000000..a0cf030f --- /dev/null +++ b/src/partials/scripts.html.eco @@ -0,0 +1,2 @@ + + diff --git a/src/partials/scriptsNews.html b/src/partials/scriptsNews.html deleted file mode 100644 index cc72341c..00000000 --- a/src/partials/scriptsNews.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/partials/styles.html b/src/partials/styles.html deleted file mode 100644 index d1209c2d..00000000 --- a/src/partials/styles.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/partials/styles.html.eco b/src/partials/styles.html.eco new file mode 100644 index 00000000..d6a66f6c --- /dev/null +++ b/src/partials/styles.html.eco @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/partials/stylesNews.html b/src/partials/stylesNews.html deleted file mode 100644 index 2e486673..00000000 --- a/src/partials/stylesNews.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - From e0c088d92174d266275e28d665182e555499f369 Mon Sep 17 00:00:00 2001 From: sachin10101998 Date: Thu, 12 Mar 2020 12:40:22 +0530 Subject: [PATCH 3/3] FLUID-5590: updated post layout with original scripts partial and styles partial names --- src/layouts/post.html.hb.eco | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/post.html.hb.eco b/src/layouts/post.html.hb.eco index 285f7ea0..79d71206 100644 --- a/src/layouts/post.html.hb.eco +++ b/src/layouts/post.html.hb.eco @@ -1,8 +1,8 @@ - <%- @partial('scriptsNews', {nonrooturl:'../'}) %> - <%- @partial('stylesNews', {nonrooturl:'../'}) %> + <%- @partial('scripts', {nonrooturl:'../'}) %> + <%- @partial('styles', {nonrooturl:'../'}) %> <%= @document.title %> | fluid