Skip to content

Commit a4e1e84

Browse files
edan-bainglassedan-bainglass
committed
Merge branch 'main' into production
2 parents 7c9e8ad + 65b522e commit a4e1e84

7 files changed

Lines changed: 172 additions & 104 deletions

File tree

‎.github/workflows/deploy-to-aks.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
K8S_NAMESPACE: ${{ vars.K8S_NAMESPACE }}
5555
PYTHON_VERSION: ${{ vars.PYTHON_VERSION }}
5656
CONTAINER_LIFETIME: ${{ vars.CONTAINER_LIFETIME }}
57+
INCLUDE_QE: ${{ vars.INCLUDE_QE }}
58+
SUPPORT_EMAILS: ${{ vars.SUPPORT_EMAILS }}
5759

5860
- name: Connect to AKS
5961
run: az aks get-credentials --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} --name ${{ vars.AZURE_KUBERNETES_CLUSTER }}

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

Lines changed: 71 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "templates/login.html" %}
22

33
<!---->
4-
{% block title %}Demo AiiDAlab - Login{% endblock %}
4+
{% block title %}AiiDAlab {{ deployment }} - Login{% endblock %}
55

66
<!---->
77
{% block stylesheet %}
@@ -21,15 +21,13 @@
2121
</a>
2222
</div>
2323
<div id="title">
24-
<h1>Welcome to the AiiDAlab Demo Server</h1>
25-
<span class="hint">
26-
A pre-configured environment for exploring AiiDAlab
27-
</span>
24+
<h1>Welcome to the AiiDAlab {{ DEPLOYMENT }} Server</h1>
25+
<span class="hint">{{ subtitle }}</span>
2826
</div>
2927
<div id="login-button">
3028
{% block login %} {{ super() }} {% endblock login %}
3129
</div>
32-
{% if is_ephemeral %}
30+
{% if deployment == "Demo" %}
3331
<div id="warning-banner" class="alert alert-warning">
3432
<h2 id="warning-label">
3533
<i class="fa fa-exclamation-triangle"></i>
@@ -108,17 +106,17 @@ <h2>Resources</h2>
108106
</div>
109107
</section>
110108

109+
{% if include_qe %}
111110
<section id="quantum-espresso">
112111
<div class="info-box">
113112
<div class="section-header">
114113
<h2>The Quantum ESPRESSO (QE) App</h2>
115114
</div>
116115
<p>
117-
The demo server is pre-configured with the AiiDAlab
116+
This server is pre-configured with the AiiDAlab
118117
<a href="https://aiidalab-qe.readthedocs.io/" target="_blank"
119118
>Quantum ESPRESSO (QE) app</a
120-
>
121-
. The app provides a user-friendly interface to set up and run
119+
>. The app provides a user-friendly interface to set up and run
122120
<a href="https://www.quantum-espresso.org/" target="_blank"
123121
>Quantum ESPRESSO</a
124122
>
@@ -128,49 +126,31 @@ <h2>The Quantum ESPRESSO (QE) App</h2>
128126
ideal tool for beginners and experienced users, as well as instructors
129127
and students, in the field of computational materials science.
130128
</p>
131-
</div>
132-
</section>
133-
134-
<section id="faq">
135-
<div class="info-box">
136-
<div class="section-header">
137-
<h2>Any Questions?</h2>
129+
<div class="citations">
130+
<h4>Please cite:</h4>
131+
<ul>
132+
<li>
133+
Wang, X., Bainglass, E., Bonacci, M., Ortega-Guerrero, A. et al.
134+
<em>npj. Comput. Mater.</em> <b>12</b>, 72 (2026)
135+
<br />
136+
<a
137+
href="https://doi.org/10.1038/s41524-025-01936-4"
138+
target="_blank"
139+
>
140+
DOI:10.1038/s41524-025-01936-4
141+
</a>
142+
</li>
143+
</ul>
138144
</div>
139-
<p>
140-
If you have any questions or need assistance, please refer to the
141-
<a href="/faq">FAQ</a> page. If you cannot find your question, please
142-
<a
143-
href="mailto:aiidalab@materialscloud.org?subject=[HELP] AiiDAlab Demo Server"
144-
>send us an email</a
145-
>.
146-
</p>
147-
For technical issues, please open an issue at:
148-
<ul>
149-
<li>
150-
<a href="https://github.com/aiidalab/aiidalab/issues/new" target="_blank"
151-
>AiiDAlab</a
152-
>
153-
</li>
154-
<li>
155-
<a
156-
href="https://github.com/aiidalab/aiidalab-demo-server/issues/new"
157-
target="_blank"
158-
>AiiDAlab Demo Server</a
159-
>
160-
</li>
161-
<li>
162-
<a
163-
href="https://github.com/aiidalab/aiidalab-qe/issues/new"
164-
target="_blank"
165-
>AiiDAlab Quantum ESPRESSO app</a
166-
>
167-
</li>
168-
</ul>
169145
</div>
170146
</section>
147+
{% endif %}
171148

