move citation to home page (#11)

- move citation to the home page - The error of the advisory committee is fixed. - The citation is also added on the About page. - Use the link to the members' institutional page instead of email. For the former contributors, since we don't know the page for all of them, the links are removed. - The first FAQ is removed.
aiidalab · Sep 15, 2023 · 2f33ef0 · 2f33ef0
1 parent 4f203c4
commit 2f33ef0
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 40 deletions.
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -86,12 +86,6 @@
           {% endfor %}
         </div>
         <hr />
-        <p class="how-to-cite">
-          We kindly ask that you acknowledge the use of AiiDAlab by citing the
-          main associated publication. Please click
-          <a href="{{ site.baseurl }}/deployments#acknowledgment">here</a> for
-          information on how to cite AiiDAlab.
-        </p>
         <p class="funding-acknowledgment">{% include funding.html %}</p>
         <hr />
         <p class="copyright">

diff --git a/_sass/deployments.scss b/_sass/deployments.scss
@@ -61,23 +61,6 @@
   }
 }
 
-.acknowledgment {
-  @extend %flexbox;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 2em;
-
-  p {
-    font-weight: inherit;
-    font-size: inherit;
-  }
-
-  .reference {
-    font-style: italic;
-    font-weight: normal;
-  }
-}
-
 .faq {
   @media #{$desktop} {
     @include columns(2);

diff --git a/_sass/landing-page.scss b/_sass/landing-page.scss
@@ -85,3 +85,20 @@
     flex-direction: row-reverse;
   }
 }
+
+.citation {
+  @extend %flexbox;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 2em;
+
+  h2 {
+    margin-top: 60px;
+    margin-bottom: 10px;
+  }
+
+  .reference {
+    font-style: italic;
+    font-weight: normal;
+  }
+}
diff --git a/_team_members/0_nicola.md b/_team_members/0_nicola.md
@@ -1,7 +1,8 @@
 ---
 name: Nicola Marzari
 email: nicola.marzari@epfl.ch
-position: Advisory Committee
+position: Advisory_Committee
 affiliation: EPFL
+page: https://people.epfl.ch/nicola.marzari
 image_path: /images/nicola.jpg
 ---
diff --git a/_team_members/1_berend.md b/_team_members/1_berend.md
@@ -1,7 +1,8 @@
 ---
 name: Berend Smit
 email: berend.smit@epfl.ch
-position: Advisory Committee
+position: Advisory_Committee
 affiliation: EPFL
+page: https://www.epfl.ch/labs/lsmo/smit/
 image_path: /images/berend.jpeg
 ---
diff --git a/_team_members/2_carlo.md b/_team_members/2_carlo.md
@@ -3,5 +3,6 @@ name: Carlo Pignedoli
 email: carlo.pignedoli@empa.ch
 position: Project lead
 affiliation: Empa
+page: https://www.empa.ch/web/s205/carlo-pignedoli
 image_path: /images/carlo.jpg
 ---
diff --git a/_team_members/3_giovanni.md b/_team_members/3_giovanni.md
@@ -3,5 +3,6 @@ name: Giovanni Pizzi
 email: giovanni.pizzi@psi.ch
 position: Project lead
 affiliation: PSI
+page: https://www.psi.ch/en/lms/people/giovanni-pizzi
 image_path: /images/giovanni.jpg
 ---
diff --git a/_team_members/4_sasha.md b/_team_members/4_sasha.md
@@ -4,5 +4,6 @@ email: aliaksandr.yakutovich@empa.ch
 image_path: /images/sasha.jpeg
 position: Maintainer
 affiliation: Empa
+page: https://www.empa.ch/web/s205/aliaksandr-yakutovich
 blurb: Scientist at nanotech@surfaces laboratory (Empa)
 ---
diff --git a/_team_members/5_jusong.md b/_team_members/5_jusong.md
@@ -4,6 +4,7 @@ position: Maintainer
 affiliation: PSI
 image_path: /images/jusong.jpg
 email: jusong.yu@psi.ch
+page: https://www.psi.ch/de/lms/people/jusong-yu
 twitter:
 github: unkcpz
 blurb: Jusong is a post-doctoral researcher at PSI.

diff --git a/_team_members/6_xing.md b/_team_members/6_xing.md
@@ -4,6 +4,7 @@ position: Maintainer
 affiliation: PSI
 image_path: /images/xing.jpg
 email: xing.wang@psi.ch
+page: https://www.psi.ch/en/lms/people/xing-wang
 twitter:
 github: superstar54
 blurb: Xing is a post-doctoral researcher at PSI.

diff --git a/_team_members/7_marnik.md b/_team_members/7_marnik.md
@@ -3,6 +3,7 @@ name: Marnik Bercx
 email: marnik.bercx@epfl.ch
 position: Maintainer
 affiliation: EPFL
+page: https://people.epfl.ch/marnik.bercx
 image_path: /images/marnik.jpg
 blurb: Marnik develops the QE App and AiiDA plugin.
 ---
diff --git a/_team_members/8_dou.md b/_team_members/8_dou.md
@@ -3,5 +3,6 @@ name: Dou Du
 email: dou.du@epfl.ch
 position: Maintainer
 affiliation: EPFL
+page: https://people.epfl.ch/dou.du
 image_path: /images/dou.jpg
 ---
