Merge branch 'potaris' of github.com:FAUSheppy/flask-json-dream-website into potaris

This commit is contained in:
Yannik Schmidt
2021-06-30 17:11:57 +02:00
4 changed files with 87 additions and 12 deletions

View File

@@ -60,7 +60,13 @@
</div> </div>
</form> </form>
<div class="text-center text-md-left mt-4"> <div class="text-center text-md-left mt-4">
<a class="btn btn-light w-50" onclick="submitContactForm()">Absenden</a> <a class="btn btn-light w-50" onclick="submitContactForm()">
{% if conf["LANGUAGE"] == "en" %}
Send
{% else %}
Absenden
{% endif %}
</a>
</div> </div>
<div class="status"></div> <div class="status"></div>
</div> </div>
@@ -68,10 +74,20 @@
<div class="border p-3 col-md-3 text-center bg-special"> <div class="border p-3 col-md-3 text-center bg-special">
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<li><i class="fas fa-envelope mt-4 fa-2x"></i> <li><i class="fas fa-envelope mt-4 fa-2x"></i>
<p>Wir freuen uns auf Ihre Nachricht!</p> <p>
{% if conf["LANGUAGE"] == "en" %}
We are excited to learn about your project!
{% else %}
Wir freuen uns auf Ihre Nachricht!
{% endif %}
</p>
{% if conf['CONTACT_EMAIL'] %} {% if conf['CONTACT_EMAIL'] %}
<hr> <hr>
{% if conf["LANGUAGE"] == "en" %}
You may also contact us directly via E-mail.
{% else %}
<p>Natürlich können Sie uns auch direkt per Mail kontaktieren.</p></br> <p>Natürlich können Sie uns auch direkt per Mail kontaktieren.</p></br>
{% endif %}
<a type="button" class="btn btn-light p-3 w-100" <a type="button" class="btn btn-light p-3 w-100"
href="mailto:{{ conf['CONTACT_EMAIL'] }}">{{ conf['CONTACT_EMAIL'] }}</a> href="mailto:{{ conf['CONTACT_EMAIL'] }}">{{ conf['CONTACT_EMAIL'] }}</a>
{% endif %} {% endif %}

View File

@@ -2,7 +2,23 @@
{% if conf["IMPRESSUM_IS_CONTACT"] %} {% if conf["IMPRESSUM_IS_CONTACT"] %}
<a style="color: rgba(255,255,255,.5);" href="/impressum">Impressum/Kontakt</a> <a style="color: rgba(255,255,255,.5);" href="/impressum">Impressum/Kontakt</a>
{% else %} {% else %}
<a class="mr-2" style="color: rgba(255,255,255,.5);" href="/impressum">Impressum</a> {% if conf["LANGUAGE"] == "en" %}
<a class="ml-2" style="color: rgba(255,255,255,.5);" href="/contact">Kontakt</a> <a class="mr-2" style="color: rgba(255,255,255,.5);" href="/en/impressum">
Legal
</a>
{% else %}
<a class="mr-2" style="color: rgba(255,255,255,.5);" href="/impressum">
Impressum
</a>
{% endif %}
{% if conf["LANGUAGE"] == "en" %}
<a class="ml-2" style="color: rgba(255,255,255,.5);" href="/en/contact">
Contact
</a>
{% else %}
<a class="ml-2" style="color: rgba(255,255,255,.5);" href="/contact">
Kontakt
</a>
{% endif %}
{% endif %} {% endif %}
</div> </div>

View File

