Skip to content
Permalink
Browse files

Merge branch 'issue/405' into develop

  • Loading branch information...
lukasjuhrich committed Aug 22, 2019
2 parents f173681 + cca654b commit 1903ba8be156a772c6df8a7f363d4dba85272a05
@@ -1,6 +1,6 @@
flask~=1.1.1
Flask-Login~=0.4.0
Babel~=2.5.1
Babel~=2.7.0
Flask-Babel~=0.11.2
Flask-Script~=2.0.3
SQLAlchemy~=1.3.7
@@ -52,9 +52,7 @@ body {

#logo {
margin-top: -5px;
background-image: url(../img/logo_hover.png);
opacity: 0.5;
background-size: 32px;
width: 32px;
height: 32px;
}
@@ -23,7 +23,7 @@
{%- endif %}
{%- endmacro -%}
<!DOCTYPE html>
<html lang="{{ get_locale().language }}" xmlns="http://www.w3.org/1999/html">
<html lang="{{ get_locale().language }}">

<!--
___ ______ ____ _____ _ __
@@ -63,7 +63,7 @@
</head>

<body>
<nav id="main-navbar" class="navbar navbar-default navbar-fixed-top" role="navigation">
<nav id="main-navbar" class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar">
@@ -74,15 +74,15 @@
</button>

<a class="navbar-brand" href="{{ url_for('generic.index') }}">
<div id="logo"></div>
<img id="logo" src="{{ url_for('static', filename='img/logo_hover.png') }}" alt="AG DSN" />
</a>
<a class="navbar-brand visible-xs" href="{{ url_for('generic.index') }}">
AG DSN
</a>
</div>

<div class="collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav" role="menu">
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">
{{ _("News") }}<span class="caret"></span>
@@ -142,8 +142,9 @@

<ul id="navbar-right-dropdown" class="nav navbar-nav navbar-right visible-md-block visible-sm-block">
<li>
<button id="language-dropdown-button" type="button" class="btn btn-default navbar-btn" data-toggle="dropdown">
<span class="glyphicon glyphicon glyphicon-cog"></span>
<button id="language-dropdown-button" type="button" class="btn btn-default navbar-btn"
data-toggle="dropdown" aria-label="Toggle Menu">
<span class="glyphicon glyphicon glyphicon-cog" aria-hidden="true"></span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="language-dropdown-button">
<li class="dropdown-header">{{ _("Anmeldung") }}</li>
@@ -158,8 +159,9 @@
class="active"
{%- endif %}>
<a href="{{ url_self(locale=locale.language) }}">
<img src="{{ url_for('static', filename='img/{}.png'.format(locale.language)) }}" />
{{locale.display_name}}
<img src="{{ url_for('static', filename='img/{}.png'.format(locale.language)) }}"
alt="{{ locale.display_name }}" />
{{ locale.display_name }}
</a>
</li>
{% endfor %}
@@ -176,15 +178,17 @@

<li>
<a href="#" data-toggle="dropdown" class="dropdown-toggle">
<img src="{{ url_for('static', filename='img/{}.png'.format(get_locale().language)) }}" />
<img src="{{ url_for('static', filename='img/{}.png'.format(get_locale().language)) }}"
alt="{{ get_locale().display_name }}" />
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
{% for locale in possible_locales() %}
<li>
<a href="{{ url_self(locale=locale.language) }}">
<img src="{{ url_for('static', filename='img/{}.png'.format(locale.language)) }}" />
{{locale.display_name}}
<img src="{{ url_for('static', filename='img/{}.png'.format(locale.language)) }}"
alt="{{ locale.display_name }}" />
{{ locale.display_name }}
</a>
</li>
{% endfor %}
@@ -205,7 +209,7 @@ <h1>AG DSN</h1>

<div id="center" class="container">
<div class="row">
<div class="col-sm-9">
<main class="col-sm-9">
{%- with messages = get_flashed_messages(with_categories=True) -%}
{%- if messages -%}
{% for cat, msg in messages %}
@@ -224,7 +228,7 @@ <h1>AG DSN</h1>

