Change menu

schoolapps/aub/templates/index.html

 {% 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 %}

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 }}

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'),
 ]

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: "";
 }

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>

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 %}