Skip to content

Commit 854d375

Browse files
committed
padding fixes, added more stats, started work on new awards area
1 parent 8e0ee43 commit 854d375

File tree

11 files changed

+174
-98
lines changed

11 files changed

+174
-98
lines changed

mps_site/data/dcufm.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"id": "store",
2121
"icon_class": "fa-solid fa-hand-holding-heart",
2222
"number": "1570",
23-
"description": "Raised for CRY Ireland during the 12 Hour Broadcast in 2023"
23+
"description": "Euro raised for CRY Ireland during the 12 Hour Broadcast in 2023"
2424
},
2525
{
2626
"id": "twitch",
@@ -32,7 +32,13 @@
3232
"id": "shows",
3333
"icon_class": "fa-solid fa-hand-holding-heart",
3434
"number": "2658",
35-
"description": "Raised for ALONE during the 12 Hour Broadcast in 2022"
35+
"description": "Euro raised for ALONE during the 12 Hour Broadcast in 2022"
36+
},
37+
{
38+
"id": "radio",
39+
"icon_class": "fa-solid fa-radio",
40+
"number": "51",
41+
"description": "Shows broadcasted weekly on DCUfm"
3642
}
3743
]
3844

mps_site/data/dcutv.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,24 @@
1111
"id": "donation",
1212
"icon_class": "fa-solid fa-hand-holding-heart",
1313
"number": "12820",
14-
"description": "Raised for Jack & Jill Children’s Foundation during the 24 Hour Broadcast"
14+
"description": "Raised for Jack & Jill Children’s Foundation during the 24 Hour Broadcast in December 2023"
1515
},
1616
{
1717
"id": "youtube",
1818
"icon_class": "fa-brands fa-youtube",
1919
"number": "2110",
20-
"description": "YouTube Subscribers on the DCU MPS <a href=\"https://youtube.com/@dcumps\" target=\"_blank\">YouTube Channel!</a>"
20+
"description": "YouTube Subscribers on the DCU MPS <a href=\"https://youtube.com/@dcumps\" target=\"_blank\">YouTube Channel</a>"
2121
},
2222
{
2323
"id": "views",
2424
"icon_class": "fa-regular fa-eye",
2525
"number": "1600000",
26-
"description": "Views on the DCU MPS <a href=\"https://youtube.com/@dcumps\" target=\"_blank\">YouTube Channel!</a>"
26+
"description": "Views on the DCU MPS <a href=\"https://youtube.com/@dcumps\" target=\"_blank\">YouTube Channel</a>"
27+
},
28+
{
29+
"id": "videos",
30+
"icon_class": "fa-solid fa-video",
31+
"number": "1051",
32+
"description": "Videos uploaded to the DCU MPS <a href=\"https://youtube.com/@dcumps\" target=\"_blank\">YouTube Channel</a>"
2733
}
2834
]

mps_site/data/homepage.py