{% block content %}
{% endblock %}
</div>
</main>

<div id="sidebar" class="col-sm-3">
{% block sidebar %}
@@ -323,20 +327,23 @@ <h2>{{ _("Kontakt") }} </h2>
<div class ="row">
<div class ="col-xs-4 text-center">
<a class="btn btn-social-icon btn-twitter"
href="https://twitter.com/ag_dsn">
<span class="fa fa-twitter"></span>
href="https://twitter.com/ag_dsn"
aria-label="Twitter">
<span class="fa fa-twitter" aria-hidden="true"></span>
</a>
</div>
<div class ="col-xs-4 text-center">
<a class="btn btn-social-icon btn-facebook"
href="https://www.facebook.com/DresdnerStudentenNetz">
<span class="fa fa-facebook"></span>
href="https://www.facebook.com/DresdnerStudentenNetz"
aria-label="Facebook">
<span class="fa fa-facebook" aria-hidden="true"></span>
</a>
</div>
<div class="col-xs-4 text-center">
<a class="btn btn-social-icon btn-github"
href="https://github.com/agdsn/sipa">
<span class="fa fa-github"></span>
href="https://github.com/agdsn/sipa"
aria-label="Github">
<span class="fa fa-github" aria-hidden="true"></span>
</a>
</div>
</div>
@@ -369,10 +376,10 @@ <h2>{{ _("Kontakt") }} </h2>
</div>
</footer>

<script type="text/javascript" src="{{ url_for("static", filename="js/jquery-2.1.1.min.js") }}"></script>
<script type="text/javascript" src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
<script type="text/javascript" src="{{ url_for("static", filename="js/raphael.2.1.0.min.js") }}"></script>
<script type="text/javascript" src="{{ url_for("static", filename="js/agdsn.js") }}"></script>
<script src="{{ url_for("static", filename="js/jquery-2.1.1.min.js") }}"></script>
<script src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
<script src="{{ url_for("static", filename="js/raphael.2.1.0.min.js") }}"></script>
<script src="{{ url_for("static", filename="js/agdsn.js") }}"></script>
{% block custom_script %}{% endblock %}
</body>
</html>
@@ -19,9 +19,9 @@
</label></div>
</div>
{% elif field.type == "RadioField" %}
<label class="{{ form_label_width_class }} control-label">
<div class="{{ form_label_width_class }} control-label">
{{ field.label() }}
</label>
</div>
<div class="{{ form_input_width_class }}">
{% for subfield in field %}
<div class="radio"><label>
@@ -31,9 +31,9 @@
{% endfor %}
</div>
{% elif field.type != "HiddenField" %}
<label class="{{ form_label_width_class }} control-label">
<div class="{{ form_label_width_class }} control-label">
{{ field.label() }}
</label>
</div>
<div class="{{ form_input_width_class }}">
{{ render_field(field, focus=focus) }}
</div>
@@ -51,19 +51,22 @@ <h2 id="status-information">{{ _("Statusinformationen") }}</h2>
{{ property.value }}

{% if property.capabilities.edit and property.empty %}
<a href="{{ url_for(get_attribute_endpoint(property.name)) }}">
<a href="{{ url_for(get_attribute_endpoint(property.name)) }}"
aria-label="{{ _("Hinzufügen") }}">
<span class="glyphicon glyphicon-plus pull-right"></span>
</a>
{% endif %}

{% if property.capabilities.edit and not property.empty %}
<a href="{{ url_for(get_attribute_endpoint(property.name)) }}">
<a href="{{ url_for(get_attribute_endpoint(property.name)) }}"
aria-label="{{ _("Bearbeiten") }}">
<span class="glyphicon glyphicon-pencil pull-right"></span>
</a>
{% endif %}

