Skip to content

M
midterm_CtrlF
Commit 288b39e5 authored by Fritzie Dianne Del Pilar's avatar Fritzie Dianne Del Pilar
Browse files
Options

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

parents 745ece3b 893cc13f
Show whitespace changes
Inline Side-by-side
Showing with 216 additions and 12 deletions
README.txt
View file @ 288b39e5
...@@ -11,7 +11,7 @@ Del Pilar - Announcementboard.v2 ...@@ -11,7 +11,7 @@ Del Pilar - Announcementboard.v2
Salto - Dashboard.v2 Salto - Dashboard.v2
Tan - Forum.v2 Tan - Forum.v2
Date of Submission: May 15, 2023 Date of Submission: May 16, 2023
We, members of CtrlF, truthfully completed this project with all our efforts and knowledge. We, members of CtrlF, truthfully completed this project with all our efforts and knowledge.
...@@ -22,5 +22,4 @@ DateTimeField - https://www.geeksforgeeks.org/datetimefield-django-forms/ ...@@ -22,5 +22,4 @@ DateTimeField - https://www.geeksforgeeks.org/datetimefield-django-forms/
Members' Signature: Members' Signature:
(sgd) Del Pilar, Fritzie Dianne B., May 15, 2023 (sgd) Del Pilar, Fritzie Dianne B., May 15, 2023
(sgd) Salto, Mary Adelaide A., MMay 15, 2023 (sgd) Salto, Mary Adelaide A., May 15, 2023
(sgd) Tan, Lance Cedric B., May 15, 2023 \ No newline at end of file
\ No newline at end of file
widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
View file @ 288b39e5
...@@ -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/">Announcement Board</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>
......
widget_CtrlF/dashboard/templates/dashboard/dashboard.html
View file @ 288b39e5
...@@ -3,7 +3,47 @@ ...@@ -3,7 +3,47 @@
{% block page-title %}Widget v2{% endblock %} {% block page-title %}Widget v2{% endblock %}
{% block heading %} <h1> Welcome to Widget! </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: 10px 15px;
text-decoration: none;
}
li a:hover {
background-color: #57065b;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/announcement_board/">Announcement Board</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<h1> Welcome to Widget! </h1>
{% endblock %}
{% block content %} {% block content %}
<p> <p>
...@@ -20,9 +60,4 @@ ...@@ -20,9 +60,4 @@
<button class="btn add">Add Widget User</button> <button class="btn add">Add Widget User</button>
</a> </a>
</p> </p>
<p>
<a href="/announcement_board/" class="link">Announcement Board</a><br>
<a href="/forum/" class="link">Forum</a><br>
</p>
{% endblock %} {% endblock %}
\ No newline at end of file
widget_CtrlF/dashboard/templates/dashboard/widgetuser-add.html
View file @ 288b39e5
...@@ -3,8 +3,47 @@ ...@@ -3,8 +3,47 @@
{% block page-title %}Add Widget User{% endblock %} {% block page-title %}Add Widget User{% endblock %}
{% block heading %} <h1> Add a new Widget User: </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: 10px 15px;
text-decoration: none;
}
li a:hover {
background-color: #57065b;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/dashboard/">Back</a></li>
<li><a href="/announcement_board/">Announcement Board</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<h1> Add a new Widget User: </h1> {% endblock %}
{% block content %} {% block content %}
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
......
widget_CtrlF/dashboard/templates/dashboard/widgetuser-details.html
View file @ 288b39e5
...@@ -3,7 +3,48 @@ ...@@ -3,7 +3,48 @@
{% block page-title %}{{ object.last_name }}, {{ object.first_name }}{% endblock %} {% block page-title %}{{ object.last_name }}, {{ object.first_name }}{% endblock %}
{% block heading %} <h1> {{ object.first_name }} {{ object.middle_name }} {{ object.last_name }} </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: 10px 15px;
text-decoration: none;
}
li a:hover {
background-color: #57065b;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/dashboard/">Back</a></li>
<li><a href="/announcement_board/">Announcement Board</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<h1> {{ object.first_name }} {{ object.middle_name }} {{ object.last_name }} </h1>
{% endblock %}
{% block content %} {% block content %}
<p> <p>
......
widget_CtrlF/dashboard/templates/dashboard/widgetuser-edit.html
View file @ 288b39e5
...@@ -3,8 +3,47 @@ ...@@ -3,8 +3,47 @@
{% block page-title %}Edit Widget User{% endblock %} {% block page-title %}Edit Widget User{% endblock %}
{% block heading %} <h1> Edit Widget User: </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: 10px 15px;
text-decoration: none;
}
li a:hover {
background-color: #57065b;
}
</style>
</head>
<body>
<ul>
<li><a class="active" href="/dashboard/">Back</a></li>
<li><a href="/announcement_board/">Announcement Board</a></li>
<li><a href="/forum/">Forum</a></li>
</ul>
</body>
</html>
<h1> Edit Widget User: </h1> {% endblock %}
{% block content %} {% block content %}
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
......
widget_CtrlF/forum/migrations/0005_merge_20230516_1715.py 0 → 100644
View file @ 288b39e5
# Generated by Django 4.2.1 on 2023-05-16 09:15
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('forum', '0004_merge_20230515_2025'),
('forum', '0004_merge_20230516_0026'),
]
operations = [
]
widget_CtrlF/static/style.css
View file @ 288b39e5
...@@ -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 {
...@@ -112,3 +113,35 @@ section { ...@@ -112,3 +113,35 @@ section {
font-weight: 700; font-weight: 700;
font-family: 'Dancing Script', cursive; font-family: 'Dancing Script', cursive;
} }
/* dashboard pages styles */
body {
background-color: thistle;
font-size: 120%;
color: black;
font-family: 'Sans Serif';
text-align: justify;
}
h1 {
font-family: 'Papyrus';
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