Improve calendar-navigation on organizer and events page (Z#177488) (#2373)

* hide icons for calendar-types and improve layout-breakpoints in calendar top-nav

* change month-selector to one dropdown "date"and redirect old URLs to new date-based URLs

* change week calendar to one dropdown "date“ and redirect old URLs to new date-based URLs
This commit is contained in:
Richard Schreiber
2021-12-14 16:38:32 +01:00
committed by GitHub
parent d16f6167f6
commit aed64d16f6
14 changed files with 199 additions and 249 deletions

View File

@@ -314,8 +314,7 @@ class ItemDisplayTest(EventTestMixin, SoupTest):
resp = self.client.get('/%s/%s/' % (self.orga.slug, self.event.slug))
self.assertIn("Foo SE2", resp.rendered_content)
self.assertNotIn("Foo SE1", resp.rendered_content)
resp = self.client.get('/%s/%s/?year=%d&month=%d' % (self.orga.slug, self.event.slug, se1.date_from.year,
se1.date_from.month))
resp = self.client.get('/%s/%s/?date=%d-%d' % (self.orga.slug, self.event.slug, se1.date_from.year, se1.date_from.month))
self.assertIn("Foo SE1", resp.rendered_content)
self.assertNotIn("Foo SE2", resp.rendered_content)
@@ -332,9 +331,7 @@ class ItemDisplayTest(EventTestMixin, SoupTest):
print(resp.rendered_content)
self.assertIn("Foo SE2", resp.rendered_content)
self.assertNotIn("Foo SE1", resp.rendered_content)
resp = self.client.get('/%s/%s/?year=%d&week=%d' % (self.orga.slug, self.event.slug,
se1.date_from.isocalendar()[0],
se1.date_from.isocalendar()[1]))
resp = self.client.get('/%s/%s/?date=%d-W%d' % (self.orga.slug, self.event.slug, se1.date_from.isocalendar()[0], se1.date_from.isocalendar()[1]))
self.assertIn("Foo SE1", resp.rendered_content)
self.assertNotIn("Foo SE2", resp.rendered_content)

View File

@@ -154,7 +154,7 @@ def test_calendar(env, client):
r = client.get('/mrmcd/?style=calendar')
assert 'MRMCD2017' in r.rendered_content
assert 'September %d' % (now().year + 1) in r.rendered_content
r = client.get('/mrmcd/?style=calendar&month=10&year=2017')
r = client.get('/mrmcd/?style=calendar&date=2017-10')
assert 'MRMCD2017' not in r.rendered_content
assert 'October 2017' in r.rendered_content
@@ -173,7 +173,7 @@ def test_week_calendar(env, client):
e.save()
r = client.get('/mrmcd/?style=week')
assert 'MRMCD2017' in r.rendered_content
r = client.get('/mrmcd/?style=week&week=2&year=2017')
r = client.get('/mrmcd/?style=week&date=2017-W02')
assert 'MRMCD2017' not in r.rendered_content