feat(website): Updates ARTIQ resources

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"
 +++

content/experiment-control/artiq.md

@@ -1,7 +1,7 @@
 +++
 title = "ARTIQ"
 weight = 1
-template = "page-hero.html"
+template = "page.html"
 +++
 
 

content/experiment-control/control-loops.md

@@ -1,7 +1,7 @@
 +++
 title = "Control loops"
 weight = 3
-template = "page-hero.html"
+template = "page.html"
 +++
 
 

content/experiment-control/resources.md

@@ -1,43 +1,5 @@
 +++
 title = "Resources"
 weight = 4
-template = "page-hero.html"
+template = "customs/resources.html"
-
-[extra]
-title = "ARTIQ resources"
 +++
-
-{% layoutlr1() %}
-
-<div class="col-12 col-md-8 mx-auto">
-
-  <div class="mb-5 pb-5 text-center ">
-    <ul class="list-group">
-      <li class="list-group-item">Beta (development) version: <a href="/docs/artiq/manual-beta.pdf" target="_blank">PDF</a> | <a href="https://m-labs.hk/artiq/manual-beta/" target="_blank" rel="noopener noreferrer">HTML</a></li>
-      <li class="list-group-item">Stable version: <a href="https://m-labs.hk/artiq/manual/" target="_blank">HTML</a></li>
-      <li class="list-group-item">Older manuals (HTML only): <a href="https://m-labs.hk/artiq/manual-release-3/" target="_blank" rel="noopener noreferrer">ARTIQ-3</a> | <a href="https://m-labs.hk/artiq/manual-release-2/" target="_blank" rel="noopener noreferrer">ARTIQ-2</a></li>
-      <li class="list-group-item"><a href="/docs/artiq/artiq_overview.pdf" target="_blank" rel="noopener noreferrer">Slides: Overview</a></li>
-      <li class="list-group-item"><a href="/docs/artiq/slides_timing.pdf" target="_blank" rel="noopener noreferrer">Slides: Timing control in ARTIQ</a></li>
-      <li class="list-group-item">
-        Announcements, community support and discussions:
-        <br><br>
-        <div>
-          <a href="http://chat.m-labs.hk/" target="_blank" rel="noopener noreferrer">Mattermost live chat</a> (bridged to IRC)
-          <br>
-          <a href="https://forum.m-labs.hk/" target="_blank" rel="noopener noreferrer">Forum</a> (new!)
-          <br>
-          IRC: #m-labs on Freenode
-          <br>
-          <a href="https://ssl.serverraum.org/lists/listinfo/artiq" target="_blank" rel="noopener noreferrer">Public mailing list</a>
-          <br>
-        </div>
-      </li>
-      <li class="list-group-item"><a href="https://github.com/m-labs/artiq" target="_blank" rel="noopener noreferrer">Source code repository</a></li>
-      <li class="list-group-item">Commercial support available (Sinara hardware purchases, ports to your hardware, feature development, technical support, bugfixing)<br>contact sales@m-***s.hk<br>We welcome inquiries from research groups of all sizes.<br><a href="https://github.com/m-labs/artiq/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Afor-contract" target="_blank" rel="noopener noreferrer">Proposed extensions</a></li>
-      <li class="list-group-item">NIST press release: <a href="https://www.nist.gov/news-events/news/2015/01/open-source-software-quantum-information" target="_blank" rel="noopener noreferrer">Open-Source Software for Quantum Information</a></li>
-    </ul>
-  </div>
-
-</div>
-
-{% end %}

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"

templates/customs/about-us.html

@@ -82,6 +82,7 @@
 
   </main>
 
+
   <div class="container-fluid hero3 d-flex flex-column justify-content-center">
 
     <div class="container">

templates/customs/resources.html

