Merge branch 'dashboardv2'

widget_princessgabi/dashboard/static/dashboard/dashboard.css

+body {
+    height: 100vh;
+    background-color: #E9E3FE;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.dashboard-content {
+    margin-top: auto;
+    padding: 2rem;
+    border-radius: 0.5rem;
+    background-color: white
+}
\ No newline at end of file

widget_princessgabi/dashboard/templates/dashboard/widgetuser-add.html

@@ -2,28 +2,40 @@
 
 {% load static %}
 
+{% block stylesheets %}
+    <link rel = "stylesheet" type = "text/css" href = "{% static 'stylesheets/forms.css' %}">
+{% endblock %}
+
 {% block title %}Add Widget User{% endblock %}
 
-{% block content %}
-
-    {{ form.non_field_errors }}
-    {% for field in form %}
-        {% if field.errors %}
-            <p>{{ field.label }} has the following errors:</p>
-            <ul>
-            {% for error in field.errors %}
-                <li>{{ error }}</li>
-            {% endfor %}
-            </ul>
-        {% endif %}
-    {% endfor %}
-
-    <h1>Add a new Widget user:</h1>
-    
-    <form method = "POST">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <input type = "submit" value = "Add Widget User">
-    </form>
+{% block header %}
+    <h2>Add a new Widget user:</h2>
+{% endblock %}
+
+{% block body %}
+
+    {% block content %}
+
+        {{ form.non_field_errors }}
+        {% for field in form %}
+            {% if field.errors %}
+                <p>{{ field.label }} has the following errors:</p>
+                <ul>
+                {% for error in field.errors %}
+                    <li>{{ error }}</li>
+                {% endfor %}
+                </ul>
+            {% endif %}
+        {% endfor %}
+        
+        <div class = "form">
+            <form method = "POST">
+                {% csrf_token %}
+                {{ form.as_p }}
+                <input type = "submit" value = "Add Widget User">
+            </form>
+        </div>
+
+    {% endblock %}
 
 {% endblock %}
\ No newline at end of file

widget_princessgabi/dashboard/templates/dashboard/widgetuser-details.html

@@ -2,18 +2,31 @@
 
 {% load static %}
 
+{% block stylesheets %}
+    <link rel="stylesheet" type="text/css" href="{% static 'dashboard/dashboard.css' %}">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+{% endblock %}
+
 {% block title %} {{ object.last_name }}, {{ object.first_name }} {% endblock %}
 
-{% block content %}
+{% block body %}
+
+<div class = "dashboard-content">
+    {% block content %}
+
+    <div class = "details">
+        <h1>{{ object.first_name }} {{ object.middle_name }} {{ object.last_name }}</h1>
+
+        <h2> {{ object.department }} </h2>
+
+        <h2> {{ object.department.home_unit }} </h2>
 
-    <h1>{{ object.first_name }} {{ object.middle_name }} {{ object.last_name }}</h1>
+    </div>
 
-    <h2> {{ object.department }} </h2>
+    {% endblock %}
 
-    <h2> {{ object.department.home_unit }} </h2>
+    <a href="{{object.get_absolute_url}}../edit" class="edit-btn"><i class="fa fa-edit"></i>Edit Widget User</a>
 
-    <form action = "./edit">
-        <input type = "submit" value = "Edit Widget User">
-    </form>
+</div>
 
 {% endblock %}
\ No newline at end of file

widget_princessgabi/dashboard/templates/dashboard/widgetuser-edit.html

@@ -2,28 +2,40 @@
 
 {% load static %}
 
+{% block stylesheets %}
+    <link rel="stylesheet" type="text/css" href="{% static 'stylesheets/forms.css' %}">
+{% endblock %}
+
 {% block title %}Edit Widget User{% endblock %}
 
-{% block content %}
-
-    {{ form.non_field_errors }}
-    {% for field in form %}
-        {% if field.errors %}
-            <p>{{ field.label }} has the following errors:</p>
-            <ul>
-            {% for error in field.errors %}
-                <li>{{ error }}</li>
-            {% endfor %}
-            </ul>
-        {% endif %}
-    {% endfor %}
-
-    <h1>Edit Widget User:</h1>
-    
-    <form method = "POST">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <input type = "submit" value = "Save Changes to Widget User">
-    </form>
+{% block header %}
+    <h2>Edit Widget User:</h2>
+{% endblock %}  
+
+{% block body %}
+
+    {% block content %}
+
+        {{ form.non_field_errors }}
+        {% for field in form %}
+            {% if field.errors %}
+                <p>{{ field.label }} has the following errors:</p>
+                <ul>
+                {% for error in field.errors %}
+                    <li>{{ error }}</li>
+                {% endfor %}
+                </ul>
+            {% endif %}
+        {% endfor %}
+        
+        <div class = "form">
+            <form method = "POST">
+                {% csrf_token %}
+                {{ form.as_p }}
+                <input type = "submit" value = "Save Changes to Widget User">
+            </form>
+        </div>
+
+    {% endblock %}
 
 {% endblock %}
\ No newline at end of file