Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 526122cb811bcabea994d6b646cfe480b2c98536
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Dec 11 21:12:13 2012 +0100
In list view we go year to year or month to month not week to week
---------------------------------------------------------------
fedocal/__init__.py | 11 ++---------
fedocal/templates/meeting_list.html | 14 +++++++-------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index cf059da..bae9c9b 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -211,12 +211,7 @@ def calendar_list(calendar_name, year, month, day):
tzone = get_timezone()
meetings = fedocallib.get_by_date(SESSION, calendarobj, start_date,
end_date, tzone)
- week_start = fedocallib.get_start_week(inyear, inmonth, inday)
- weekdays = fedocallib.get_week_days(inyear, inmonth, inday)
- next_week = fedocallib.get_next_week(week_start.year,
- week_start.month, week_start.day)
- prev_week = fedocallib.get_previous_week(week_start.year,
- week_start.month, week_start.day)
+
month_name = datetime.date.today().strftime('%B')
auth_form = forms.LoginForm()
admin = is_admin()
@@ -230,9 +225,7 @@ def calendar_list(calendar_name, year, month, day):
month=month_name,
meetings=meetings,
tzone=tzone,
- weekdays=weekdays,
- next_week=next_week,
- prev_week=prev_week,
+ year=inyear,
auth_form=auth_form,
curmonth_cal=curmonth_cal,
admin=admin)
diff --git a/fedocal/templates/meeting_list.html b/fedocal/templates/meeting_list.html
index 146b359..f564f43 100644
--- a/fedocal/templates/meeting_list.html
+++ b/fedocal/templates/meeting_list.html
@@ -17,15 +17,15 @@
<p>{{ calendar.calendar_description }}</p>
</header>
<nav id="weeks">
- <a href="{{url_for('calendar',
- calendar_name=calendar.calendar_name, year=prev_week.year,
- month=prev_week.month, day=prev_week.day)}}"
class="button">
+ <a href="{{url_for('calendar_list',
+ calendar_name=calendar.calendar_name, year=year - 1)}}"
+ class="button">
<
</a>
- {{ weekdays | WeekHeading }}
- <a href="{{url_for('calendar',
- calendar_name=calendar.calendar_name, year=next_week.year,
- month=next_week.month, day=next_week.day)}}"
class="button">
+ {{ year }}
+ <a href="{{url_for('calendar_list',
+ calendar_name=calendar.calendar_name, year=year + 1)}}"
+ class="button">
>
</a>
</nav>