@@ -0,0 +1,252 @@
+{% extends 'section.html' %}
+
+
+{% block hero %}
+
+  <div class="container-fluid hero2 d-flex flex-column justify-content-center">
+
+    <div class="container">
+
+        <div class="row">
+
+          <div class="col-12 text-center mt-n0 mt-lg-n5">
+
+            <h1>Resources</h1>
+
+            <img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
+
+          </div>
+
+        </div>
+
+    </div>
+
+  </div>
+
+{% endblock %}
+
+
+{% block main %}
+
+  <main class="container">
+
+    <div class="row">
+
+      <div class="col-12 col-md-4">
+
+        <div class="card shadow mb-4">
+          <div class="card-body">
+            <div class="card-title">
+              <h5 class="mb-0">ARTIQ Documentation</h5>
+            </div>
+            <small>Beta (development) version</small>
+            <br><br>
+            <a href="/docs/artiq/manual-beta.pdf" target="_blank">PDF</a> | <a href="https://m-labs.hk/artiq/manual-beta/" target="_blank" rel="noopener noreferrer">HTML</a>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-4">
+
+        <div class="card shadow mb-4">
+          <div class="card-body">
+            <div class="card-title">
+              <h5 class="mb-0">ARTIQ Documentation</h5>
+            </div>
+            <small>Stable version</small>
+            <br><br>
+            <a href="https://m-labs.hk/artiq/manual/" target="_blank">HTML</a>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-4">
+
+        <div class="card shadow mb-4">
+          <div class="card-body">
+            <div class="card-title">
+              <h5 class="mb-0">ARTIQ Documentation</h5>
+            </div>
+            <small>Older manuals (HTML only)</small>
+            <br><br>
+            <a href="https://m-labs.hk/artiq/manual-release-3/" target="_blank" rel="noopener noreferrer">ARTIQ-3</a> | <a href="https://m-labs.hk/artiq/manual-release-2/" target="_blank" rel="noopener noreferrer">ARTIQ-2</a>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-4">
+
+        <div class="card shadow mb-4">
+          <div class="card-body">
+            <div class="card-title">
+              <h5 class="mb-0">The ARTIQ experiment control system</h5>
+            </div>
+            <small></small>
+            <br><br>
+            <a href="/docs/artiq/artiq_overview.pdf" target="_blank" rel="noopener noreferrer">View slides</a>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-4">
+
+        <div class="card shadow mb-4">
+          <div class="card-body">
+            <div class="card-title">
+              <h5 class="mb-0">Timing contnrol in ARTIQ</h5>
+            </div>
+            <small></small>
+            <br><br>
+            <a href="/docs/artiq/slides_timing.pdf" target="_blank" rel="noopener noreferrer">View slides</a>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+
+  </main>
+
+
+  <div class="d-none container-fluid hero3 d-md-flex flex-column justify-content-center">
+
+    <div class="container">
+
+    </div>
+
+  </div>
+
+
+  <div class="container mt-4 mt-md-0">
+
+    <div class="row">
+
+      <div class="col-12 col-md-8 mx-auto text-center">
+
+        <h1>Announcements, community support and discussions</h1>
+
+        <img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
+
+      </div>
+
+    </div>
+
+
+    <div class="row mt-5">
+
+      <div class="col-12 col-md-3">
+
+        <div class="card shadow mb-4 text-center">
+          <div class="px-auto pt-4">
+            <img src="{{ get_url(path='images/mattermost@2x.png', cachebust=true) }}" width="40px">
+          </div>
+          <div class="card-body">
+            <a href="http://chat.m-labs.hk/" target="_blank" rel="noopener noreferrer">Mattermost live chat</a>
+            <br>
+            <small>(bridged to IRC)</small>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-3">
+
+        <div class="card shadow mb-4 text-center">
+          <div class="px-auto pt-4">
+            <img src="{{ get_url(path='images/forum@2x.png', cachebust=true) }}" width="40px">
+          </div>
+          <div class="card-body">
+            <a href="https://forum.m-labs.hk/" target="_blank" rel="noopener noreferrer">Forum</a>
+            <br>
+            <small>(New!)</small>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-3">
+
+        <div class="card shadow mb-4 text-center">
+          <div class="px-auto pt-4">
+            <img src="{{ get_url(path='images/irc@2x.png', cachebust=true) }}" width="40px">
+          </div>
+          <div class="card-body">
+            <a href="#">IRC: #m-labs</a>
+            <br>
+            <small>on Freenode</small>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="col-12 col-md-3">
+
+        <div class="card shadow mb-4 text-center">
+          <div class="px-auto pt-4">
+            <img src="{{ get_url(path='images/github@2x.png', cachebust=true) }}" width="40px">
+          </div>
+          <div class="card-body">
+            <a href="https://github.com/m-labs/artiq" target="_blank" rel="noopener noreferrer">Source code repository</a>
+            <br>
+            <small>&nbsp;</small>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+
+
+    <div class="row mt-5">
+
+      <div class="col-12">
+
+        <h5 class="py-3">Commercial support available</h5>
+
+      </div>
+
+      <div class="col-12 col-md-6">
+
+        <p>
+          <strong>Sinara hardware purchases, ports to your hardware, feature development, technical support, bugfixing</strong>
+          <br>contact sales@m-***s.hk
+        </p>
+
+        <p>
+          We welcome inquiries from research groups of all sizes.<br><a href="https://github.com/m-labs/artiq/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Afor-contract" target="_blank" rel="noopener noreferrer">Proposed extensions</a>
+        </p>
+
+      </div>
+
+      <div class="col-12 col-md-6 mt-4 mt-md-0">
+
+        <div class="d-flex mb-3">
+          <img src="{{ get_url(path='images/directory@2x.png', cachebust=true) }}" width="40px" height="40px">
+          <p class="pl-3">
+            <a href="https://ssl.serverraum.org/lists/listinfo/artiq" target="_blank" rel="noopener noreferrer">Public mailing list</a>
+          </p>
+        </div>
+
+        <div class="d-flex mb-3">
+          <img src="{{ get_url(path='images/press@2x.png', cachebust=true) }}" width="40px" height="40px">
+          <p class="pl-3">
+            <strong>NIST press release</strong>
+            <br>
+            <a href="https://www.nist.gov/news-events/news/2015/01/open-source-software-quantum-information" target="_blank" rel="noopener noreferrer">Open-Source Software for Quantum Information</a>
+          </p>
+        </div>
+
+      </div>
+
+    </div>
+
+  </div>
+
+{% endblock %}
+
+
+{% block footer_contact %}{% endblock %}

