Skip to content

M
midterm_vincentdjango
Commit 7c70087e authored by Almira Redoble's avatar Almira Redoble
Browse files
Options

After resolving conflict within group, implemented project-level template... 

After resolving conflict within group, implemented project-level template base.html. Started to adapt dashboard templates to new base.html.
parent 4aa2dfa5
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 3 deletions
widget_vincentdjango/dashboard/forms.py
View file @ 7c70087e
...@@ -12,6 +12,9 @@ class UserForm(forms.ModelForm): ...@@ -12,6 +12,9 @@ class UserForm(forms.ModelForm):
model = WidgetUser model = WidgetUser
fields = '__all__' fields = '__all__'
labels = { labels = {
'first_name': ('First Name'),
'middle_name': ('Middle Name'),
'last_name': ('Last Name'),
'department': ('Department, Home Unit'), 'department': ('Department, Home Unit'),
} }
\ No newline at end of file
widget_vincentdjango/dashboard/static/dashboard/style.css 0 → 100644
View file @ 7c70087e
body {
background-color:rgb(167, 36, 75)
}
\ No newline at end of file
widget_vincentdjango/dashboard/templates/dashboard/dashboard.html
View file @ 7c70087e
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block style %}{% static 'dashboard/style.css' %}{% endblock %}
{% block title %}Widget v2{% endblock %} {% block title %}Widget v2{% endblock %}
{% block heading %}Welcome to Widget!{% endblock %} {% block heading %}Welcome to Widget!{% endblock %}
{% block content %} {% block content %}
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
<button onclick="window.location.href='#';"> <button onclick="window.location.href='{% url 'dashboard:user-add' %}';">
Add Widget User Add Widget User
</button> </button>
......
widget_vincentdjango/dashboard/templates/dashboard/widgetuser-add.html
View file @ 7c70087e
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block style %}{% static 'dashboard/style.css' %}{% endblock %}
{% block title %}Add Widget User{% endblock %} {% block title %}Add Widget User{% endblock %}
{% block heading %}Add a new Widget User:{% endblock %} {% block heading %}Add a new Widget User:{% endblock %}
{% block content %} {% block content %}
......
widget_vincentdjango/dashboard/templates/dashboard/widgetuser-details.html
View file @ 7c70087e
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block style %}{% static 'dashboard/style.css' %}{% endblock %}
{% block title %}{{ object.last_name }}, {{ object.first_name }}{% endblock %} {% block title %}{{ object.last_name }}, {{ object.first_name }}{% endblock %}
{% block heading %} {% block heading %}
<p id="uppercase"> <p id="uppercase">
...@@ -13,7 +14,7 @@ ...@@ -13,7 +14,7 @@
<p> {{ object.department.dept_name }} </p> <p> {{ object.department.dept_name }} </p>
<p> {{ object.department.home_unit }} </p> <p> {{ object.department.home_unit }} </p>
<button onclick="window.location.href='#';"> <button onclick="window.location.href='{% url 'dashboard:user-edit' pk=object.pk%}';">
Edit Widget User Edit Widget User
</button> </button>
{% endblock %} {% endblock %}
\ No newline at end of file
widget_vincentdjango/dashboard/templates/dashboard/widgetuser-edit.html
View file @ 7c70087e
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block style %}{% static 'dashboard/style.css' %}{% endblock %}
{% block title %}Edit Widget User{% endblock %} {% block title %}Edit Widget User{% endblock %}
{% block heading %}Edit Widget User:{% endblock %} {% block heading %}Edit Widget User:{% endblock %}
{% block content %} {% block content %}
......
widget_vincentdjango/dashboard/templates/base.html → widget_vincentdjango/templates/base.html
View file @ 7c70087e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" href="/static/style.css"> <link rel="stylesheet" href="{% block style %}{% endblock %}">
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
</head> </head>
<body> <body>
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<div class="content"> <div class="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
<div class="navigation">
{% block navigation %}{% endblock %}
</div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment