Merge remote-tracking branch 'sachin10101998/FLUID-5590'

* sachin10101998/FLUID-5590: FLUID-5590: updated post layout with original scripts partial and styles partial names FLUID-5590: fixed UIO when site deployed through non root url using docpad partials plugin FLUID-5590: fixed style and script links in non root folder
fluid-project · Mar 12, 2020 · 96771c3 · 96771c3
2 parents a5bf590 + e0c088d
commit 96771c3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/layouts/post.html.hb.eco b/src/layouts/post.html.hb.eco
@@ -1,8 +1,8 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <%- @partial('scripts') %>
-        <%- @partial('styles') %>
+        <%- @partial('scripts', {nonrooturl:'../'}) %>
+        <%- @partial('styles', {nonrooturl:'../'}) %>
 
         <title><%= @document.title %> | fluid</title>
 

diff --git a/src/partials/scripts.html b/src/partials/scripts.html
diff --git a/src/partials/scripts.html.eco b/src/partials/scripts.html.eco
@@ -0,0 +1,2 @@
+<script src="<%=@nonrooturl or ''%>lib/infusion/infusion-all.js"></script>
+<script src="<%=@nonrooturl or ''%>js/uio.js"></script>
diff --git a/src/partials/styles.html b/src/partials/styles.html
diff --git a/src/partials/styles.html.eco b/src/partials/styles.html.eco
@@ -0,0 +1,9 @@
+<link href="<%=@nonrooturl or ''%>lib/infusion/src/framework/preferences/css/Enactors.css" rel="stylesheet">
+<link href="<%=@nonrooturl or ''%>lib/infusion/src/framework/preferences/css/PrefsEditor.css" rel="stylesheet">
+<link href="<%=@nonrooturl or ''%>lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css" rel="stylesheet">
+<link href="<%=@nonrooturl or ''%>lib/foundation/css/foundation.css" rel="stylesheet">
+<link href="<%=@nonrooturl or ''%>css/style.css" rel="stylesheet">
+<link href="<%=@nonrooturl or ''%>css/contrast.css" rel="stylesheet">
+
+<link href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700,100" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" rel="stylesheet">