webdocs: adjust layouts deps for UML/FLOW support

Change-Id: Ia8d366588a1ac75c3698050953bda7973bb87e55
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

10 files changed, 26 insertions, 78 deletions

diff --git a/Makefile b/Makefile
index 9d2b8e0..bd029ff 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,16 @@ clean:
 
 .PHONY: build
 build:
-	$(DOCBUILD) $(VERBOSE) --fetch --force --build
+	$(DOCBUILD) $(VERBOSE) --fetch --force 
+	$(DOCBUILD) $(VERBOSE) --build
 
 .PHONY: push
 push:
-	$(DOCBUILD) $(VERBOSE) --fetch --force --build --push
+	$(DOCBUILD) $(VERBOSE) --fetch --force 
+	$(DOCBUILD) $(VERBOSE) --build --push
 
 .PHONY: serve
 serve: 
-	$(DOCBUILD) $(VERBOSE) ---fetch --force --build --serve
+	$(DOCBUILD) $(VERBOSE) --fetch --force 
+	$(DOCBUILD) $(VERBOSE) --build --serve
 
diff --git a/site/_layouts/README b/site/_layouts/README
index 08bcee8..f910f99 100644
--- a/site/_layouts/README
+++ b/site/_layouts/README
@@ -3,7 +3,7 @@ Layout hierarchy:
 
 base
   |
-  `--> withindex --> <generated sections layouts>
+  `--> doc --> umldoc --> <generated sections layouts>
   |
   `--> agl --> page
                 |
diff --git a/site/_layouts/apis_services-en.html b/site/_layouts/apis_services-en.html
index 1a8a097..1b459f8 100644
--- a/site/_layouts/apis_services-en.html
+++ b/site/_layouts/apis_services-en.html
@@ -1,5 +1,5 @@
 ---
-layout: withindex
+layout: umldoc
 outdated_text: "This version of the documentation is outdated!"
 in_development_text: "This version of the documentation is under development!"
 click_here_text: "Click here for the latest released version."
diff --git a/site/_layouts/architecture-en.html b/site/_layouts/architecture-en.html
index 1a8a097..1b459f8 100644
--- a/site/_layouts/architecture-en.html
+++ b/site/_layouts/architecture-en.html
@@ -1,5 +1,5 @@
 ---
-layout: withindex
+layout: umldoc
 outdated_text: "This version of the documentation is outdated!"
 in_development_text: "This version of the documentation is under development!"
 click_here_text: "Click here for the latest released version."
diff --git a/site/_layouts/devguides-en.html b/site/_layouts/devguides-en.html
index 1a8a097..1b459f8 100644
--- a/site/_layouts/devguides-en.html
+++ b/site/_layouts/devguides-en.html
@@ -1,5 +1,5 @@
 ---
-layout: withindex
+layout: umldoc
 outdated_text: "This version of the documentation is outdated!"
 in_development_text: "This version of the documentation is under development!"
 click_here_text: "Click here for the latest released version."
diff --git a/site/_layouts/withindex.html b/site/_layouts/doc.html
index ed39f8c..ed39f8c 100644
--- a/site/_layouts/withindex.html
+++ b/site/_layouts/doc.html
diff --git a/site/_layouts/getting_started-en.html b/site/_layouts/getting_started-en.html
index 1a8a097..1b459f8 100644
--- a/site/_layouts/getting_started-en.html
+++ b/site/_layouts/getting_started-en.html
@@ -1,5 +1,5 @@
 ---
-layout: withindex
+layout: umldoc
 outdated_text: "This version of the documentation is outdated!"
 in_development_text: "This version of the documentation is under development!"
 click_here_text: "Click here for the latest released version."
diff --git a/site/_layouts/hardware-en.html b/site/_layouts/hardware-en.html
index 1a8a097..1b459f8 100644
--- a/site/_layouts/hardware-en.html
+++ b/site/_layouts/hardware-en.html
@@ -1,5 +1,5 @@
 ---
-layout: withindex
+layout: umldoc
 outdated_text: "This version of the documentation is outdated!"
 in_development_text: "This version of the documentation is under development!"
 click_here_text: "Click here for the latest released version."
diff --git a/site/_layouts/umldoc.html b/site/_layouts/umldoc.html
new file mode 100644
index 0000000..e3bfd10
--- /dev/null
+++ b/site/_layouts/umldoc.html
@@ -0,0 +1,12 @@
+---
+layout: doc
+
+scripts: 
+  - lib/raphael-min.js
+  - lib/underscore-min.js
+  - lib/sequence-diagram-min.js
+  - lib/flowchart-latest.js
+  - process-uml.js
+---
+
+{{ content }}
diff --git a/site/_layouts/umlpost.html b/site/_layouts/umlpost.html
index dac8efe..76858a0 100644
--- a/site/_layouts/umlpost.html
+++ b/site/_layouts/umlpost.html
@@ -1,5 +1,5 @@
 ---
-layout: blog
+layout: post
 
 scripts: 
   - lib/raphael-min.js
@@ -9,71 +9,4 @@ scripts:
   - process-uml.js
 ---
 
-<h1 class="blogHeader">
-    Blog
-    <span class="rss">
-        <img src="{{ site.baseurl }}/static/img/subscribe.png"><a href="{{ site.baseurl }}{{ site.rss_path }}">RSS Feed</a>
-    </span>
-</h1>
-
-<div class="post">
-    <header>
-        <div class="title">{{ page.title }}</div>
-        <div class="author">By:
-            {% if page.author.url %}
-              <a href="{{ page.author.url }}">{{ page.author.name }}</a>
-            {% else %}
-              {{ page.author.name }}
-            {% endif %}
-        </div>
-        <div class="date">{{ page.date | date_to_string }}</div>
-    </header>
-    <section>
-        <div>
-            {{ content }}
-        </div>
-    </section>
-    <footer>
-        <div class="row">
-            <div class="col-sm-6">
-                {% if page.previous %}
-                    <a href="{{ site.baseurl }}{{ page.previous.url }}">Previous</a>
-                    <br>
-                    <br>
-                    <a class="title" href="{{ site.baseurl }}{{ page.previous.url }}">{{ page.previous.title }}</a>
-                    <div class="date"> {{ page.previous.date | date_to_string }} - By {{ page.previous.author.name }} </div>
-                    <p class="content">
-                        {{ page.previous.excerpt | strip_html | truncatewords:12 }}
-                    </p>
-                {% endif %}
-            </div>
-            <div class="col-sm-6">
-                {% if page.next %}
-                    <a href="{{ site.baseurl }}{{ page.next.url }}">Next</a>
-                    <br>
-                    <br>
-                    <a class="title" href="{{ site.baseurl }}{{ page.next.url }}">{{ page.next.title }}</a>
-                    <div class="date"> {{ page.next.date | date_to_string }} - By {{ page.next.author.name}} </div>
-                    <p class="content">
-                        <!--
-                            NOTE:
-                                the markdownify filter is used here
-                                because posts are rendered in sequence;
-                                that is, the next post's content isn't
-                                yet rendered at the time that this post
-                                is being rendered, so page.next.excerpt
-                                is still in Markdown and not HTML
-
-                            Reference: https://github.com/jekyll/jekyll/issues/2860
-                        -->
-                        {{ page.next.excerpt | markdownify | strip_html | truncatewords:12 }}
-                    </p>
-                {% endif %}
-            </div>
-        </div>
-    </footer>
-    <div class="disqus">
-        {% include disqus.html %}
-    </div>
-</div>
-
+{{ content }}