diff --git a/_team_members/910_daniel.md b/_team_members/910_daniel.md
@@ -3,5 +3,6 @@ name: Daniel Hollas
 email: daniel.hollas@bristol.ac.uk
 position: Maintainer
 affiliation: University of Bristol
+page: https://research-information.bris.ac.uk/en/persons/daniel-hollas
 image_path: /images/daniel.jpg
 ---
diff --git a/_team_members/911_andres.md b/_team_members/911_andres.md
@@ -3,6 +3,7 @@ name: Andres Ortega Guerrero
 email: andres.ortega-guerrero@empa.ch
 image_path: /images/andres.jpg
 position: Maintainer
+page: https://www.empa.ch/web/s205/andres-ortega-guerrero
 affiliation: Empa
 blurb: Postdoc at nanotech@surfaces laboratory (Empa)
 ---
diff --git a/_team_members/911_miki.md b/_team_members/911_miki.md
@@ -4,6 +4,7 @@ position: Maintainer
 affiliation: PSI
 image_path: /images/miki.jpeg
 email: miki.bonacci@psi.ch
+page: https://www.psi.ch/en/lms/people/miki-bonacci
 twitter:
 github: mikibonacci
 blurb: Miki is a post-doctoral researcher at PSI.

diff --git a/about.html b/about.html
@@ -23,7 +23,7 @@ <h4>Team Leaders</h4>
       />
     </div>
     <div class="name">
-      <a href="mailto:{{ person.email }}">{{ person.name }}</a>
+      <a href="{{ person.page }}">{{ person.name }}</a>
     </div>
     <div class="position">{{ person.affiliation }}</div>
   </li>
@@ -40,7 +40,7 @@ <h4>Core Developers</h4>
       />
     </div>
     <div class="name">
-      <a href="mailto:{{ person.email }}">{{ person.name }}</a>
+      <a href="{{ person.page }}">{{ person.name }}</a>
     </div>
     <div class="position">{{ person.affiliation }}</div>
   </li>
@@ -49,8 +49,8 @@ <h4>Core Developers</h4>
 
 <h4>Advisory Committee</h4>
 <ul class="team">
-  {% for person in site.team_members %} {% if person.position == "Advisory
-  Committee" %}
+  {% for person in site.team_members %} {% if person.position ==
+  "Advisory_Committee" %}
   <li>
     <div class="square-image">
       <img
@@ -59,7 +59,7 @@ <h4>Advisory Committee</h4>
       />
     </div>
     <div class="name">
-      <a href="mailto:{{ person.email }}">{{ person.name }}</a>
+      <a href="{{ person.page }}">{{ person.name }}</a>
     </div>
     <div class="position">{{ person.affiliation }}</div>
   </li>
@@ -69,11 +69,12 @@ <h4>Advisory Committee</h4>
 <h4>Former contributors</h4>
 <ul>
   {% for person in site.former_members %}
-  <li>
-    <a href="mailto:{{ person.email }}">{{ person.name }}</a>
-  </li>
+  <li>{{ person.name }}</li>
   {% endfor %}
 </ul>
 
 <h3>Our sponsors</h3>
 <p>{% include funding.html %}</p>
+
+<h3 class="editable" id="acknowledgment">Citation</h3>
+{% include acknowledgement.html %}
diff --git a/deployments.html b/deployments.html
@@ -1,7 +1,7 @@
 ---
 title: Deployments
 heading: Official Deployments
-description: You can <a href="https://aiidalab.readthedocs.io/en/latest/usage/index.html#aiidalab-launch">run AiiDAlab yourself</a>, however we also maintain a few official cloud-backed deployments.
+description: You can <a href="https://aiidalab.readthedocs.io/en/latest/usage/index.html#aiidalab-launch">run AiiDAlab yourself</a>, however we also maintain a few official cloud-backed deployments for researchers affiliated with some of the projects funding the development of AiiDAlab.
 deployments_table:
   - name: Materials Cloud
     color: "#D21F15"
@@ -40,10 +40,6 @@
       link: https://materials-marketplace.aiidalab.net
       text: Login
 faq:
-  - question: Why does the public demonstrator require an EGI account and enrollment?
-    answer: |
-      Providing this service comes at substantial cost.
-      Requiring the login via EGI allows us to protect against service abuse like crypto-mining.
   - question: How can I get access to the Materials Cloud deployments?
     answer: |
       These deployments are restricted to members of organizations affiliated with the <a href="https://www.materialscloud.org/home#partners">Materials Cloud partners</a>.
@@ -86,8 +82,7 @@ <h3>{{ deployment.name }}</h3>
   {% endfor %}
 </div>
 
-<h2 id="acknowledgment">Acknowledgment</h2>
-{% include acknowledgement.html %} {% if page.faq %}
+{% if page.faq %}
 <h2>FAQ</h2>
 <dl class="faq">
   {% for item in page.faq %}

diff --git a/index.html b/index.html
@@ -154,6 +154,13 @@ <h2>AiiDAlab is <strong>open-source</strong></h2>
     </div>
   </section>
 
+  <section>
+    <div class="citation container">
+      <h2 class="editable" id="acknowledgment">Citation</h2>
+      {% include acknowledgement.html %}
+    </div>
+  </section>
+
   <section class="bottom-cta">
     <h2 class="editable"><strong>See if AiiDAlab works for you</strong></h2>
     <div class="button alt">