diff --git a/notes/static/notes/css/meeting.css b/notes/static/notes/css/meeting.css
index 1a1b82a..c438baf 100644
--- a/notes/static/notes/css/meeting.css
+++ b/notes/static/notes/css/meeting.css
@@ -1,30 +1,17 @@
-@import url('https://fonts.googleapis.com/css2?family=Lemonada&display=swap');
-h2 {
- font-size: 40px;
- margin-top: 10px;
- text-align: center;
- font-family: 'Lemonada', cursive;
-}
-.BulletedListBlock {
-}
-.TodoBlock {
- font-weight: bold;
-}
+
.SubheaderBlock {
list-style-type: none;
padding: 0px;
margin: 0px;
- font-size: 30px;
+ font-size: 30px !important;
margin-top: 5px;
- font-family: 'Lemonada', cursive;
+ font-weight: bold;
}
.SubsubheaderBlock {
list-style-type: none;
padding: 0px;
margin: 0px;
- font-size: 30px;
- margin-top: 5px;
- font-family: 'Lemonada', cursive;
-}
-.TextBlock {
+ font-size: 30px !important;
+ margin-top: 30px;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/notes/templates/notes/meeting.html b/notes/templates/notes/meeting.html
index 7445b06..e2404ea 100644
--- a/notes/templates/notes/meeting.html
+++ b/notes/templates/notes/meeting.html
@@ -1,11 +1,16 @@
{% extends 'pages/base.html' %}
{% load static %}
+{% block title %}{{ title }}{% endblock title %}
{% block css %}
-
+
{% endblock css %}
{% block content %}
+
{{ title }} - Meeting Notes
+
+
+
{{html|safe}}
{% endblock content %}
\ No newline at end of file
diff --git a/notes/templates/notes/notes.html b/notes/templates/notes/notes.html
index 0f33fc2..1172a65 100644
--- a/notes/templates/notes/notes.html
+++ b/notes/templates/notes/notes.html
@@ -1,10 +1,20 @@
{% extends 'pages/base.html' %}
{% load static %}
+{% block title %}Meetings{% endblock title %}
{% block css %}
-
+
+
{% endblock css %}
{% block content %}
- {{html|safe}}
+
Our Class Council Meetings
+
Select one to see our meeting notes - It may take a bit as it is fetching data
+
+
+
+ {{html|safe}}
+
+
+
{% endblock content %}
\ No newline at end of file
diff --git a/notes/views.py b/notes/views.py
index 8a6cfab..12ed117 100644
--- a/notes/views.py
+++ b/notes/views.py
@@ -14,9 +14,25 @@ def meeting_overview(request):
if block.id == '383b2866-a0ae-4f4e-b246-4131117721c0':
meeting_block = block.collection
break
-
+ sort_dict = {}
for meeting in meeting_block.get_rows():
- html += f''
+ month = meeting.title.split(' ')[0].lower()
+ if month in sort_dict:
+ sort_dict[month].append(meeting)
+ else:
+ sort_dict[month] = [meeting]
+ # html = f'' + html
+
+ for month in sort_dict.keys():
+ string = '{}{}
'
+ button = f''
+ tmp = ''
+ for meeting in sort_dict[month]:
+ tmp = f'{meeting.title} ' + tmp
+
+ tmp = f'' + tmp + ' '
+ html = string.format(button, tmp) + html
+
return render(request, 'notes/notes.html', {'html': html})
@@ -56,7 +72,8 @@ def show_meeting(request, meeting_id):
break
meeting_dict = dict()
- html_dict = {meeting: '' + meeting.title.strip() + ' '}
+ title = meeting.title.strip()
+ html_dict = {meeting: ''}
q = [meeting]
@@ -76,4 +93,4 @@ def show_meeting(request, meeting_id):
html = getHtml(html_dict, meeting_dict, meeting)
print(html)
- return render(request, "notes/meeting.html", {'html': html})
+ return render(request, "notes/meeting.html", {'html': html, 'title': title})
diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css
index f817642..414c46a 100644
--- a/pages/static/pages/css/styles.css
+++ b/pages/static/pages/css/styles.css
@@ -149,4 +149,4 @@ nav {
100% {
transform: translateY(0px);
}
-}
+}
\ No newline at end of file
diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html
index 1fdb3b2..d0dc6de 100644
--- a/pages/templates/pages/base.html
+++ b/pages/templates/pages/base.html
@@ -8,9 +8,10 @@
-
+ 2023 - {% block title %}{% endblock title %}
+
{% block css %}{% endblock css %}
@@ -47,7 +48,7 @@
{% block content %}{% endblock content %}
-
+
diff --git a/pages/templates/pages/council.html b/pages/templates/pages/council.html
index 240beb8..1368e78 100644
--- a/pages/templates/pages/council.html
+++ b/pages/templates/pages/council.html
@@ -1,5 +1,6 @@
{% extends 'pages/base.html' %}
{% load static %}
+{% block title %}Council{% endblock title %}
{% block css %}
{% endblock css %}
diff --git a/pages/templates/pages/events.html b/pages/templates/pages/events.html
index d49fc76..919e154 100644
--- a/pages/templates/pages/events.html
+++ b/pages/templates/pages/events.html
@@ -1,14 +1,13 @@
{% extends 'pages/base.html' %}
{% load static %}
+{% block title %}Events{% endblock title %}
{% block css %}
{% endblock css %}
{% block content %}
-
-
-
Events
-
Come and join your friends!
-
+
+
Events
+
Come and join your friends!
diff --git a/pages/templates/pages/index.html b/pages/templates/pages/index.html
index c1f8d33..7d13211 100644
--- a/pages/templates/pages/index.html
+++ b/pages/templates/pages/index.html
@@ -1,5 +1,6 @@
{% extends 'pages/base.html' %}
{% load static %}
+{% block title %}Home{% endblock title %}
{% block css %}
{% endblock css %}
@@ -12,7 +13,7 @@
-