172149
<section id="acknowledgement">
173150
<div class="info-box">
151+
<div class="section-header">
152+
<h2>Acknowledgements</h2>
153+
</div>
174154
<p>
175155
This work is or has been supported by the
176156
<a href="http://nccr-marvel.ch" target="_blank">
@@ -194,13 +174,8 @@ <h2>Any Questions?</h2>
194174
Materials Cloud partners</a
195175
>.
196176
</p>
197-
<div id="citations">
198-
<p>
199-
<strong>
200-
If you use AiiDAlab or the QE app in your research, please cite the
201-
following publications:
202-
</strong>
203-
</p>
177+
<div class="citations">
178+
<h4>Please cite:</h4>
204179
<ul>
205180
<li>
206181
A. V. Yakutovich et al. <em>Comp. Mat. Sci.</em> <b>188</b>, 110165
@@ -213,22 +188,54 @@ <h2>Any Questions?</h2>
213188
DOI:10.1016/j.commatsci.2020.110165
214189
</a>
215190
</li>
216-
<li>
217-
Wang, X., Bainglass, E., Bonacci, M., Ortega-Guerrero, A. et al.
218-
<em>npj. Comput. Mater.</em> <b>12</b>, 72 (2026)
219-
<br />
220-
<a
221-
href="https://doi.org/10.1038/s41524-025-01936-4"
222-
target="_blank"
223-
>
224-
DOI:10.1038/s41524-025-01936-4
225-
</a>
226-
</li>
227191
</ul>
228192
</div>
229193
</div>
230194
</section>
231195

196+
<section id="faq">
197+
<div class="info-box">
198+
<div class="section-header">
199+
<h2>Any Questions?</h2>
200+
</div>
201+
<p>
202+
If you have any questions or need assistance, please refer to the
203+
<a href="/faq">FAQ</a> page. If you cannot find your question, please
204+
<a
205+
href="mailto:{{ support_emails | join(',') }}?subject=[HELP] AiiDAlab PSI Server"
206+
>send us an email</a
207+
>.
208+
</p>
209+
For technical issues, please open an issue at:
210+
<ul>
211+
<li>
212+
<a
213+
href="https://github.com/aiidalab/aiidalab/issues/new"
214+
target="_blank"
215+
>AiiDAlab</a
216+
>
217+
</li>
218+
{% if deployment == "Demo" %}
219+
<li>
220+
<a
221+
href="https://github.com/aiidalab/aiidalab-demo-server/issues/new"
222+
target="_blank"
223+
>AiiDAlab Demo Server</a
224+
>
225+
</li>
226+
{% endif %} {% if include_qe %}
227+
<li>
228+
<a
229+
href="https://github.com/aiidalab/aiidalab-qe/issues/new"
230+
target="_blank"
231+
>AiiDAlab QE app</a
232+
>
233+
</li>
234+
{% endif %}
235+
</ul>
236+
</div>
237+
</section>
238+
232239
<section id="sponsors">
233240
<a class="logo" href="http://nccr-marvel.ch/" target="_blank">
234241
<img src="/hub/static/external/marvel-logo.png" alt="NCCR MARVEL" />

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{% extends "templates/page.html" %}
22

