Merge branch 'main' into production

Author: edan-bainglass

basehub/files/etc/jupyterhub/templates/login.html

@@ -14,14 +14,14 @@
 
 {% block main %}
 <div id="login-page">
-  <header id="banner">
+  <div id="banner">
     <div id="brand-logo">
       <a class="logo" href="https://aiidalab.net" target="_blank">
         <img src="/hub/static/external/aiidalab-wide-logo.png" alt="AiiDAlab" />
       </a>
     </div>
     <div id="title">
-      <h1>Welcome to the AiiDAlab {{ DEPLOYMENT }} Server</h1>
+      <h1>{{ title }}</h1>
       <span class="hint">{{ subtitle }}</span>
     </div>
     <div id="login-button">
@@ -43,13 +43,17 @@ <h2 id="warning-label">
       </strong>
     </div>
     {% endif %}
-  </header>
+  </div>
 
   <section id="platform-information">
     <div class="info-box">
       <div class="section-header">
-        <i id="aiidalab-icon" class="fa"></i>
-        <h2>About AiiDAlab</h2>
+        <img
+          id="aiidalab-icon"
+          src="/hub/static/external/aiidalab-icon.svg"
+          alt="AiiDAlab"
+        />
+        <h2>AiiDAlab</h2>
       </div>
       <p>
         <a href="https://aiidalab.net" target="_blank">AiiDAlab</a> is an
@@ -59,8 +63,12 @@ <h2>About AiiDAlab</h2>
     </div>
     <div class="info-box">
       <div class="section-header">
-        <i id="aiida-icon" class="fa"></i>
-        <h2>About AiiDA</h2>
+        <img
+          id="aiida-icon"
+          src="/hub/static/external/aiida-icon.svg"
+          alt="AiiDA"
+        />
+        <h2>AiiDA</h2>
       </div>
       <p>
         <a href="https://aiida.net" target="_blank">AiiDA</a>
@@ -71,38 +79,22 @@ <h2>About AiiDA</h2>
     </div>
     <div class="info-box">
       <div class="section-header">
-        <i class="fa fa-info-circle"></i>
-        <h2>Resources</h2>
+        <img
+          id="mc-icon"
+          src="/hub/static/external/mc-icon.svg"
+          alt="Materials Cloud"
+        />
+        <h2>Materials Cloud</h2>
       </div>
-      <ul id="resource-list">
-        <li class="resource-item">
-          <i class="fa fa-video-camera"></i>
-          <a href="https://www.youtube.com/watch?v=Oqo5buk6Om8" target="_blank">
-            AiiDAlab introduction video
-          </a>
-        </li>
-        <li class="resource-item">
-          <i class="fa fa-book"></i>
-          <a href="https://aiidalab.readthedocs.io/en/latest/" target="_blank">
-            AiiDAlab documentation
-          </a>
-        </li>
-        <li class="resource-item">
-          <i class="fa fa-laptop"></i>
-          <a
-            href="https://aiidalab.readthedocs.io/en/latest/usage/access/local.html"
-            target="_blank"
-          >
-            Deploy AiiDAlab locally
-          </a>
-        </li>
-        <li class="resource-item">
-          <i class="fa fa-book"></i>
-          <a href="https://aiida.readthedocs.io/en/latest/" target="_blank">
-            AiiDA documentation
-          </a>
-        </li>
-      </ul>
+      <p>
+        The
+        <a href="https://www.materialscloud.org" target="_blank"
+          >Materials Cloud</a
+        >
+        is a platform for open and reproducible computational science, providing
+        tools for sharing, publishing, and exploring research data and
+        workflows.
+      </p>
     </div>
   </section>
 
@@ -178,8 +170,16 @@ <h2>Acknowledgements</h2>
         <h4>Please cite:</h4>
         <ul>
           <li>
-            A. V. Yakutovich et al. <em>Comp. Mat. Sci.</em> <b>188</b>, 110165
-            (2021)
+            A. V. Yakutovich, D. Hollas, E. Bainglass, J. Yu et al.,
+            <em>Digit. Discov.</em> <b>5</b>, 2310-2324 (2026).
+            <br />
+            <a href="https://doi.org/10.1039/D5DD00567A" target="_blank">
+              DOI:10.1039/D5DD00567A
+            </a>
+          </li>
+          <li>
+            A. V. Yakutovich, K. Eimre, O. Schütt et al.
+            <em>Comp. Mat. Sci.</em> <b>188</b>, 110165 (2021).
             <br />
             <a
               href="https://doi.org/10.1016/j.commatsci.2020.110165"
@@ -193,46 +193,92 @@ <h4>Please cite:</h4>
     </div>
   </section>
 
-  <section id="faq">
-    <div class="info-box">
-      <div class="section-header">
-        <h2>Any Questions?</h2>
-      </div>
-      <p>
-        If you have any questions or need assistance, please refer to the
-        <a href="/faq">FAQ</a> page. If you cannot find your question, please
-        <a
-          href="mailto:{{ support_emails | join(',') }}?subject=[HELP] AiiDAlab PSI Server"
-          >send us an email</a
-        >.
-      </p>
-      For technical issues, please open an issue at:
-      <ul>
-        <li>
+  <section id="more-info">
+    <div id="faq">
+      <div class="info-box">
+        <div class="section-header">
+          <h2>Any Questions?</h2>
+        </div>
+        <p>
+          If you have any questions or need assistance, please refer to the
+          <a href="/faq">FAQ</a> page. If you cannot find your question, please
           <a
