Skip to content
Snippets Groups Projects
Verified Commit 6e814540 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' of edugit.org:Teckids/BiscuIT/BiscuIT-ng

parents 12e1a8fe 7f469364
Branches 616-docs-document-dashboard-and-dashboard-widgets
No related tags found
No related merge requests found
Showing
with 46 additions and 26 deletions
Subproject commit 701cc3108f0c4259fc76977dcf581dc5d5060ef9
Subproject commit 83e8e3bc2075a32d68f8aea43004f2e4b92bab17
Subproject commit 11037e72061e7b1db236214f4ff0e54d9ef681d7
Subproject commit 6f3798171e820f50693d8ca3e02a8732ea7d4a39
Subproject commit 25893e2f0fc8d93597657bb9c0b93736bd1adb2b
Subproject commit e39a5d4f7463f9d88b4bc65c5e6b2cdffa245dde
Subproject commit df1d137b8f9fe59d674cea903d49add90d70173a
Subproject commit 552c8f42d8010d4bc2d4b46bd60bf572e4a60bc9
Subproject commit 60f18334278fc3b9aa1e66d710561e62fc16b2e3
Subproject commit 111a8f9499893c009b8b2ae053f48838fef3dcbf
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:11+0200\n"
"POT-Creation-Date: 2019-09-17 15:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -43,7 +43,7 @@ msgstr ""
msgid "Stop impersonation"
msgstr ""
#: menus.py:16
#: menus.py:16 templates/registration/login.html:21
msgid "Login"
msgstr ""
......@@ -305,6 +305,10 @@ msgid ""
" "
msgstr ""
#: templates/contact_form/contact_form.html:14
msgid "Send"
msgstr ""
#: templates/contact_form/contact_form_sent.html:9
msgid ""
"\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BiscuIT - School Information System (SIS)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:11+0200\n"
"POT-Creation-Date: 2019-09-17 15:43+0200\n"
"PO-Revision-Date: 2019-09-15 13:40+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
......@@ -45,7 +45,7 @@ msgstr "Konto"
msgid "Stop impersonation"
msgstr "Verkleidung beenden"
#: menus.py:16
#: menus.py:16 templates/registration/login.html:21
msgid "Login"
msgstr "Anmelden"
......@@ -329,6 +329,10 @@ msgstr ""
"erneut.\n"
" "
#: templates/contact_form/contact_form.html:14
msgid "Send"
msgstr ""
#: templates/contact_form/contact_form_sent.html:9
msgid ""
"\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:11+0200\n"
"POT-Creation-Date: 2019-09-17 15:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -42,7 +42,7 @@ msgstr ""
msgid "Stop impersonation"
msgstr ""
#: menus.py:16
#: menus.py:16 templates/registration/login.html:21
msgid "Login"
msgstr ""
......@@ -304,6 +304,10 @@ msgid ""
" "
msgstr ""
#: templates/contact_form/contact_form.html:14
msgid "Send"
msgstr ""
#: templates/contact_form/contact_form_sent.html:9
msgid ""
"\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:11+0200\n"
"POT-Creation-Date: 2019-09-17 15:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -41,7 +41,7 @@ msgstr ""
msgid "Stop impersonation"
msgstr ""
#: menus.py:16
#: menus.py:16 templates/registration/login.html:21
msgid "Login"
msgstr ""
......@@ -303,6 +303,10 @@ msgid ""
" "
msgstr ""
#: templates/contact_form/contact_form.html:14
msgid "Send"
msgstr ""
#: templates/contact_form/contact_form_sent.html:9
msgid ""
"\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-15 14:11+0200\n"
"POT-Creation-Date: 2019-09-17 15:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -41,7 +41,7 @@ msgstr ""
msgid "Stop impersonation"
msgstr ""
#: menus.py:16
#: menus.py:16 templates/registration/login.html:21
msgid "Login"
msgstr ""
......@@ -303,6 +303,10 @@ msgid ""
" "
msgstr ""
#: templates/contact_form/contact_form.html:14
msgid "Send"
msgstr ""
#: templates/contact_form/contact_form_sent.html:9
msgid ""
"\n"
......
......@@ -10,7 +10,7 @@
<form method="post">
{% csrf_token %}
{% bootstrap_form form %}
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Send{% endblocktrans %}
</button>
</form>
......
......@@ -12,7 +12,7 @@
<form method="post">
{% csrf_token %}
{% bootstrap_form edit_group_form %}
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Edit{% endblocktrans %}
</button>
</form>
......
......@@ -18,7 +18,7 @@
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
{% bootstrap_form edit_person_form %}
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Edit{% endblocktrans %}
</button>
</form>
......
......@@ -18,7 +18,7 @@
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
{% bootstrap_form edit_school_form %}
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Edit{% endblocktrans %}
</button>
</form>
......
......@@ -18,7 +18,7 @@
<form method="post">
{% csrf_token %}
{% bootstrap_form edit_term_form %}
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Edit{% endblocktrans %}
</button>
</form>
......
......@@ -11,7 +11,7 @@
{% block content %}
<div class="btn-group" role="group" aria-lable="Group actions">
<a href="{% url 'create_group' %}" class="btn btn-secondary">
<a href="{% url 'create_group' %}" class="btn btn-dark">
{% fa 'plus' %}
</a>
</div>
......
......@@ -45,7 +45,7 @@
{% endfor %}
</table>
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Update{% endblocktrans %}
</button>
</form>
......
......@@ -11,10 +11,10 @@
<h2>{{ current_head }}</h2>
</div>
<div class="btn-group" role="group" aria-label="URL actions">
<a href="{{ url_prev }}" class="btn btn-secondary">
<a href="{{ url_prev }}" class="btn btn-dark">
{% fa 'arrow-left' %}
</a>
<a href="{{ url_next }}" class="btn btn-secondary">
<a href="{{ url_next }}" class="btn btn-dark">
{% fa 'arrow-right' %}
</a>
</div>
......
......@@ -17,10 +17,10 @@
<form method="post" action="{% url 'login' %}">
{% csrf_token %}
{% bootstrap_form form %}
<button type="submit" class="btn btn-secondary">
<button type="submit" class="btn btn-dark">
{% blocktrans %}Login{% endblocktrans %}
</button>
<button type="hidden" class="btn btn-secondary">
<button type="hidden" class="btn btn-dark">
{{ next }}
</button>
</form>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment