From b79e9f56fbf67bed7d693cf7f05e84f749364817 Mon Sep 17 00:00:00 2001 From: sovanna Date: Fri, 19 Jul 2019 13:49:18 +0200 Subject: [PATCH] refactor(ARTIQ): Reviews layout and md file --- content/experiment-control/artiq.md | 39 ++++++++++------ templates/includes/separator_design.html | 2 +- templates/page.html | 4 +- .../shortcodes/layout_centered_content.html | 9 ++++ templates/shortcodes/layout_centered_img.html | 9 ++++ .../{logos.html => layout_logos.html} | 5 ++- templates/shortcodes/layout_separator.html | 7 +++ templates/shortcodes/layout_text_img.html | 45 +++++++++++++++++++ 8 files changed, 102 insertions(+), 18 deletions(-) create mode 100644 templates/shortcodes/layout_centered_content.html create mode 100644 templates/shortcodes/layout_centered_img.html rename templates/shortcodes/{logos.html => layout_logos.html} (56%) create mode 100644 templates/shortcodes/layout_separator.html create mode 100644 templates/shortcodes/layout_text_img.html diff --git a/content/experiment-control/artiq.md b/content/experiment-control/artiq.md index 30ba7f4..eb352ee 100644 --- a/content/experiment-control/artiq.md +++ b/content/experiment-control/artiq.md @@ -5,14 +5,15 @@ template = "page.html" +++ -{% textimg(src="images/lab-hardware@2x.jpg", alt="lab hardware", bodyleft=true, customcss="row d-flex align-items-center mb-4 pb-2", shadow=true) %} +{% layout_text_img(src="images/lab-hardware@2x.jpg", alt="lab hardware", textleft=true, shadow=true) %} ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a leading-edge control system for quantum information experiments. It was initiated and developed in partnership with the Ion Storage Group at NIST, and is now used and supported by a growing number of research institutions worldwide. While ARTIQ is currently mostly used by atomic physics groups, its applicability reaches beyond ion trapping. {% end %} -{% textimg(src="images/modern-research@2x.png", alt="modern research", md=true, shadow=false) %} + +{% layout_text_img(src="images/modern-research@2x.png", alt="modern research", shadow=false) %} Modern research on quantum information systems poses particular challenges to the control system: @@ -25,11 +26,11 @@ Modern research on quantum information systems poses particular challenges to th {% end %} + +{% layout_text_img(src="images/gui_screenshot_small@2x.jpg", alt="lab hardware", textleft=true, shadow=true) %} + ##### Enter ARTIQ - -{% textimg(src="images/gui_screenshot_small@2x.jpg", alt="lab hardware", bodyleft=true, md=true, shadow=true) %} - ARTIQ features a high-level programming language, based on Python, that helps describing complex experiments. It is compiled and executed on dedicated FPGA hardware with nanosecond timing resolution and sub-microsecond latency. The time-critical code (a kernel) running on the FPGA (the core device) is easily interfaced with Python code on the computer using a remote procedure call (RPC) mechanism. @@ -45,16 +46,24 @@ Technologies employed include +
diff --git a/templates/page.html b/templates/page.html index 852b3f8..640308d 100644 --- a/templates/page.html +++ b/templates/page.html @@ -2,8 +2,8 @@ {% block styles %} {% endblock %} diff --git a/templates/shortcodes/layout_centered_content.html b/templates/shortcodes/layout_centered_content.html new file mode 100644 index 0000000..87af085 --- /dev/null +++ b/templates/shortcodes/layout_centered_content.html @@ -0,0 +1,9 @@ +
+ +
+ +

{{ body | markdown | safe }}

+ +
+ +
\ No newline at end of file diff --git a/templates/shortcodes/layout_centered_img.html b/templates/shortcodes/layout_centered_img.html new file mode 100644 index 0000000..7e6e20d --- /dev/null +++ b/templates/shortcodes/layout_centered_img.html @@ -0,0 +1,9 @@ +
+ +
+ + {{ alt }} + +
+ +
\ No newline at end of file diff --git a/templates/shortcodes/logos.html b/templates/shortcodes/layout_logos.html similarity index 56% rename from templates/shortcodes/logos.html rename to templates/shortcodes/layout_logos.html index 0d75796..adb4f92 100644 --- a/templates/shortcodes/logos.html +++ b/templates/shortcodes/layout_logos.html @@ -1,4 +1,7 @@ -
+
+ {% if title %}
{{ title}}
{% endif %} + {{ body | markdown | safe }} +
\ No newline at end of file diff --git a/templates/shortcodes/layout_separator.html b/templates/shortcodes/layout_separator.html new file mode 100644 index 0000000..e002a68 --- /dev/null +++ b/templates/shortcodes/layout_separator.html @@ -0,0 +1,7 @@ +{% if separator_title %} + +{% set separator_rm_bg = true %} + +{% include "includes/separator_design.html" %} + +{% endif %} \ No newline at end of file diff --git a/templates/shortcodes/layout_text_img.html b/templates/shortcodes/layout_text_img.html new file mode 100644 index 0000000..26eaf05 --- /dev/null +++ b/templates/shortcodes/layout_text_img.html @@ -0,0 +1,45 @@ +
+ + {% if textleft %} + +
+ + {{ body | markdown | safe }} + +
+ +
+ +
+ + {% if src %} + {% if alt %}{{ alt }}{% endif %} + {% endif %} + +
+ +
+ + {% else %} + +
+ +
+ + {% if src %} + {% if alt %}{{ alt }}{% endif %} + {% endif %} + +
+ +
+ +
+ + {{ body | markdown | safe }} + +
+ + {% endif %} + +
\ No newline at end of file