Lines changed: 130 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
'id': 'donation',
5353
'icon_class': 'fa-solid fa-hand-holding-heart',
5454
'number': '16560',
55-
'description': 'Raised for charity during our broadcasts this year'
55+
'description': 'Euro raised for charity during our broadcasts this year'
5656
},
5757
{
5858
'id': 'members',
@@ -115,4 +115,132 @@
115115
"description": "Keep your head warm with our MPS Beanie!"
116116
}
117117
]
118-
}
118+
}
119+
120+
homepage_awards = [
121+
{
122+
"title": "Awards",
123+
"subtitle": "Our Society has won many awards over the years!",
124+
"awards": [
125+
{
126+
"award": "Best Society in a Cultural/Academic/Social Field",
127+
"sponsor": "DCU Society Awards",
128+
"year": "2024",
129+
"award_icon": "fa-solid fa-trophy",
130+
"award_image": "assets/images/awards/clubsandsocs.jpg"
131+
},
132+
{
133+
"award": "Society Personality - Shane O'Loughlin",
134+
"sponsor": "DCU Society Awards",
135+
"year": "2024",
136+
"award_icon": "fa-solid fa-trophy",
137+
"award_image": "assets/images/awards/clubsandsocs.jpg"
138+
},
139+
{
140+
"award": "Individual Contribution to Society Life - Shane O'Loughlin",
141+
"sponsor": "DCU Society Awards",
142+
"year": "2024",
143+
"award_icon": "fa-solid fa-trophy",
144+
"award_image": "assets/images/awards/clubsandsocs.jpg"
145+
},
146+
{
147+
"award": "Individual Contribution to Society Life - Sarah Ó Tuama",
148+
"sponsor": "DCU Society Awards",
149+
"year": "2024",
150+
"award_icon": "fa-solid fa-trophy",
151+
"award_image": "assets/images/awards/clubsandsocs.jpg"
152+
},
153+
{
154+
"award": "Best Society Promotional Video",
155+
"sponsor": "Board of Irish College Society Awards",
156+
"year": "2023",
157+
"award_icon": "fa-solid fa-trophy",
158+
"award_image": "assets/images/awards/clubsandsocs.jpg"
159+
},
160+
{
161+
"award": "Best Society Publicity Campaign - DCUtv 24hr Broadcast",
162+
"sponsor": "DCU Society Awards",
163+
"year": "2023",
164+
"award_icon": "fa-solid fa-trophy",
165+
"award_image": "assets/images/awards/clubsandsocs.jpg"
166+
},
167+
{
168+
"award": "Best Society Promotional Video - Welcome to MPS '22/23",
169+
"sponsor": "DCU Society Awards",
170+
"year": "2023",
171+
"award_icon": "fa-solid fa-trophy",
172+
"award_image": "assets/images/awards/clubsandsocs.jpg"
173+
},
174+
{
175+
"award": "Individual Contribution to Society Life - Jack Collier",
176+
"sponsor": "DCU Society Awards",
177+
"year": "2023",
178+
"award_icon": "fa-solid fa-trophy",
179+
"award_image": "assets/images/awards/clubsandsocs.jpg"
180+
},
181+
{
182+
"award": "Best Charitable Contribution - (society)",
183+
"sponsor": "DCU Society Awards",
184+
"year": "2021",
185+
"award_icon": "fa-solid fa-trophy",
186+
"award_image": "assets/images/awards/clubsandsocs.jpg"
187+
},
188+
{
189+
"award": "Best Society Poster - DCUfm 12hr Broadcast",
190+
"sponsor": "DCU Society Awards",
191+
"year": "2021",
192+
"award_icon": "fa-solid fa-trophy",
193+
"award_image": "assets/images/awards/clubsandsocs.jpg"
194+
},
195+
{
196+
"award": "Individual Contribution to Society Life - Ciara Breslin",
197+
"sponsor": "DCU Society Awards",
198+
"year": "2021",
199+
"award_icon": "fa-solid fa-trophy",
200+
"award_image": "assets/images/awards/clubsandsocs.jpg"
201+
},
202+
{
203+
"award": "Best Society in Ireland",
204+
"sponsor": "Board of Irish College Society Awards",
205+
"year": "2015",
206+
"award_icon": "fa-solid fa-trophy",
207+
"award_image": "assets/images/awards/clubsandsocs.jpg"
208+
},
209+
{
210+
"award": "Best Society Event - DCUtv 24hr Broadcast",
211+
"sponsor": "DCU Society Awards",
212+
"year": "2014",
213+
"award_icon": "fa-solid fa-trophy",
214+
"award_image": "assets/images/awards/clubsandsocs.jpg"
215+
},
216+
{
217+
"award": "Best Society",
218+
"sponsor": "DCU Society Awards",
219+
"year": "2013",
220+
"award_icon": "fa-solid fa-trophy",
221+
"award_image": "assets/images/awards/clubsandsocs.jpg"
222+
},
223+
{
224+
"award": "Best Online Presence",
225+
"sponsor": "The Board of Irish College Society Awards",
226+
"year": "2012",
227+
"award_icon": "fa-solid fa-trophy",
228+
"award_image": "assets/images/awards/clubsandsocs.jpg"
229+
},
230+
{
231+
"award": "Best Communication & Marketing",
232+
"sponsor": "DCU Society Awards",
233+
"year": "2012",
234+
"award_icon": "fa-solid fa-trophy",
235+
"award_image": "assets/images/awards/clubsandsocs.jpg"
236+
},
237+
{
238+
"award": "Best College Society in Ireland",
239+
"sponsor": "The Board of Irish College Society Awards",
240+
"year": "2011",
241+
"award_icon": "fa-solid fa-trophy",
242+
"award_image": "assets/images/awards/clubsandsocs.jpg"
243+
}
244+
]
245+
}
246+
]

