Merge branch '24-partners_page' into 'master'

Resolve "Create "partners" page" See merge request hifis/hifis.net!27

Merge branch '24-partners_page' into 'master'
4784aff3 · Uwe Jandt (DESY, HIFIS) · 5c9c5761 · dc0e1704 · 4784aff3 · 4784aff3
Commit 4784aff3 authored 4 years ago by Uwe Jandt (DESY, HIFIS)
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -23,8 +23,8 @@ header:
        - title: Roadmap
          url: "roadmap/"

-        - title: International
-          url: "/"
+        - title: Partners
+          url: "partners"

        - title: Contact
          url: "contact"

--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -50,11 +50,10 @@
                        <p>Strengthening and developing the ICT competences of the whole Helmholtz Association.</p>
                    </div>
                    <div class="info-box">
-                        <a href="{% link index.md %}" class="btn btn-outline-light">
-                            <h3><i class="fas fa-globe-europe" aria-hidden="true"></i>&nbsp; HIFIS International</h3>
+                        <a href="{% link partners.md %}" class="btn btn-outline-light">
+                            <h3><i class="fas fa-globe-europe" aria-hidden="true"></i>&nbsp; HIFIS Partners</h3>
                        </a>
-                        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
-                            labore et dolore magna aliqua.</p>
+                        <p>Take a look at our partners, within the Helmholtz Association and throughout the World.</p>
                    </div>
                    <div class="info-box">
                        <a href="{% link roadmap/index.md %}" class="btn btn-outline-light">
@@ -66,33 +65,7 @@
                </div>
            </section>
        </div>
-        <div class="frontpage-jumbotron">
-            <section>
-                <h1>Partners</h1>
-                <div class="flex-content-wrapper">
-                    <a href="https://www.helmholtz-hida.de/" class="btn btn-light btn-lg btn-logo">
-                        <img src="{% link assets/img/third-party-logos/HiDA_Logo_RGB.svg %}" alt="HIDA Logo">
-                    </a>
-                    <a href="https://www.helmholtz.ai/" class="btn btn-light btn-lg btn-logo">
-                        <img src="{% link assets/img/third-party-logos/csm_logo_helmholtz_ai_cf39d4dbfc.png %}"
-                            alt="Helmholtz AI Logo">
-                    </a>
-                    <a href="https://helmholtz-metadaten.de/" class="btn btn-light btn-lg btn-logo">
-                        <img src="{% link assets/img/third-party-logos/HMC_Logo_updated_pfade-e1576839804647.png %}"
-                            alt="HMC Logo">
-                    </a>
-                    <a href="https://www.helmholtz-imaging.de/" class="btn btn-light btn-lg btn-logo">
-                        <img src="{% link assets/img/third-party-logos/hip-logo.png %}" alt="HIP Logo">
-                    </a>
-                    <a href="https://www.eosc-portal.eu/" class="btn btn-light btn-lg btn-logo">
-                        <img src="{% link assets/img/third-party-logos/eosc_logo.png %}" alt="EOSC Logo">
-                    </a>
-                    <a href="https://www.egi.eu/" class="btn btn-light btn-lg btn-logo">
-                        <img src="{% link assets/img/third-party-logos/egi-logo.svg %}" alt="EGI Logo">
-                    </a>
-                </div>
-            </section>
-        </div>
+        
    </main>

    {% include footer.html %}

--- a/_layouts/partners.html
+++ b/_layouts/partners.html
+{% include top.html %}
+
+<body>
+
+    {% include header.html %}
+
+    <main>
+
+
+        {% include title_image.html%}
+
+       
+        
+        <div class="frontpage-jumbotron">
+            <section>
+                <h1>Helmholtz Partners</h1>
+                <div class="flex-content-wrapper">
+                    
+                    <a href="https://www.helmholtz.de/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/2017_Helmholtz_Logo_RGB_untereinander_EN.png %}" alt="Helmholtz Logo">
+                    </a>
+
+                    <a href="https://www.helmholtz-hida.de/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/HiDA_Logo_RGB.svg %}" alt="HIDA Logo">
+                    </a>
+
+                    <a href="https://www.helmholtz.ai/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/csm_logo_helmholtz_ai_cf39d4dbfc.png %}"
+                            alt="Helmholtz AI Logo">
+                    </a>
+                    
+                    <a href="https://helmholtz-metadaten.de/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/HMC_Logo_updated_pfade-e1576839804647.png %}"
+                            alt="HMC Logo">
+                    </a>
+                    
+                    <a href="https://www.helmholtz-imaging.de/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/hip-logo.png %}" alt="HIP Logo">
+                    </a>
+                    
+                </div>
+                
+                <h1>International Partners</h1>
+                <div class="flex-content-wrapper">    
+                
+                    <a href="https://carpentries.org/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/TheCarpentries.svg %}" alt="Carpentries Logo">
+                    </a>                
+                    
+                    <a href="https://www.eosc-portal.eu/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/eosc_logo.png %}" alt="EOSC Logo">
+                    </a>
+                    
+                    <a href="https://www.egi.eu/" class="btn btn-light btn-lg btn-logo">
+                        <img src="{% link assets/img/third-party-logos/egi-logo.svg %}" alt="EGI Logo">
+                    </a>
+                    
+                </div>
+            </section>
+        </div>
+    </main>
+
+    {% include footer.html %}
+
+</body>
+
+</html>
--- a/assets/img/third-party-logos/2017_Helmholtz_Logo_RGB_untereinander_EN.png
+++ b/assets/img/third-party-logos/2017_Helmholtz_Logo_RGB_untereinander_EN.png
--- a/partners.md
+++ b/partners.md
+---
+title: HIFIS Partners
+title_image: default
+layout: partners
+additional_css:
+    - frontpage.css
+    - title/service-title-buttons.css
+additional_js: frontpage.js
+excerpt:
+    HIFIS Partners internationally and nationally.
+---
+