Merge content into main package

This commit is contained in:
Patrick Jentsch
2020-10-12 13:28:19 +02:00
parent 2dc630e877
commit ea6ccae76a
8 changed files with 30 additions and 66 deletions

View File

@ -1,25 +0,0 @@
{% extends "nopaque.html.j2" %}
{% block page_content %}
<div class="col s12">
<div class="card">
<div class="card-content">
<span class="card-title">Beta Launch of nopaque!</span>
<p>
Dear users
</p>
<br>
<p>
A few days ago we went live with nopaque. Right now nopaque is still in
its Beta phase. So some bugs are to be expected. If you encounter any
bugs or some feature is not working as expected please send as an email
using the feedback button at the botton of the page in the footer!
</p>
<p>We are happy to help you with any issues and will use the feedback to
fix all mentioned bugs!</p>
</div>
</div>
</div>
{% endblock %}

View File

@ -256,4 +256,4 @@
</ul>
</div>
{% endblock %}
{% endblock %}

View File

@ -0,0 +1,15 @@
{% extends "nopaque.html.j2" %}
{% block page_content %}
<div class="col s12">
<div class="card" id="beta-launch">
<div class="card-content">
<span class="card-title">nopaque's beta launch</span>
<p>Dear users</p>
<br>
<p>A few days ago we went live with nopaque. Right now nopaque is still in its Beta phase. So some bugs are to be expected. If you encounter any bugs or some feature is not working as expected please send as an email using the feedback button at the botton of the page in the footer!</p>
<p>We are happy to help you with any issues and will use the feedback to fix all mentioned bugs!</p>
</div>
</div>
</div>
{% endblock %}

View File

@ -147,9 +147,7 @@
<ul class="right">
{% if current_user.is_authenticated %}
<li>
<a id="nav-notifications"
class="dropdown-trigger no-autoinit"
href="#!" data-target="nav-notifications-dropdown">
<a id="nav-notifications" class="dropdown-trigger no-autoinit" href="{{ url_for('main.news') }}" data-target="nav-notifications-dropdown">
<span class="hide-on-small-only">News</span>
<i class="material-icons right">notifications</i>
</a>
@ -191,7 +189,7 @@
<!-- Dropdown menus for the navbar -->
<div id="nav-notifications-dropdown" class="dropdown-content">
<li>
<a href="{{ url_for('content.news_launch') }}"><i class="material-icons">error_outline</i>Beta Launch!</a>
<a href="{{ url_for('main.news', _anchor='beta-launch') }}"><i class="material-icons">error_outline</i>nopaque's beta launch</a>
</li>
</div>
<ul id="nav-account-dropdown" class="dropdown-content">
@ -286,7 +284,7 @@
<span>© 2020 Bielefeld University</span>
</div>
<div class="col s12 m9 right-align">
<a class="btn-small blue waves-effect waves-light" href="{{ url_for('content.about_faq') }}"><i class="left material-icons">info_outline</i>About/FAQ</a>
<a class="btn-small blue waves-effect waves-light" href="{{ url_for('main.about_and_faq') }}"><i class="left material-icons">info_outline</i>About and faq</a>
<a class="btn-small pink waves-effect waves-light" href="mailto:{{ config.NOPAQUE_CONTACT }}?subject={{ config.NOPAQUE_MAIL_SUBJECT_PREFIX }} Contact"><i class="left material-icons">rate_review</i>Contact</a>
<a class="btn-small green waves-effect waves-light" href="mailto:{{ config.NOPAQUE_CONTACT }}?subject={{ config.NOPAQUE_MAIL_SUBJECT_PREFIX }} Feedback"><i class="left material-icons">feedback</i>Feedback</a>
<a class="btn-small orange waves-effect waves-light" href="https://gitlab.ub.uni-bielefeld.de/sfb1288inf/opaque"><i class="left material-icons">code</i>GitLab</a>