Skip to content

M
midterm_vincentdjango
Commit 6d3e2d37 authored by Star Neptune R. Sy's avatar Star Neptune R. Sy
Browse files
Options

linked the blocks to the project level base.html

parent 1b679d7e
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 33 deletions
widget_vincentdjango/assignments/static/makeItBeautiful.css → widget_vincentdjango/assignments/static/assignments/makeItBeautiful.css
View file @ 6d3e2d37
body {
background-color:rgb(167, 36, 75)
/*background-color:rgb(167, 36, 75);*/
background-color:rgb(0, 0, 0);
}
div.pageTitle{
div.heading{
text-align: center;
background-color: rgb(214, 255, 246);
margin-left: 20%;
......@@ -17,9 +18,6 @@ div.pageTitle{
box-shadow: 0px 20px 40px 0px rgb(65, 2, 23),
0px 0px 40px 0px rgb(175, 212, 204) inset;
}
h1.pageTitle{
......@@ -56,7 +54,7 @@ li:hover{
transition: all 0.5s;
}
div.navButtons{
div.navigation{
background-color: rgb(255, 248, 238);
border-radius: 5px;
......
widget_vincentdjango/assignments/templates/templates/assignment-add.html → widget_vincentdjango/assignments/templates/assignments/assignment-add.html
View file @ 6d3e2d37
{% extends 'base.html' %}
{% load static %}
{% block webTitle %} Add Assignment {% endblock %}
{% block style %} {% static 'assignments/makeItBeautiful.css' %} {% endblock %}
{% block pageTitle %} Add a new assignment {% endblock %}
{% block title %} Add Assignment {% endblock %}
{% block heading %} Add a new assignment {% endblock %}
{% block content %}
<form id="addAssignment" method="post">
......@@ -13,6 +16,6 @@
</form>
{% endblock %}
{% block otherButtons %}
{% block navigation %}
<button class="buttonLink" form="addAssignment" onclick="window.location.href='assignments/';"> <b> Add assignment </b> </button>
{% endblock %}
\ No newline at end of file
widget_vincentdjango/assignments/templates/templates/assignments.html → widget_vincentdjango/assignments/templates/assignments/assignments.html
View file @ 6d3e2d37
{% extends 'base.html' %}
{% load static %}
{% block webTitle %} Widget's Assignments {% endblock %}
{% block style %} {% static 'assignments/makeItBeautiful.css' %} {% endblock %}
{% block pageTitle %} Welcome to Widget's assignments {% endblock %}
{% block title %} Widget's Assignments {% endblock %}
{% block heading %} <h1 class="pageTitle"> Welcome to Widget's assignments </h1> {% endblock %}
{% block content %}
<ul style='list-style-type:square;'>
......@@ -12,7 +15,7 @@
</ul>
{% endblock %}
{% block otherButtons %}
{% block navigation %}
<button class="buttonLink" onclick="window.location.href='add/';"> <b>New Assignment</b> </button><br><br>
<a class="miniLink" href="/dashboard"> Dashboard </a> <br>
<a class="miniLink" href="/announcementBoard"> Announcements </a> <br>
......
widget_vincentdjango/assignments/templates/base.html deleted 100644 → 0
View file @ 1b679d7e
{% load static %}
<head>
<link rel="stylesheet" href="{% static '/makeItBeautiful.css' %}">
<title>{% block webTitle %}{% endblock %}</title>
</head>
<body>
<div class="pageTitle"> <h1 class="pageTitle"> {% block pageTitle %}{% endblock %} </h1> </div>
<br><br><br>
<div class="content">
{% block content %}{% endblock %}
<div class="navButtons">
{% block otherButtons %} {% endblock %}
</div>
</div>
</body>
\ No newline at end of file
widget_vincentdjango/assignments/views.py
View file @ 6d3e2d37
......@@ -10,18 +10,18 @@ from .models import Assignment
def homeAssignmentsPage(request):
return render(request, 'templates/assignments.html', {"assignmentsList":Assignment.objects.all()}) #you can pass an entire list of model instances to the html
return render(request, 'assignments/assignments.html', {"assignmentsList":Assignment.objects.all()}) #you can pass an entire list of model instances to the html
class AssignmentsDetailView(DetailView):
model = Assignment
template_name = "templates/assignment-details.html"
template_name = "assignments/assignment-details.html"
class AssignmentsUpdateView(UpdateView):
model = Assignment
fields = ["assignment_name","description","course","perfect_score" ]
template_name = "templates/assignment-edit.html"
template_name = "assignments/assignment-edit.html"
success_url = "../details"
......@@ -29,7 +29,7 @@ class AssignmentsUpdateView(UpdateView):
class AssignmentsCreateView(CreateView):
model = Assignment
fields = ["assignment_name","description","course","perfect_score" ]
template_name = "templates/assignment-add.html"
template_name = "assignments/assignment-add.html"
def get_success_url(self):
return reverse('assignments:assignment_details', kwargs={ #appName:pathName
......
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