From 5c57af1a840717df180c131c46dfd091457674d5 Mon Sep 17 00:00:00 2001 From: sovanna Date: Fri, 19 Jul 2019 15:10:55 +0200 Subject: [PATCH] refactor(Resources): Reviews layout and md file --- content/experiment-control/resources.md | 115 ++++++++- templates/customs/resources.html | 252 -------------------- templates/shortcodes/layout_card.html | 24 ++ templates/shortcodes/layout_div.html | 5 + templates/shortcodes/layout_icon_label.html | 9 + 5 files changed, 152 insertions(+), 253 deletions(-) delete mode 100644 templates/customs/resources.html create mode 100644 templates/shortcodes/layout_card.html create mode 100644 templates/shortcodes/layout_div.html create mode 100644 templates/shortcodes/layout_icon_label.html diff --git a/content/experiment-control/resources.md b/content/experiment-control/resources.md index 51394003..7e116b4c 100644 --- a/content/experiment-control/resources.md +++ b/content/experiment-control/resources.md @@ -1,5 +1,118 @@ +++ title = "Resources" weight = 4 -template = "customs/resources.html" +template = "page.html" + +[extra] +++ + + +
+ +{% layout_card(title="ARTIQ Documentation") %} +Beta (development) version + +PDF | HTML +{% end %} + + + +{% layout_card(title="ARTIQ Documentation") %} +Stable version + +HTML +{% end %} + + + +{% layout_card(title="ARTIQ Documentation") %} +Older manuals (HTML only) + +ARTIQ-3 | ARTIQ-2 +{% end %} + + +{% layout_card(title="The ARTIQ experiment control system") %} +  + +View slides +{% end %} + + +{% layout_card(title="Timing control in ARTIQ") %} +  + +View slides +{% end %} + +
+ + + +{{ layout_separator(separator_title="Announcements, community support and discussions") }} + + + +
+ +{% layout_card(src="images/mattermost@2x.png", css="col-12 col-md-3 text-center") %} +Mattermost live chat + +(bridged to IRC) +{% end %} + + +{% layout_card(src="images/forum@2x.png", css="col-12 col-md-3 text-center") %} +Forum + +(New!) +{% end %} + + +{% layout_card(src="images/irc@2x.png", css="col-12 col-md-3 text-center") %} +IRC: #m-labs + +on Freenode +{% end %} + + +{% layout_card(src="images/github@2x.png", css="col-12 col-md-3 text-center") %} +Source code repository + +  +{% end %} + +
+ + + +
+ +{% layout_div(css="col-12 col-md-6") %} +##### Commercial support available + +**Sinara hardware purchases, ports to your hardware, feature development, technical support, bugfixing** + +contact sales@m-***s.hk + +We welcome inquiries from research groups of all sizes.
Proposed extensions + +{% end %} + +
+ +{% layout_icon_label(src="images/directory@2x.png") %} +Public mailing list +{% end %} + + +{% layout_icon_label(src="images/press@2x.png") %} +NIST press release +
+Open-Source Software for Quantum Information +{% end %} + +
+ +
+ diff --git a/templates/customs/resources.html b/templates/customs/resources.html deleted file mode 100644 index 8bd3b66c..00000000 --- a/templates/customs/resources.html +++ /dev/null @@ -1,252 +0,0 @@ -{% extends 'section.html' %} - - -{% block hero %} - -
- -
- -
- -
- -

Resources

- - - -
- -
- -
- -
- -{% endblock %} - - -{% block main %} - -
- -
- -
- -
-
-
-
ARTIQ Documentation
-
- Beta (development) version -

- PDF | HTML -
-
- -
- -
- -
-
-
-
ARTIQ Documentation
-
- Stable version -

- HTML -
-
- -
- -
- -
-
-
-
ARTIQ Documentation
-
- Older manuals (HTML only) -

- ARTIQ-3 | ARTIQ-2 -
-
- -
- -
- -
-
-
-
The ARTIQ experiment control system
-
- -

- View slides -
-
- -
- -
- -
-
-
-
Timing control in ARTIQ
-
- -

- View slides -
-
- -
- -
- -
- - -
- -
- -
- -
- - -
- -
- -
- -

Announcements, community support and discussions

- - - -
- -
- - -
- -
- -
-
- -
-
- Mattermost live chat -
- (bridged to IRC) -
-
- -
- -
- -
-
- -
-
- Forum -
- (New!) -
-
- -
- -
- -
-
- -
-
- IRC: #m-labs -
- on Freenode -
-
- -
- -
- -
-
- -
-
- Source code repository -
-   -
-
- -
- -
- - -
- -
- -
Commercial support available
- -
- -
- -

- Sinara hardware purchases, ports to your hardware, feature development, technical support, bugfixing -
contact sales@m-***s.hk -

- -

- We welcome inquiries from research groups of all sizes.
Proposed extensions -

- -
- -
- -
- -

- Public mailing list -

-
- -
- -

- NIST press release -
- Open-Source Software for Quantum Information -

-
- -
- -
- -
- -{% endblock %} - - -{% block footer_contact %}{% endblock %} diff --git a/templates/shortcodes/layout_card.html b/templates/shortcodes/layout_card.html new file mode 100644 index 00000000..77f26354 --- /dev/null +++ b/templates/shortcodes/layout_card.html @@ -0,0 +1,24 @@ +
+ +
+ + {% if src %} +
+ +
+ {% endif %} + +
+ {% if title %} +
+
{{ title }}
+
+ {% endif %} + + {{ body | markdown | safe }} + +
+ +
+ +
\ No newline at end of file diff --git a/templates/shortcodes/layout_div.html b/templates/shortcodes/layout_div.html new file mode 100644 index 00000000..6f2c9597 --- /dev/null +++ b/templates/shortcodes/layout_div.html @@ -0,0 +1,5 @@ +
+ + {{ body | markdown | safe }} + +
diff --git a/templates/shortcodes/layout_icon_label.html b/templates/shortcodes/layout_icon_label.html new file mode 100644 index 00000000..cc62c026 --- /dev/null +++ b/templates/shortcodes/layout_icon_label.html @@ -0,0 +1,9 @@ +
+ + + +

+ {{ body | markdown | safe }} +

+ +
\ No newline at end of file