Split about into about and contact

open-plan-tool · Nov 1, 2024 · 0ee92d5 · 0ee92d5
1 parent 9da8c1e
commit 0ee92d5
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 10 deletions.
diff --git a/app/epa/urls.py b/app/epa/urls.py
@@ -18,7 +18,7 @@
 from django.urls import path, re_path, include
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
-from .views import imprint, privacy, about, license
+from .views import imprint, privacy, about, license, contact
 
 urlpatterns = (
     i18n_patterns(
@@ -30,6 +30,7 @@
         path("imprint/", imprint, name="imprint"),
         path("privacy/", privacy, name="privacy"),
         path("about/", about, name="about"),
+        path("contact/", contact, name="contact"),
         path("license/", license, name="license"),
     )
     + [re_path(r"^i18n/", include("django.conf.urls.i18n"))]

diff --git a/app/epa/views.py b/app/epa/views.py
@@ -21,6 +21,11 @@ def about(request):
     return render(request, "legal/about.html")
 
 
+@require_http_methods(["GET"])
+def contact(request):
+    return render(request, "legal/contact.html")
+
+
 @require_http_methods(["GET"])
 def license(request):
     return render(request, "legal/license.html")
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -86,7 +86,8 @@
         </div>
         <div class="footer__links">
             <ul>
-                <li><a href="{% url 'about' %}">{% translate "Contact" %}</a></li>
+							  <li><a href="{% url 'about' %}">{% translate "About" %}</a></li>
+                <li><a href="{% url 'contact' %}">{% translate "Contact" %}</a></li>
                 <li><a href="{% url 'license' %}">{% translate "License" %}</a></li>
                 <li><a href="{% url 'imprint' %}">{% translate "Imprint" %}</a></li>
                 <li><a href="{% url 'privacy' %}">{% translate "Privacy" %}</a></li>

diff --git a/app/templates/legal/about.html b/app/templates/legal/about.html
@@ -1,30 +1,68 @@
 {% extends 'base.html' %}
+{% load static %}
 {% load i18n %}
 
 
-{% block title %} {% translate "About - open_plan" %} {% endblock title%}
+{% block head_block %}
+	<link rel="stylesheet" href="{% static 'css/landing.css' %}">
+{% endblock head_block %}
+
+{% block title %} {% translate "About us - open_plan" %} {% endblock title%}
 
 <!-- WRITE HTML CODE WITHIN THESE block content TAGS -->
 {% block content %}
+
+	{% get_current_language as LANGUAGE_NAME %}
+
 <main>
 	<section class="header">
 		<div>
 			<div class="header__left"></div>
-			<h1 class="header__title">{% translate "About" %}</h1>
+			<h1 class="header__title">{% translate "About us" %}</h1>
 			<div class="header__back"></div>
 		</div>
 	</section>
 	<section class="standard-layout">
 		<div>
 			<div class="standard-layout__paragraph">
-				<h2>{% translate "open_plan project consortium" %}</h2>
-				{% blocktranslate with url_rli="https://reiner-lemoine-institut.de/" url_dgs="https://www.dgs-berlin.de" url_pik="https://www.pik-potsdam.de/de" %}
-				<p>The open_plan project consortium is composed of the <a href="{{url_rli}}" target="_blank" rel="noreferrer">Reiner Lemoine Institut</a> (RLI), <a href="{{url_dgs}}" target="_blank" rel="noreferrer">Deutsche Gesellschaft für Sonnenenergie</a> (DGS) and the <a href="{{url_pik}}" target="_blank" rel="noreferrer">Potsdam Institut für Klimafolgenforschung</a> (PIK). It is funded within the framework of the "Technology-oriented systems analysis" funding area of the BMWi's 7th Energy Research Programme "Innovation for the energy transition".</p>
+				<h2>{% translate "open_plan 2.0 project consortium" %}</h2>
+				{% blocktranslate with url_rli="https://reiner-lemoine-institut.de/" url_dgs="https://www.dgs-berlin.de" url_ifam="https://www.ifam.fraunhofer.de" url_pik="https://www.pik-potsdam.de/de" %}
+          <p>The open_plan 2.0 project consortium is composed of the <a href="{{url_rli}}" target="_blank" rel="noreferrer">Reiner Lemoine Institut</a> (RLI), <a href="{{url_dgs}}" target="_blank" rel="noreferrer">Deutsche Gesellschaft für Sonnenenergie</a> (DGS) and the <a href="{{url_ifam}}" target="_blank" rel="noreferrer">the Fraunhofer IFAM</a> (IFAM). It is funded within the framework of the "Technology-oriented systems analysis" funding area of the BMWK's ????th Energy Research Programme "?????".</p>
 				{% endblocktranslate %}
+				<div class="about__partners">
+				<div>
+					<a href="https://www.dgs.de/aktuell/" target="_blank" rel="noopener noreferrer">
+						<img src="{% static 'assets/logos/2020-03-09_DGS.png' %}" alt="Deutsche Gesellschaft für Sonnenenergie logo">
+					</a>
+				</div>
+				<div>
+					<a href="https://reiner-lemoine-institut.de/en/" target="_blank" rel="noopener noreferrer">
+						<img src="{% static 'assets/logos/rlilogo.png' %}" alt="Reiner Lemoine Institut logo">
+					</a>
+				</div>
+				<div>
+					<a href="https://www.ifam.fraunhofer.de" target="_blank" rel="noopener noreferrer">
+						<img src="{% static 'assets/logos/ifam_logo.png' %}" alt="Fraunhofer IFAM logo">
+					</a>
+				</div>
+			</div>
+			  <div class="about__support">
+				{% if "de" in LANGUAGE_NAME %}
+				<a href="https://www.bmwi.de/Navigation/DE/Home/home.html" target="_blank" rel="noopener noreferrer">
+					<img src="{% static 'assets/logos/BMWK_Fz_2017_WebSVG_de.svg' %}" alt="Federal Ministry for Economic Affairs and Energy logo">
+				</a>
+		    {% else %}
+				<a href="https://www.bmwi.de/Navigation/EN/Home/home.html" target="_blank" rel="noopener noreferrer">
+					<img src="{% static 'assets/logos/BMWK_Fz_2017_WebSVG_en.svg' %}" alt="Federal Ministry for Economic Affairs and Energy logo">
+				</a>
+				{% endif %}
+				</div>
 			</div>
 			<div class="standard-layout__paragraph">
-				<h2>{% translate "open_plan project website" %}</h2>
-				{% blocktranslate with url_op="https://open-plan-tool.org/" %}<p>You can visit the open_plan <a href="{{url_op}}" target="_blank" rel="noreferrer">website</a> to know more about the cellular approach and the open_plan project </p>{% endblocktranslate %}
+				<h2>{% translate "open_plan 1.0 project consortium" %}</h2>
+				{% blocktranslate with url_rli="https://reiner-lemoine-institut.de/" url_dgs="https://www.dgs-berlin.de" url_pik="https://www.pik-potsdam.de/de" %}
+				<p>The open_plan project consortium is composed of the <a href="{{url_rli}}" target="_blank" rel="noreferrer">Reiner Lemoine Institut</a> (RLI), <a href="{{url_dgs}}" target="_blank" rel="noreferrer">Deutsche Gesellschaft für Sonnenenergie</a> (DGS) and the <a href="{{url_pik}}" target="_blank" rel="noreferrer">Potsdam Institut für Klimafolgenforschung</a> (PIK). It is funded within the framework of the "Technology-oriented systems analysis" funding area of the BMWi's 7th Energy Research Programme "Innovation for the energy transition".</p>
+				{% endblocktranslate %}
 			</div>
 			<div class="standard-layout__paragraph standard-layout__paragraph--foreground">
 				<h2>{% translate "Feedback or question?" %}</h2>
@@ -34,7 +72,7 @@ <h2>{% translate "Feedback or question?" %}</h2>
 				<p>You can always <a href="{{url_feedback}}">leave us a comment or feedback</a> on things you would improve. You can also visit <a href="{{url_github}}" target="_blank" rel="noreferrer">our github project page</a> to see which bugs are being fixed and which new features are being developed.</p>
 				{% endblocktranslate %}
 				{% blocktranslate %}
-				<p>If you wish to sponsor a new feature of open-plan-tool, please visit our <a href="{{url_sponsor}}" target="_blank" rel="noreferrer">sponsoring page<a></p>
+				<p>If you wish to sponsor a new feature of open-plan-tool, please visit our <a href="{{url_sponsor}}" target="_blank" rel="noreferrer">sponsoring page</a></p>
 				{% endblocktranslate %}
 			</div>
 			<div class="standard-layout__paragraph standard-layout__paragraph--small">
@@ -57,6 +95,10 @@ <h2>{% translate "This webapp design" %}</h2>
 				<p>{% translate "Bryan Lancien from " %} <a href="https://bryanlancien-ui.com/about.html" target="_blank" rel="noreferrer">bryanlancien-ui</a></p>
 			</div>
 		</div>
+
+
+
+
 	</section>
 </main>
 {% endblock content %}

diff --git a/app/templates/legal/contact.html b/app/templates/legal/contact.html
@@ -0,0 +1,53 @@
+{% extends 'base.html' %}
+{% load static %}
+{% load i18n %}
+
+
+{% block head_block %}
+	<link rel="stylesheet" href="{% static 'css/landing.css' %}">
+{% endblock head_block %}
+
+{% block title %} {% translate "Contact - open_plan" %} {% endblock title%}
+
+<!-- WRITE HTML CODE WITHIN THESE block content TAGS -->
+{% block content %}
+
+	{% get_current_language as LANGUAGE_NAME %}
+
+<main>
+	<section class="header">
+		<div>
+			<div class="header__left"></div>
+			<h1 class="header__title">{% translate "Contact" %}</h1>
+			<div class="header__back"></div>
+		</div>
+	</section>
+	<section class="standard-layout">
+		<div>
+			{% if user.is_authenticated %}
+			<div class="standard-layout__paragraph">
+				<h2>{% translate "Contact us" %}</h2>
+				<p>{% translate "You can contact us by email at open_plan at rl-institut.de. Note that this information is only visible if you are logged in." %}</p>
+			</div>
+			{% endif %}
+			<div class="standard-layout__paragraph standard-layout__paragraph--foreground">
+				<h2>{% translate "Feedback or question?" %}</h2>
+				{% url 'user_feedback' as url_feedback %}
+				{% url 'sponsor_feature' as url_sponsor %}
+				{% blocktranslate with url_github="https://github.com/orgs/open-plan-tool/projects/5" %}
+				<p>You can always <a href="{{url_feedback}}">leave us a comment or feedback</a> on things you would improve. You can also visit <a href="{{url_github}}" target="_blank" rel="noreferrer">our github project page</a> to see which bugs are being fixed and which new features are being developed.</p>
+				{% endblocktranslate %}
+				{% blocktranslate %}
+				<p>If you wish to sponsor a new feature of open-plan-tool, please visit our <a href="{{url_sponsor}}" target="_blank" rel="noreferrer">sponsoring page</a></p>
+				{% endblocktranslate %}
+			</div>
+
+		</div>
+
+
+
+
+	</section>
+</main>
+{% endblock content %}
+