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

893cc13f · Mary Adelaide A. Salto · c78f6424 · 43a7dbc9 · 893cc13f · 893cc13f
Commit 893cc13f authored May 16, 2023 by Mary Adelaide A. Salto
9 changed files
--- a/widget_CtrlF/announcement_board/__pycache__/admin.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/admin.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/__pycache__/apps.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/apps.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/__pycache__/models.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/models.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/__pycache__/urls.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/urls.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/__pycache__/views.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/views.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/templates/announcements/announcement-add.html
+++ b/widget_CtrlF/announcement_board/templates/announcements/announcement-add.html
 {% extends 'base.html' %}
 {% load static %}

-{% block page-title %}Add Announcement:{% endblock %}
+{% block page-title %}Add Announcement{% endblock %}

 {% block heading %}
 <!DOCTYPE html>
@@ -49,9 +49,11 @@ li a:hover {
 {% block content %}
 <form method="POST">
    {% csrf_token %}
+    <h3>
    <table>
        {{ form.as_table }}
    </table><br><br>
+    </h3>  
    <p>
        <input class="button" type="submit" value="Add Announcement">
    </p>

--- a/widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
+++ b/widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
@@ -36,7 +36,11 @@ li a:hover {
 <body>

 <ul>
+<<<<<<< HEAD
    <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="/forum/">Forum</a></li>
 </ul>
@@ -49,9 +53,13 @@ li a:hover {
 {% block content %}
 <form method="post">
    {% csrf_token %}
+    <h3>
    <table>
      {{ form.as_table }}
    </table><br><br>
+    </h3>
+    <p>
      <input class="button" type="submit" value="Save Changes to Announcement">
-</form>
+    </p>
+  </form>
 {% endblock %}
\ No newline at end of file
--- a/widget_CtrlF/announcement_board/views.py
+++ b/widget_CtrlF/announcement_board/views.py
@@ -2,7 +2,6 @@ from django.shortcuts import render
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView, UpdateView
 from .models import Announcement
-from django.http import Http404

 def index(request):
    announcement_view = "Widget's Announcement Board <br/>"
@@ -30,6 +29,7 @@ class AnnouncementsUpdateView(UpdateView):
    fields = 'title', 'body', 'author'
    template_name = 'announcements/announcement-edit.html'

+
    # for a in announcements:
    #     like_tally=0
    #     love_tally=0

--- a/widget_CtrlF/static/style.css
+++ b/widget_CtrlF/static/style.css
@@ -96,6 +96,7 @@ ol {
    text-shadow: 3px 3px 6px black;
 }

+<<<<<<< HEAD

 /* announcement details heading */
 section {
@@ -126,3 +127,21 @@ 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