templates/page-hero.html

@@ -1,67 +0,0 @@
-{% extends 'section.html' %}
-
-{% block styles %}
-<style>
-  h2, h5 {
-    margin-bottom: 3rem!important;
-  }
-</style>
-{% endblock %}
-
-
-{% block hero %}
-
-  <div class="container-fluid hero2 d-flex flex-column justify-content-center">
-
-    <div class="container">
-
-        <div class="row">
-
-          <div class="col-12 text-center mt-n0 mt-lg-n5">
-
-            {% if page.extra and page.extra.title %}
-            <h1>{{ page.extra.title }}</h1>
-            {% else %}
-            <h1>{{ page.title }}</h1>
-            {% endif %}
-
-            <img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
-
-          </div>
-
-        </div>
-
-    </div>
-
-  </div>
-
-{% endblock %}
-
-
-{% block main %}
-
-  <main class="container">
-
-    <div class="row pb-5">
-
-      <div class="col-12">
-
-        {% block main_content %}
-
-          {% if page and page.content %}
-          {{ page.content | safe }}
-          {% endif %}
-
-        {% endblock %}
-
-      </div>
-
-    </div>
-
-  </main>
-
-{% endblock %}
-
-
-
-{% block footer_contact %}{% endblock %}

templates/page.html

@@ -9,4 +9,58 @@
 {% endblock %}
 
 
+{% block hero %}
+
+  <div class="container-fluid hero2 d-flex flex-column justify-content-center">
+
+    <div class="container">
+
+        <div class="row">
+
+          <div class="col-12 text-center mt-n0 mt-lg-n5">
+
+            {% if page.extra and page.extra.title %}
+            <h1>{{ page.extra.title }}</h1>
+            {% else %}
+            <h1>{{ page.title }}</h1>
+            {% endif %}
+
+            <img src="{{ get_url(path='images/ion@2x.png', cachebust=true) }}" width="100" align="ion">
+
+          </div>
+
+        </div>
+
+    </div>
+
+  </div>
+
+{% endblock %}
+
+
+{% block main %}
+
+  <main class="container">
+
+    <div class="row pb-5">
+
+      <div class="col-12">
+
+        {% block main_content %}
+
+          {% if page and page.content %}
+          {{ page.content | safe }}
+          {% endif %}
+
+        {% endblock %}
+
+      </div>
+
+    </div>
+
+  </main>
+
+{% endblock %}
+
+
 {% block footer_contact %}{% endblock %}