-            href="https://github.com/aiidalab/aiidalab/issues/new"
-            target="_blank"
-            >AiiDAlab</a
-          >
-        </li>
-        {% if deployment == "Demo" %}
-        <li>
-          <a
-            href="https://github.com/aiidalab/aiidalab-demo-server/issues/new"
-            target="_blank"
-            >AiiDAlab Demo Server</a
-          >
-        </li>
-        {% endif %} {% if include_qe %}
-        <li>
-          <a
-            href="https://github.com/aiidalab/aiidalab-qe/issues/new"
-            target="_blank"
-            >AiiDAlab QE app</a
-          >
-        </li>
-        {% endif %}
-      </ul>
+            href="mailto:{{ support_emails | join(',') }}?subject=[HELP] AiiDAlab PSI Server"
+            >send us an email</a
+          >.
+        </p>
+        For technical issues, please open an issue at:
+        <ul>
+          <li>
+            <a
+              href="https://github.com/aiidalab/aiidalab/issues/new"
+              target="_blank"
+              >AiiDAlab</a
+            >
+          </li>
+          {% if deployment == "Demo" %}
+          <li>
+            <a
+              href="https://github.com/aiidalab/aiidalab-demo-server/issues/new"
+              target="_blank"
+              >AiiDAlab Demo Server</a
+            >
+          </li>
+          {% endif %} {% if include_qe %}
+          <li>
+            <a
+              href="https://github.com/aiidalab/aiidalab-qe/issues/new"
+              target="_blank"
+              >AiiDAlab QE app</a
+            >
+          </li>
+          {% endif %}
+        </ul>
+      </div>
+    </div>
+
+    <div id="resources">
+      <div class="info-box">
+        <div class="section-header">
+          <i class="fa fa-info-circle"></i>
+          <h2>Resources</h2>
+        </div>
+        <ul id="resource-list">
+          <li class="resource-item">
+            <i class="fa fa-video-camera"></i>
+            <a
+              href="https://www.youtube.com/watch?v=Oqo5buk6Om8"
+              target="_blank"
+            >
+              AiiDAlab introduction video
+            </a>
+          </li>
+          <li class="resource-item">
+            <i class="fa fa-book"></i>
+            <a
+              href="https://aiidalab.readthedocs.io/en/latest/"
+              target="_blank"
+            >
+              AiiDAlab documentation
+            </a>
+          </li>
+          <li class="resource-item">
+            <i class="fa fa-laptop"></i>
+            <a
+              href="https://aiidalab.readthedocs.io/en/latest/usage/access/local.html"
+              target="_blank"
+            >
+              Deploy AiiDAlab locally
+            </a>
+          </li>
+          <li class="resource-item">
+            <i class="fa fa-book"></i>
+            <a href="https://aiida.readthedocs.io/en/latest/" target="_blank">
+              AiiDA documentation
+            </a>
+          </li>
+        </ul>
+      </div>
     </div>
   </section>
 

basehub/files/etc/jupyterhub/templates/page.html

@@ -7,6 +7,31 @@
 <link rel="stylesheet" href="/hub/static/external/page.css" type="text/css" />
 {% endblock %}
 
+
+<!---->
+{% block scripts %}
+<!---->
+{{ super() }}
+<!---->
+{% if is_mc_deployment %}
+<script src="https://cdn.jsdelivr.net/gh/materialscloud-org/mc-header@main/header.js" defer></script>
+<script>
+  var breadcrumbsPath = [
+    { name: "Work", link: "https://www.materialscloud.org/work/" },
+    {
+      name: "AiiDAlab",
+      link: "https://www.materialscloud.org/work/aiidalab",
+    },
+    {
+      name: "AiiDAlab demo server",
+      link: null,
+    },
+  ];
+  </script>
+{% endif %}
+<!---->
+{% endblock scripts %}
+
 {% block nav_bar %}
   <nav class="navbar navbar-default">
     <div class="container-fluid">
@@ -92,7 +117,7 @@
               {% endif %}
                 <img
                   src="{{ institution_logo_src }}"
-                  alt="{{ institution_logo_alt or 'Logo' }}"
+                  alt="{{ institution_logo_alt or 'Institution' }}"
                 />
               {% if institution_logo_href %}
               </a>
@@ -101,6 +126,18 @@
               {% endif %}
             </li>
             {% endif %}
+            {% if not is_mc_deployment %}
+            <li id="mc-link">
+              <a
+                href="https://www.materialscloud.org/"
+                title="Materials Cloud"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <img src="/hub/static/external/mc-icon.svg" alt="Materials Cloud" />
+              </a>
+            </li>
+            {% endif %}
           {% endblock %}
         </ul>
       </div>