{% if property.capabilities.delete and not property.empty %}
<a href="{{ url_for(get_attribute_endpoint(property.name, capability='delete')) }}">
<a href="{{ url_for(get_attribute_endpoint(property.name, capability='delete')) }}"
aria-label="{{ _("Löschen") }}">
<span class="glyphicon glyphicon-remove pull-right"></span>
</a>
{% endif %}
@@ -1,9 +1,10 @@
<h2 id="payment-details">{{ _("Zahlungsdetails") }}</h2>
<form action="#payment-details" method="post" class="form-inline">
<form action="#payment-details" method="post" class="form-inline"
aria-label="{{ _("Monate der Beitragszahlung angeben") }}">
{{ payment_form.csrf_token }}
{{ _("Beitrag für") }}
<div class="input-group">
{{ payment_form.months(class_="form-control", size="2") }}
{{ payment_form.months(class_="form-control", size="2", **{'aria-label': _("Monate")}) }}
<span class="input-group-btn">
<button type="submit" class="btn btn-default">{{ _("Aktualisieren") }}</button>
</span>
@@ -24,7 +25,7 @@ <h2 id="payment-details">{{ _("Zahlungsdetails") }}</h2>
<td class="col-md-3">{{ _("GiroCode") }}<br>
<i>{{ _("Nutze den GiroCode, um die Überweisungsdaten automatisch in deine Banking-App zu übernehmen.") }}</i>
</td>
<td class="col-md-3"><img src="{{ qrcode(girocode, box_size=6) }}"></td>
<td class="col-md-3"><img src="{{ qrcode(girocode, box_size=6) }}" alt="{{ girocode }}"></td>
</tr>
</tbody>
</table>
Binary file not shown.
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2019-05-10 01:31+0200\n"
"POT-Creation-Date: 2019-08-22 21:57+0200\n"
"PO-Revision-Date: 2014-08-01 19:22+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.6.0\n"
"Generated-By: Babel 2.7.0\n"

msgid "Kleinbuchstaben (a-z)"
msgstr ""
@@ -592,9 +592,21 @@ msgstr ""
msgid "Statusinformationen"
msgstr ""

msgid "Hinzufügen"
msgstr ""

msgid "Bearbeiten"
msgstr ""

msgid "Löschen"
msgstr ""

msgid "Zahlungsdetails"
msgstr ""

msgid "Monate der Beitragszahlung angeben"
msgstr ""

msgid "Beitrag für"
msgstr ""

@@ -1416,3 +1428,4 @@ msgstr ""

#~ msgid "Fehler bei der Abfrage der Daten"
#~ msgstr ""

Binary file not shown.
@@ -7,18 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: Sipa\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2019-05-10 01:31+0200\n"
"PO-Revision-Date: 2019-05-10 01:31+0200\n"
"POT-Creation-Date: 2019-08-22 21:57+0200\n"
"PO-Revision-Date: 2019-08-22 21:58+0200\n"
"Last-Translator: Lukas Juhrich <lukasjuhrich@wh2.tu-dresden.de>\n"
"Language: en\n"
"Language-Team: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.6.0\n"
"Generated-By: Babel 2.7.0\n"
"X-Source-Language: de\n"
"X-Generator: Poedit 2.0.6\n"
"X-Generator: Poedit 2.2.1\n"

msgid "Kleinbuchstaben (a-z)"
msgstr "lower case letters (a-z)"
@@ -605,9 +605,21 @@ msgstr "Webmailer"
msgid "Statusinformationen"
msgstr "Status information"

msgid "Hinzufügen"
msgstr "Add"

msgid "Bearbeiten"
msgstr "Edit"

msgid "Löschen"
msgstr "Delete"

msgid "Zahlungsdetails"
msgstr "Payment details"

msgid "Monate der Beitragszahlung angeben"
msgstr "State months of payment duration"

msgid "Beitrag für"
msgstr "Pay membership contribution for"

0 comments on commit 1903ba8

Please sign in to comment.
You can’t perform that action at this time.