mps_site/static/css/style.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ a:link{
299299

300300
.footer p {
301301
font-size: 20px;
302+
margin-left: 10px;
303+
margin-right: 10px;
302304
}
303305

304306
.container img {
73.7 KB
Loading

mps_site/templates/base.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@
131131
<div class="footer">
132132
<div class="footer-line"></div>
133133
<ul>
134-
<li><a href="http://facebook.com/dcumps" target="_blank"><i class="fa-brands fa-facebook"></i></a></li>
135-
<li><a href="http://twitter.com/dcumps" target="_blank"><i class="fa-brands fa-x-twitter"></i></a></li>
136-
<li><a href="http://instagram.com/dcumps" target="_blank"><i class="fa-brands fa-instagram"></i></a></li>
137-
<li><a href="http://youtube.com/dcumps" target="_blank"><i class="fa-brands fa-youtube"></i></a></li>
138-
<li><a href="https://www.tiktok.com/@dcumps" target="_blank"><i class="fa-brands fa-tiktok"></i></a></li>
134+
<li><a href="http://facebook.com/dcumps" target="_blank" aria-label="DCU MPS Facebook"><i class="fa-brands fa-facebook"></i></a></li>
135+
<li><a href="http://twitter.com/dcumps" target="_blank" aria-label="DCU MPS Twitter"><i class="fa-brands fa-x-twitter"></i></a></li>
136+
<li><a href="http://instagram.com/dcumps" target="_blank" aria-label="DCU MPS Instagram"><i class="fa-brands fa-instagram"></i></a></li>
137+
<li><a href="http://youtube.com/dcumps" target="_blank" aria-label="DCU MPS YouTube"><i class="fa-brands fa-youtube"></i></a></li>
138+
<li><a href="https://www.tiktok.com/@dcumps" target="_blank" aria-label="DCU MPS TikTok"><i class="fa-brands fa-tiktok"></i></a></li>
139139
</ul>
140140
<p>© 1985 - 2024 by DCU MPS. Designed and maintained by <a href="https://www.jakefarrell.ie" target="_blank"><strong>Jake Farrell</strong></a></p>
141141
<!--<p>Powered with ❤️ by <a href="https://redbrick.dcu.ie" target="_blank"><strong>Redbrick</strong></a></p>-->

mps_site/templates/components/dcufm_twitch.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h3 style="padding-bottom: 10px;">Check out our Twitch stream weekdays from 9AM
2929
</div>
3030
</div>
3131
</div>
32-
<a class="btn btn-primary" data-toggle="modal" data-target="#fmtimetable" style="background-color: #202E4E; border-radius: 25px; border-width: 4px; border-color: white;" href="http://instagram.com/dcufm">View FM Timetable</a>
32+
<a class="btn btn-primary" data-toggle="modal" data-target="#fmtimetable" style="background-color: #202E4E; border-radius: 25px; border-width: 4px; border-color: white;">View FM Timetable</a>
3333
</div>
3434
</div>
3535
</div>

mps_site/templates/components/home/why_join.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
<h1>Why you should Join MPS</h1>
2-
<h5><i>There's much more than this but here's some reasons!</h5></i>
3-
<div class="container">
41

5-
2+
<div class="container">
3+
<h1>Why you should Join MPS</h1>
4+
<h5><i>There's much more than this but here's some reasons!</h5></i>
65
<div class="row justify-content-center">
76
<div class="col-md-12 custom-box shadow-lg bg-body">
87

mps_site/templates/components/testimonials.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<h1>MPS Alumni Stories</h1>
2-
<h5><i>Hear from our alumni who are working in the media industry!</h5></i>
1+
32
<div class="container">
3+
<h1>MPS Alumni Stories</h1>
4+
<h5><i>Hear from our alumni who are working in the media industry!</h5></i>
45
<div class="row justify-content-center">
56
<div class="col-md-6 custom-box shadow-lg bg-body">
67
<div class="center-contents">

mps_site/templates/dcutv.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,23 @@ <h4 style="text-align: center;"><i>TV Managers: Shane & Donal</i></h4>
3333

3434
{% include 'components/stats.html' with title="DCUtv Stats" subtitle="See our progress over the years!" animate_seconds=5 stats=stats_data %}
3535

36-
<h1>Check out the latest upload on the YouTube channel</h1>
36+
<div class="container">
37+
<h1>Check out our latest YouTube upload</h1>
3738
<h5><i>You know you want to!</i></h5>
3839
{% include 'components/youtube_video.html' with title="Latest MPS Video" latest_video_id=latest_video_id %}
39-
40+
</div>
41+
42+
<div class="container">
4043
<h1>Check out our "Meet the Committee" video</h1>
41-
<h5><i>Filmed by DCUtv!</h5></i>
44+
<h5><i>Filmed by DCUtv across the globe!</h5></i>
4245
{% include 'components/youtube_video.html' with title="Meet the Committee" latest_video_id=committee_video_id %}
46+
</div>
4347

48+
<div class="container">
4449
<h1>TV Thursdays</h1>
4550
<h5><i>Weekly videos filmed on DCU!</h5></i>
4651
{% include 'components/youtube_video.html' with title="TV Thursday" latest_video_id=tv_thursday %}
47-
52+
</div>
4853

4954
{% endblock %}
5055
{% block footer %}

0 commit comments

Comments
 (0)