From 1d6a0e1a425cd2bf2364b8d967b2b631149eb919 Mon Sep 17 00:00:00 2001
From: sovanna <sovanna.hing@gmail.com>
Date: Fri, 19 Jul 2019 14:18:47 +0200
Subject: [PATCH] refactor(ControlLoops): Reviews layout and md file

---
 content/experiment-control/control-loops.md   | 31 +++++++++----------
 .../shortcodes/layout_centered_content.html   |  2 +-
 templates/shortcodes/layout_html.html         |  5 +++
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 templates/shortcodes/layout_html.html

diff --git a/content/experiment-control/control-loops.md b/content/experiment-control/control-loops.md
index 4a8c483c..5ecd3665 100644
--- a/content/experiment-control/control-loops.md
+++ b/content/experiment-control/control-loops.md
@@ -5,7 +5,7 @@ template = "page.html"
 +++
 
 
-{% textimg(src="images/stabilizer@2x.png", alt="", bodyleft=true, customcss="row d-flex align-items-center mb-4 pb-2", shadow=false, md=true) %}
+{% layout_text_img(src="images/stabilizer@2x.png", alt="", textleft=true, shadow=false) %}
 
 ##### Stabilizer
 
@@ -26,23 +26,18 @@ It can be used as a general-purpose PID controller. Several AFE extensions are u
 {% end %}
 
 
-{% centerp(safe=true) %}
-
-<div class="row">
-
-  <div class="col-12 mt-0 mt-md-5">
-    <p class="m-0">
-      The <a href="https://github.com/quartiq/stabilizer" target="_blank" rel="noopener noreferrer">standard open source firmware</a> that comes with the board has the following features:
-    </p>
-  </div>
-
-</div>
 
+{% layout_centered_content(css="row d-flex align-items-center mt-5 mb-0") %}
+The <a href="https://github.com/quartiq/stabilizer" target="_blank" rel="noopener noreferrer">standard open source firmware</a> that comes with the board has the following features:
 {% end %}
 
-{{ centercontent(customcss="row d-flex align-items-center", md=true, src="images/_standard-open-source-firmware@2x.png", alt="") }}
 
-{% layoutlr1(customcss="row d-flex align-items-center mt-4 mb-5 pt-2 pb-2") %}
+
+{{ layout_centered_img(src="images/_standard-open-source-firmware@2x.png", alt="", css="row d-flex align-items-center mt-0 mb-0") }}
+
+
+
+{% layout_html() %}
 
   <div class="col-12 col-md-3">
     <ul>
@@ -65,7 +60,7 @@ It can be used as a general-purpose PID controller. Several AFE extensions are u
     </ul>
   </div>
 
-  <div class="col-12 col-md-4 mt-4 mt-md-0">
+  <div class="col-12 col-md-4">
     <p>
       To purchase this controller, email sales@m-***s.hk. We also offer firmware customizations and development of new features. Note that features that are not implemented in the open source code above (e.g. control from Kasli) are not supported unless purchased separately.
     </p>
@@ -74,7 +69,8 @@ It can be used as a general-purpose PID controller. Several AFE extensions are u
 {% end %}
 
 
-{% textimg(src="images/Thermostat@2x.png", alt="", customcss="", bodyleft=false, shadow=false, md=true) %}
+
+{% layout_text_img(src="images/Thermostat@2x.png", alt="", shadow=false) %}
 
 ##### Thermostat
 
@@ -96,7 +92,8 @@ This module is still in development and is not currently available.
 {% end %}
 
 
-{% textimg(alt="", customcss="", bodyleft=true, shadow=false, md=true) %}
+
+{% layout_text_img(textleft=true, shadow=false) %}
 
 ##### SU-Servo
 
diff --git a/templates/shortcodes/layout_centered_content.html b/templates/shortcodes/layout_centered_content.html
index 611ba08f..dd495e72 100644
--- a/templates/shortcodes/layout_centered_content.html
+++ b/templates/shortcodes/layout_centered_content.html
@@ -2,7 +2,7 @@
 
   <div class="{% if min_width %}col-12 col-md-8 mx-auto{% else %}col-12{% endif %} text-center">
 
-    <p>{{ body | markdown | safe }}</p>
+    {{ body | markdown | safe }}
 
   </div>
 
diff --git a/templates/shortcodes/layout_html.html b/templates/shortcodes/layout_html.html
new file mode 100644
index 00000000..fa2a62bb
--- /dev/null
+++ b/templates/shortcodes/layout_html.html
@@ -0,0 +1,5 @@
+<div class="{% if css %}{{ css }}{% else %}row d-flex align-items-center mt-5 mb-5{% endif %}">
+
+  {{ body | safe }}
+
+</div>