Merge pull request #182 from Metalab/issue_181_caleventlocation

Implement location display in calendar view
Metalab · Jul 8, 2023 · c2474ed · c2474ed
2 parents 0d73bcb + c7ebbda
commit c2474ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/cal/views.py b/cal/views.py
@@ -42,7 +42,9 @@ def formatday(self, day, weekday):
                 if self.admin:
                     body.append(u'<a href="%s" class="edit" title="edit">✏️</a>' % event.get_absolute_url())
                 body.append('<a href="/wiki/%s">' % event.wikiPage)
-                body.append('<span class="event-time">' + event.startDate.strftime('%H:%M') + '</span> ' + esc(event.name))
+                body.append('<span class="event-time">' + event.startDate.strftime('%H:%M') + '</span>')
+                body.append('<span class="event-name">' + esc(event.name) + '</span>')
+                body.append('<span class="event-location">' + esc(event.location) + '</span>')
                 body.append('</a>')
                 body.append('</li>')
             body.append('</ul>')

diff --git a/static/stylesheets/cal.css b/static/stylesheets/cal.css
@@ -129,6 +129,23 @@ table.month .event-time {
 	  font-weight: bold;
 }
 
+.event .event-name::before {
+	display: inline;
+	content: " ";
+}
+
+.event .event-location {
+	display: none;
+}
+
+.event .event-location::before {
+	content: " | ";
+}
+
+.event:hover .event-location {
+	display: inline;
+}
+
 #calendar-year-list {
 	text-align: right;
 }