3+
<!---->
4+
{% block stylesheet %}
5+
<!---->
6+
{{ super() }}
7+
<link rel="stylesheet" href="/hub/static/external/page.css" type="text/css" />
8+
{% endblock %}
9+
310
{% block nav_bar %}
411
<nav class="navbar navbar-default">
512
<div class="container-fluid">
@@ -68,14 +75,32 @@
6875
{% block login_widget %}
6976
<span id="login_widget">
7077
{% if user %}
71-
<p class="navbar-text">{{user.name}}</p>
78+
<p class="navbar-text">{{user.name}}</p>
7279
<a id="logout" role="button" class="navbar-btn btn-sm btn btn-default" href="{{logout_url}}"> <i aria-hidden="true" class="fa fa-sign-out"></i> Logout</a>
7380
{% else %}
7481
<a id="login" role="button" class="btn-sm btn navbar-btn btn-default" href="{{login_url}}">Login</a>
7582
{% endif %}
7683
</span>
7784
{% endblock %}
7885
</li>
86+
{% if institution_logo_src %}
87+
<li id="institution-logo">
88+
{% if institution_logo_href %}
89+
<a href="{{ institution_logo_href }}" target="_blank" rel="noopener noreferrer">
90+
{% else %}
91+
<span class="navbar-text">
92+
{% endif %}
93+
<img
94+
src="{{ institution_logo_src }}"
95+
alt="{{ institution_logo_alt or 'Logo' }}"
96+
/>
97+
{% if institution_logo_href %}
98+
</a>
99+
{% else %}
100+
</span>
101+
{% endif %}
102+
</li>
103+
{% endif %}
79104
{% endblock %}
80105
</ul>
81106
</div>

‎basehub/files/static/external/css/login.css‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
html,
2-
body {
3-
height: 100%;
4-
}
5-
6-
body {
7-
position: relative;
8-
background: white;
9-
}
10-
11-
.navbar {
12-
margin-bottom: 0;
13-
}
14-
151
#bg-graph-canvas {
162
position: fixed;
173
inset: 0;
@@ -115,9 +101,10 @@ header {
115101

116102
.info-box {
117103
box-shadow: 1px 1px 10px #f5f5f5;
118-
padding: 3rem;
104+
padding: 2.5rem;
119105
background-color: #f5f5f5;
120106
border-radius: 2rem;
107+
font-size: 18px;
121108
}
122109

123110
.section-header {
@@ -132,6 +119,10 @@ header {
132119
font-size: 28px;
133120
}
134121

122+
#platform-information .section-header {
123+
justify-content: flex-start;
124+
}
125+
135126
#aiidalab-icon {
136127
background: url("/hub/static/external/aiidalab-icon.svg");
137128
background-size: cover;
@@ -169,18 +160,10 @@ header {
169160
margin: 0 auto;
170161
}
171162

172-
#quantum-espresso .section-header {
173-
justify-content: center;
174-
}
175-
176163
#faq ul {
177164
margin-bottom: 0;
178165
}
179166

180-
#acknowledgement {
181-
font-size: 15px;
182-
}
183-
184167
#acknowledgement hr:first-child {
185168
margin-top: 0;
186169
}
@@ -189,11 +172,7 @@ header {
189172
margin-bottom: 0;
190173
}
191174

192-
#citations p:first-child {
193-
margin-bottom: 4px;
194-
}
195-
196-
#citations ul {
175+
.citations ul {
197176
font-size: 14px;
198177
}
199178

@@ -212,12 +191,19 @@ footer {
212191
text-align: center;
213192
}
214193

194+
@media (min-width: 993px) {
195+
.section-header {
196+
justify-content: center;
197+
}
198+
}
199+
215200
@media (max-width: 992px) {
216201
#platform-information {
217202
flex-direction: column;
218203
}
219204

220205
#quantum-espresso,
206+
#acknowledgement,
221207
#faq {
222208
max-width: unset;
223209
}

‎basehub/files/static/external/css/page.css‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
html,
2+
body {
3+
height: 100%;
4+
}
5+
6+
body {
7+
position: relative;
8+
background: white;
9+
}
10+
11+
.navbar {
12+
margin-bottom: 0;
13+
}
14+
15+
.navbar #institution-logo a {
16+
padding: 6px;
17+
}
18+
19+
.navbar #institution-logo a:hover,
20+
.navbar #institution-logo a:focus {
21+
background: unset;
22+
}
23+
24+
.navbar #institution-logo img {
25+
height: 28px;
26+
}

‎basehub/files/static/external/images/background.jpg‎

-126 KB
Binary file not shown.

0 commit comments

Comments
 (0)