diff --git a/content/about-us/_index.md b/content/about-us/_index.md index 6262f25b..c6055a10 100644 --- a/content/about-us/_index.md +++ b/content/about-us/_index.md @@ -2,5 +2,5 @@ title = "About us" weight = 4 sort_by = "weight" -template = "about-us.html" +template = "customs/about-us.html" +++ diff --git a/content/experiment-control/artiq.md b/content/experiment-control/artiq.md index aba8c855..30ba7f46 100644 --- a/content/experiment-control/artiq.md +++ b/content/experiment-control/artiq.md @@ -1,7 +1,7 @@ +++ title = "ARTIQ" weight = 1 -template = "page-hero.html" +template = "page.html" +++ diff --git a/content/experiment-control/control-loops.md b/content/experiment-control/control-loops.md index 4b2d9e7a..4a8c483c 100644 --- a/content/experiment-control/control-loops.md +++ b/content/experiment-control/control-loops.md @@ -1,7 +1,7 @@ +++ title = "Control loops" weight = 3 -template = "page-hero.html" +template = "page.html" +++ diff --git a/content/experiment-control/resources.md b/content/experiment-control/resources.md index cea012fc..51394003 100644 --- a/content/experiment-control/resources.md +++ b/content/experiment-control/resources.md @@ -1,43 +1,5 @@ +++ title = "Resources" weight = 4 -template = "page-hero.html" - -[extra] -title = "ARTIQ resources" +template = "customs/resources.html" +++ - -{% layoutlr1() %} - -
- -
- -
- -
- -{% end %} \ No newline at end of file diff --git a/content/experiment-control/sinara-core.md b/content/experiment-control/sinara-core.md index 66c42192..26b9f43f 100644 --- a/content/experiment-control/sinara-core.md +++ b/content/experiment-control/sinara-core.md @@ -1,7 +1,7 @@ +++ title = "Sinara core" weight = 2 -template = "page-hero.html" +template = "page.html" [extra] title = "Sinara hardware" diff --git a/static/images/directory@2x.png b/static/images/directory@2x.png new file mode 100755 index 00000000..f70dbb8c Binary files /dev/null and b/static/images/directory@2x.png differ diff --git a/static/images/email@2x.png b/static/images/email@2x.png new file mode 100755 index 00000000..3ae13a79 Binary files /dev/null and b/static/images/email@2x.png differ diff --git a/static/images/forum@2x.png b/static/images/forum@2x.png new file mode 100755 index 00000000..415e1159 Binary files /dev/null and b/static/images/forum@2x.png differ diff --git a/static/images/git@2x.png b/static/images/git@2x.png new file mode 100755 index 00000000..82cd5ae4 Binary files /dev/null and b/static/images/git@2x.png differ diff --git a/static/images/github@2x.png b/static/images/github@2x.png new file mode 100755 index 00000000..4ab909ad Binary files /dev/null and b/static/images/github@2x.png differ diff --git a/static/images/irc@2x.png b/static/images/irc@2x.png new file mode 100755 index 00000000..e0cbc371 Binary files /dev/null and b/static/images/irc@2x.png differ diff --git a/static/images/mattermost@2x.png b/static/images/mattermost@2x.png new file mode 100755 index 00000000..2ba3e373 Binary files /dev/null and b/static/images/mattermost@2x.png differ diff --git a/static/images/press@2x.png b/static/images/press@2x.png new file mode 100755 index 00000000..36870805 Binary files /dev/null and b/static/images/press@2x.png differ diff --git a/templates/about-us.html b/templates/customs/about-us.html similarity index 99% rename from templates/about-us.html rename to templates/customs/about-us.html index 704a654c..0895e12f 100644 --- a/templates/about-us.html +++ b/templates/customs/about-us.html @@ -82,6 +82,7 @@ +
diff --git a/templates/customs/resources.html b/templates/customs/resources.html new file mode 100644 index 00000000..f289fc66 --- /dev/null +++ b/templates/customs/resources.html @@ -0,0 +1,252 @@ +{% 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 contnrol in ARTIQ
+
+ +

+ View slides +
+
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +

Announcements, community support and discussions

+ + + +
+ +
+ + +
+ +
+ +
+
+ +
+
+ Mattermost live chat +
+ (bridged to IRC) +
+
+ +
+ +
+ +
+
+ +
+
+ Forum +
+ (New!) +
+
+ +
+ +
+ +
+
+ +
+
+ IRC: #m-labs +
+ on Freenode +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
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 +

+ +
+ +
+ + + +
+ +

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

+
+ +
+ +
+ +
+ +{% endblock %} + + +{% block footer_contact %}{% endblock %} diff --git a/templates/page-hero.html b/templates/page-hero.html deleted file mode 100644 index 3dab29dc..00000000 --- a/templates/page-hero.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends 'section.html' %} - -{% block styles %} - -{% endblock %} - - -{% block hero %} - -
- -
- -
- -
- - {% if page.extra and page.extra.title %} -

{{ page.extra.title }}

- {% else %} -

{{ page.title }}

- {% endif %} - - - -
- -
- -
- -
- -{% endblock %} - - -{% block main %} - -
- -
- -
- - {% block main_content %} - - {% if page and page.content %} - {{ page.content | safe }} - {% endif %} - - {% endblock %} - -
- -
- -
- -{% endblock %} - - - -{% block footer_contact %}{% endblock %} \ No newline at end of file diff --git a/templates/page.html b/templates/page.html index c61133c7..dcb1a49b 100644 --- a/templates/page.html +++ b/templates/page.html @@ -9,4 +9,58 @@ {% endblock %} +{% block hero %} + +
+ +
+ +
+ +
+ + {% if page.extra and page.extra.title %} +

{{ page.extra.title }}

+ {% else %} +

{{ page.title }}

+ {% endif %} + + + +
+ +
+ +
+ +
+ +{% endblock %} + + +{% block main %} + +
+ +
+ +
+ + {% block main_content %} + + {% if page and page.content %} + {{ page.content | safe }} + {% endif %} + + {% endblock %} + +
+ +
+ +
+ +{% endblock %} + + {% block footer_contact %}{% endblock %} \ No newline at end of file