@@ -12,25 +12,60 @@
{% endif %} {% endif %}
</head> </head>
<body id="main_scrollable"> <body id="main_scrollable"
>
<!-- NAVBAR --> <!-- NAVBAR -->
{% include 'navbar.html' %} {% include 'navbar.html' %}
<!-- Site wellcome header --> <!-- Site wellcome header style="background-color: #312a2a;" -->
<header class="masthead {% if conf['NO_CENTER_TITLE'] %} h-50 {% endif %}" <!--
style="background-color: #312a2a;" <header class="masthead {% if conf['NO_CENTER_TITLE'] %} {% endif %}"
{% if conf['WALLPAPER_URL'] %} realsrc='{{ conf["WALLPAPER_URL"] }}' {% endif %}> {% if conf['WALLPAPER_URL'] %} realsrc='{{ conf["WALLPAPER_URL"] }}' {% endif %}
style="background-image: url('{{ conf["WALLPAPER_URL"] }}');">
-->
<div id="carouselIndicators" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#carouselIndicators" data-slide-to="0" class="active"></li>
<li data-target="#carouselIndicators" data-slide-to="1"></li>
<li data-target="#carouselIndicators" data-slide-to="2"></li>
</ol>
<div class="carousel-inner">
{% for (url, alt, title, subtitle) in conf["WALLPAPER_REEL"] %}
<div class="carousel-item {% if loop.first %} active {% endif %}">
<img class="d-block w-100" src="{{ url }}" alt="{{ alt }}">
<div class="carousel-caption d-none d-md-block">
<h2>{{ title }}</h2>
<p>{{ subtitle }}</p>
</div>
</div>
{% endfor %}
</div>
<a class="carousel-control-prev" href="#carouselIndicators" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselIndicators" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
<!--
<div class="{% if conf['NO_CENTER_TITLE'] %} pb-4 pl-2 pr-2 {% else %} container {% endif %} <div class="{% if conf['NO_CENTER_TITLE'] %} pb-4 pl-2 pr-2 {% else %} container {% endif %}
{% if conf['WALLPAPER_URL'] %} h-50 {% endif %}"> {% if conf['WALLPAPER_URL'] %} h-50 {% endif %}">
<div class="row h-100 align-items-center"> <div class="row h-100 align-items-center">
<div class="col-12 {% if not conf['NO_CENTER_TITLE'] %} text-center {% endif %}"> <div class="col-12 {% if not conf['NO_CENTER_TITLE'] %} text-center {% endif %}">
<div style="opacity: 0;"></div> <!-- TODO color for text configurable --> <div style="opacity: 0;"></div>
{% if "SITE_WELLCOME_TITLE" in conf %} <h1 class="pt-4 font-weight-light" style="{{ conf['SITE_WELLCOME_TITLE_CSS'] | safe }}">{{ conf["SITE_WELLCOME_TITLE"] | safe }}</h1> {% endif %} {% if "SITE_WELLCOME_TITLE" in conf %} <h1 class="pt-4 font-weight-light" style="{{ conf['SITE_WELLCOME_TITLE_CSS'] | safe }}">{{ conf["SITE_WELLCOME_TITLE"] | safe }}</h1> {% endif %}
{% if "SITE_WELLCOME_SUBTITLE" in conf %} <p class="pt-4 title-responsive font-weight-light" style="{{ conf['SITE_WELLCOME_TITLE_CSS'] | safe }}">{{ conf["SITE_WELLCOME_SUBTITLE"] | safe }}</p> {% endif %} {% if "SITE_WELLCOME_SUBTITLE" in conf %} <p class="pt-4 title-responsive font-weight-light" style="{{ conf['SITE_WELLCOME_TITLE_CSS'] | safe }}">{{ conf["SITE_WELLCOME_SUBTITLE"] | safe }}</p> {% endif %}
</div> </div>
</div> </div>
</div> </div>
</header> </header>
-->
<!-- events --> <!-- events -->
{% include 'events.html' %} {% include 'events.html' %}
@@ -114,14 +149,18 @@
</div> </div>
{% endif %} {% endif %}
<div style="background: rgb(49,42,42);"> <!--
<div>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 70 500 80"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 70 500 80">
<path fill="#6c757d"d="M-19.19,103.90 C244.35,159.17 290.06,-2.67 507.90,124.63 L500.00,150.00 L-9.03,192.72 Z"> <path fill="#6c757d"d="M-19.19,103.90 C244.35,159.17 290.06,-2.67 507.90,124.63 L500.00,150.00 L-9.03,192.72 Z">
</path> </path>
</svg> </svg>
</div> </div>
-->
{% for section in sections %} {% for section in sections %}
<div class="{% if loop.index %2 == 1 %} bg-secondary {% else %} bg-dark {% endif %} pt-2 pb-4"> <div {% if "id" in section %} id="{{ section['id'] }}" {% endif %}
class="{% if loop.index %2 == 1 %} bg-secondary {% else %} bg-dark {% endif %} pt-2 pb-4">
<div class="container text-color-special"> <div class="container text-color-special">
<div class="row" {% if loop.index %2 == 1 %} style="flex-direction: row-reverse;" {% endif %}> <div class="row" {% if loop.index %2 == 1 %} style="flex-direction: row-reverse;" {% endif %}>
<div class="mt-3 col image-min-dimensions"> <div class="mt-3 col image-min-dimensions">

View File

@@ -12,7 +12,11 @@
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item"> <li class="nav-item">
{% if conf["LANGUAGE"] == "en" %}
<a class="nav-link" href="/en/">Potaris</a>
{% else %}
<a class="nav-link" href="/">Home</a> <a class="nav-link" href="/">Home</a>
{% endif %}
</li> </li>
{% for ndl in conf["NAVBAR_DROPDOWN_LINKS"] %} {% for ndl in conf["NAVBAR_DROPDOWN_LINKS"] %}