Skip to content

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

Resolved merging issues

parent 8e98ab70
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 56 deletions
widget_CtrlF/announcement_board/templates/announcements/announcement-add.html
View file @ 5d2915ca
......@@ -3,7 +3,48 @@
{% block page-title %}Add Announcement:{% endblock %}
{% block heading %}<h1>Add a new announcement:</h1>{% endblock %}
{% block heading %}
<!DOCTYPE html>
<html>
<head>
<style>
ul {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
background-color: #333;
}
li {
float: left;
}
li a {
display: block;
color: white;
text-align: center;
padding: 14px 16px;
text-decoration: none;
}
li a:hover {
background-color: #111;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/announcement_board/">Back</a></li>
<li><a href="/dashboard/">Dashboard</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<h2>Add a new announcement:</h2>
{% endblock %}
{% block content %}
<form method="POST">
......
widget_CtrlF/announcement_board/templates/announcements/announcement-details.html
View file @ 5d2915ca
......@@ -2,11 +2,57 @@
{% load static %}
{% block page-title %}{{ announcement.title }}{% endblock %}
{% block heading %}
<!DOCTYPE html>
<html>
<head>
<style>
ul {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
background-color: #333;
}
li {
float: left;
}
li a {
display: block;
color: white;
text-align: center;
padding: 14px 16px;
text-decoration: none;
}
li a:hover {
background-color: #111;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/announcement_board/">Back</a></li>
<li><a href="/dashboard/">Dashboard</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
{% endblock %}
{% block content %}
<h1>
<link href='https://fonts.googleapis.com/css?family=Dancing Script' rel='stylesheet'>
<section>
<span>{{ announcement.title }}</span>
</section>
<h2>
{{ announcement.title }}
</h1>
</h2>
<p>
by {{ announcement.author.first_name }} {{ announcement.author.last_name }}<br>
......@@ -17,7 +63,7 @@
<p>
Like: {{ announcement.getLike }}<br>
Love: {{ announcement.getLove }}<br>
Angry: {{ announcement.getAngry}} <br>
Angry: {{ announcement.getAngry}} <br><br>
</p>
<p>
......
widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
View file @ 5d2915ca
......@@ -3,7 +3,48 @@
{% block page-title %}Edit Announcement{% endblock %}
{% block heading %}<h1>Edit announcement:</h1>{% endblock %}
{% block heading %}
<!DOCTYPE html>
<html>
<head>
<style>
ul {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
background-color: #333;
}
li {
float: left;
}
li a {
display: block;
color: white;
text-align: center;
padding: 14px 16px;
text-decoration: none;
}
li a:hover {
background-color: #111;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/announcement_board/">Announcements</a></li>
<li><a href="/dashboard/">Dashboard</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<h2>Edit announcement:</h2>
{% endblock %}
{% block content %}
<form method="post">
......
widget_CtrlF/announcement_board/templates/announcements/announcements.html
View file @ 5d2915ca
......@@ -3,15 +3,61 @@
{% block page-title %} Widget's Announcement Board {% endblock %}
{% block heading %} <h1> Welcome to Widget's Announcement Board! </h1> {% endblock %}
{% block heading %}
<!DOCTYPE html>
<html>
<head>
<style>
ul {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
background-color: #333;
}
li {
float: left;
}
li a {
display: block;
color: white;
text-align: center;
padding: 14px 16px;
text-decoration: none;
}
li a:hover {
background-color: #111;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/dashboard/">Dashboard</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<header>
<link href='https://fonts.googleapis.com/css?family=Dancing Script' rel='stylesheet'>
<div class="overlay">
<h> Welcome to Widget's Announcement Board! </h>
</div>
</header>
{% endblock %}
{% block content %}
<p> Announcements:<br><br>
{% for a in announcements_list %}
<h3>Announcements: </h3>
<p>{% for a in announcements_list %}
<a href="{% url 'announcement_board:announcement-details' a.pk %}">
{{a.title}} by {{ a.author.first_name }} {{ a.author.last_name }}
</a><br>
{% endfor %}
<br>
</p>
{% endblock %}
......@@ -21,9 +67,4 @@
<button class="btn add">New Announcement</button>
</a>
</p>
<p>
<a href="/dashboard/" class="link">Dashboard</a><br>
<a href="/forum/" class="link">Forum</a><br>
</p>
{% endblock %}
widget_CtrlF/forum/migrations/0004_merge_20230515_2025.py 0 → 100644
View file @ 5d2915ca
# Generated by Django 4.2.1 on 2023-05-15 12:25
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('forum', '0002_auto_20230306_0546'),
('forum', '0003_alter_reply_pub_datetime'),
]
operations = [
]
widget_CtrlF/static/style.css
View file @ 5d2915ca
p{
color: black;
font-family: monaco;
font-size:30px;
text-align: center;
}
/* basic styles */
h1 {
position: sticky;
text-align: center;
color: black;
font-size: 55px;
font-family: papyrus;
text-align: left;
color: White;
font-size: 35px;
font-family: arial;
}
h2 {
position: sticky;
text-align: center;
color: black;
font-size: 30px;
font-family: monaco;
text-align: left;
color: Black;
font-size: 35px;
font-family: arial;
}
body {
/* background-image: url("/static/bookshelf/books.jpg"); */
background-repeat: no-repeat;
background-size: cover;
background-position: center;
background-attachment: fixed;
}
p{
color: black;
font-family: monaco;
font-size:20x;
text-align: left;
}
/* announcements page style */
header {
text-align: center;
width: 100%;
height: auto;
background-size: cover;
background-attachment: fixed;
position: relative;
overflow: hidden;
border-radius: 0 0 85% 85% / 30%;
}
header .overlay{
width: 100%;
height: 100%;
padding: 50px;
color: #FFF;
text-shadow: 1px 1px 1px #333;
background-image: linear-gradient( 135deg, #076585 10%, #fff 100%);
opacity: 0.7;
}
h {
font-family: 'Dancing Script', cursive;
font-size: 60px;
margin-bottom: 30px;
}
h3, p {
font-family: 'Open Sans', sans-serif;
}
button {
border: none;
outline: none;
padding: 10px 20px;
border-radius: 50px;
color: #333;
background: #fff;
margin-bottom: 50px;
box-shadow: 0 3px 20px 0 #0000003b;
}
button:hover{
cursor: pointer;
}
/* for links */
a{
color: black;
font-family: monaco;
font-weight: bold;
font-size:25px;
font-family: 'Open Sans', sans-serif;;
font-size:15px;
}
/* for ordered list */
ol {
font-size:40px;
font-family: monaco;
......@@ -44,30 +87,28 @@ ol {
text-align: left;
}
.flex-parent {
display: flex;
}
.jc-center {
justify-content: center;
}
button.margin-right {
margin-right: 30px;
}
button.margin-left {
margin-left: 30px;
/* extra styles */
.b {
text-align: left;
font-weight: bold;
font-size: 40px;
text-shadow: 3px 3px 6px black;
}
.blue {
background-color: #74b4ec;
}
.pink {
background-color: #eb73ad;
/* 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;
}
.green {
background-color: #2de684;
}
\ No newline at end of file
widget_CtrlF/widget_CtrlF/settings.py
View file @ 5d2915ca
......@@ -123,6 +123,7 @@ USE_TZ = True
# https://docs.djangoproject.com/en/4.1/howto/static-files/
STATIC_URL = 'static/'
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
# Default primary key field type
# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
......
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