diff --git a/schoolapps/aub/templates/index.html b/schoolapps/aub/templates/index.html index c57e0a9c6819d6927653666a0b2b1241b78fc250..bf61e72a69b5d15d3aa9e0aeb67158f703e8a2bc 100644 --- a/schoolapps/aub/templates/index.html +++ b/schoolapps/aub/templates/index.html @@ -1,6 +1,7 @@ {% include 'partials/header.html' %} <main> <ul> + Hallo {% for todo in todos %} <li><a href='/todos/details/{{todo.id}}'>{{todo.title}}</a>: {{todo.text}}</li> {% endfor %} diff --git a/schoolapps/dashboard/templates/index.html b/schoolapps/dashboard/templates/index.html index f7bf8f066dfaec924b0434aeeac40f26895e333f..461bde7c7eeecb3dfff1b9d6a56bd287f7807a0f 100644 --- a/schoolapps/dashboard/templates/index.html +++ b/schoolapps/dashboard/templates/index.html @@ -12,7 +12,7 @@ <ul class="collection"> {% for activity in activities %} <li class="collection-item"> - <span class="badge new">{{ activity.app }}</span> + <span class="badge new primary-color">{{ activity.app }}</span> <span class="title">{{ activity.title }}</span> <p> <i class="material-icons left">access_time</i> {{ activity.created_at }} @@ -35,7 +35,7 @@ <ul class="collection"> {% for notification in notifications %} <li class="collection-item"> - <span class="badge new">{{ notification.app }}</span> + <span class="badge new primary-color">{{ notification.app }}</span> <span class="title">{{ notification.title }}</span> <p> <i class="material-icons left">access_time</i> {{ notification.created_at }} diff --git a/schoolapps/dashboard/urls.py b/schoolapps/dashboard/urls.py index 6e21aeb2a7e14eaf3c1ac1501e63e8b093568c25..2ce971e83b6de2d75e910b910bdf6349b7c6456f 100644 --- a/schoolapps/dashboard/urls.py +++ b/schoolapps/dashboard/urls.py @@ -2,5 +2,5 @@ from django.urls import path from . import views urlpatterns = [ - path('', views.index, name='index'), + path('', views.index, name='dashboard'), ] diff --git a/schoolapps/static/common/style.css b/schoolapps/static/common/style.css index 404c6a01bc52085a8a2fe1b7c685393b8ccfd05c..59cbb954fb6b8b8dd354e91c6816d0262faf7de4 100644 --- a/schoolapps/static/common/style.css +++ b/schoolapps/static/common/style.css @@ -9,11 +9,11 @@ body { } .primary-color { - background-color: #da1f3d; + background-color: #da1f3d !important; } .primary-color-text { - color: #da1f3d; + color: #da1f3d !important; } /**********/ @@ -81,5 +81,5 @@ ul.collection .collection-item .title { } span.badge.new::after { - content: "" !important; + content: ""; } diff --git a/schoolapps/templates/partials/header.html b/schoolapps/templates/partials/header.html index b0cb1478dbeb429c93c1898e25f7120538e0be41..4c64d352a252e5e9b54449b849cd5c0c669bece2 100644 --- a/schoolapps/templates/partials/header.html +++ b/schoolapps/templates/partials/header.html @@ -12,9 +12,9 @@ <!-- CSS --> <!---------> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> - <link rel="stylesheet" type="text/css" media="screen" href="{% static 'common/style.css' %}"> <link rel="stylesheet" type="text/css" media="screen" href="{% static 'materialize/dist/css/materialize.min.css' %}"> + <link rel="stylesheet" type="text/css" media="screen" href="{% static 'common/style.css' %}"> <!----------------> <!-- JavaScript --> @@ -46,8 +46,6 @@ {% if user.is_authenticated %} <li>Angemeldet als {{ user.get_username }}</li> <li><a href="{% url 'logout' %}">Abmelden</a></li> - {% else %} - <!--<li><a href="{% url 'login' %}?next={{ request.path }}">Anmelden</a></li>--> {% endif %} </ul> </div> @@ -61,7 +59,9 @@ </a> </li> - <li><a href="#">First Sidebar Link</a></li> - <li><a href="#">Second Sidebar Link</a></li> + {% if user.is_authenticated %} + <li><a href="{% url 'dashboard' %}">Dashboard</a></li> + <li><a href="{% url 'logout' %}">Abmelden</a></li> + {% endif %} </ul> </header> diff --git a/schoolapps/templates/registration/login.html b/schoolapps/templates/registration/login.html index 5f2fc06bc5d6b299c4e5eb86c533dc27efed9722..a4890ad9a7217951943cbe0afd13bd23c2c246b4 100644 --- a/schoolapps/templates/registration/login.html +++ b/schoolapps/templates/registration/login.html @@ -2,7 +2,8 @@ <main> {% if form.errors %} - <p class="flow-text red-text">Der Benutzername oder das Passwort ist falsch. Bitte probieren Sie es nochmal.</p> + <p class="flow-text red-text">Der Benutzername und/oder das Passwort ist falsch. Bitte probieren Sie es + nochmal.</p> {% endif %} {% if next %}