Skip to content

M
midterm_CtrlF
Commit 893cc13f authored by Mary Adelaide A. Salto's avatar Mary Adelaide A. Salto
Browse files
Options

Merge branch 'master' of https://gitlab.discs.ateneo.edu/fritzie.delpilar/midterm_CtrlF

parents c78f6424 43a7dbc9
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 7 deletions
widget_CtrlF/announcement_board/templates/announcements/announcement-add.html
View file @ 893cc13f
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block page-title %}Add Announcement:{% endblock %} {% block page-title %}Add Announcement{% endblock %}
{% block heading %} {% block heading %}
<!DOCTYPE html> <!DOCTYPE html>
...@@ -49,9 +49,11 @@ li a:hover { ...@@ -49,9 +49,11 @@ li a:hover {
{% block content %} {% block content %}
<form method="POST"> <form method="POST">
{% csrf_token %} {% csrf_token %}
<h3>
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table><br><br> </table><br><br>
</h3>
<p> <p>
<input class="button" type="submit" value="Add Announcement"> <input class="button" type="submit" value="Add Announcement">
</p> </p>
......
widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
View file @ 893cc13f
...@@ -36,7 +36,11 @@ li a:hover { ...@@ -36,7 +36,11 @@ li a:hover {
<body> <body>
<ul> <ul>
<<<<<<< HEAD
<li><a class="active" href="/announcement_board/">Announcements</a></li> <li><a class="active" href="/announcement_board/">Announcements</a></li>
=======
<li><a class="active" href="/announcement_board/">Announcement Board</a></li>
>>>>>>> 43a7dbc9324df50f12044741db9be28e324c36fe
<li><a href="/dashboard/">Dashboard</a></li> <li><a href="/dashboard/">Dashboard</a></li>
<li><a href="/forum/">Forum</a></li> <li><a href="/forum/">Forum</a></li>
</ul> </ul>
...@@ -49,9 +53,13 @@ li a:hover { ...@@ -49,9 +53,13 @@ li a:hover {
{% block content %} {% block content %}
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
<h3>
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table><br><br> </table><br><br>
</h3>
<p>
<input class="button" type="submit" value="Save Changes to Announcement"> <input class="button" type="submit" value="Save Changes to Announcement">
</form> </p>
</form>
{% endblock %} {% endblock %}
\ No newline at end of file
widget_CtrlF/announcement_board/views.py
View file @ 893cc13f
...@@ -2,7 +2,6 @@ from django.shortcuts import render ...@@ -2,7 +2,6 @@ from django.shortcuts import render
from django.views.generic.detail import DetailView from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView from django.views.generic.edit import CreateView, UpdateView
from .models import Announcement from .models import Announcement
from django.http import Http404
def index(request): def index(request):
announcement_view = "Widget's Announcement Board <br/>" announcement_view = "Widget's Announcement Board <br/>"
...@@ -30,6 +29,7 @@ class AnnouncementsUpdateView(UpdateView): ...@@ -30,6 +29,7 @@ class AnnouncementsUpdateView(UpdateView):
fields = 'title', 'body', 'author' fields = 'title', 'body', 'author'
template_name = 'announcements/announcement-edit.html' template_name = 'announcements/announcement-edit.html'
# for a in announcements: # for a in announcements:
# like_tally=0 # like_tally=0
# love_tally=0 # love_tally=0
......
widget_CtrlF/static/style.css
View file @ 893cc13f
...@@ -96,6 +96,7 @@ ol { ...@@ -96,6 +96,7 @@ ol {
text-shadow: 3px 3px 6px black; text-shadow: 3px 3px 6px black;
} }
<<<<<<< HEAD
/* announcement details heading */ /* announcement details heading */
section { section {
...@@ -126,3 +127,21 @@ h1 { ...@@ -126,3 +127,21 @@ h1 {
font-family: 'Papyrus'; font-family: 'Papyrus';
text-align: center; text-align: center;
} }
=======
/* announcement details heading */
section {
height: 100vh;
background: lightblue;
}
section span {
margin: 0;
font-size: 400%;
text-align: center;
line-height: 1;
padding-top: calc(50vh - 20pt);
display: block;
font-weight: 700;
font-family: 'Dancing Script', cursive;
}
>>>>>>> 43a7dbc9324df50f12044741db9be28e324c36fe
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