Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 43ce8fcfe7b6b5a1f51a6b98c2e9b3320f8846ad
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Nov 6 14:18:55 2012 +0100
Make use of the current day index to highlight in the agenda the current day
---------------------------------------------------------------
fedocal/__init__.py | 2 ++
fedocal/static/fedocal.css | 4 ++++
fedocal/templates/agenda.html | 27 +++++++++++++++------------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index cb624fe..89eda91 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -114,6 +114,7 @@ def calendar_fullday(calendar_name, year, month, day):
calendarobj = Calendar.by_id(SESSION, calendar_name)
week_start = fedocallib.get_start_week(year, month, day)
weekdays = fedocallib.get_week_days(year, month, day)
+ day_index = fedocallib.get_week_day_index(year, month, day)
meetings = fedocallib.get_meetings(SESSION, calendarobj, year,
month, day)
next_week = fedocallib.get_next_week(week_start.year,
@@ -129,6 +130,7 @@ def calendar_fullday(calendar_name, year, month, day):
calendar=calendarobj,
month=month_name,
weekdays=weekdays,
+ day_index=day_index,
meetings=meetings,
next_week=next_week,
prev_week=prev_week,
diff --git a/fedocal/static/fedocal.css b/fedocal/static/fedocal.css
index b9bb805..59ebe41 100644
--- a/fedocal/static/fedocal.css
+++ b/fedocal/static/fedocal.css
@@ -134,6 +134,10 @@ section nav {
width: 7em;
}
+#agenda .today {
+ background-color: #fff7da;
+}
+
.my_meetings .date {
border-left: solid 0px;
width: 100px;
diff --git a/fedocal/templates/agenda.html b/fedocal/templates/agenda.html
index 9a77a59..54af0b4 100644
--- a/fedocal/templates/agenda.html
+++ b/fedocal/templates/agenda.html
@@ -44,21 +44,24 @@
<tr>
<th class="time">{{ time_entry }}</th>
{% for meeting_list in meetings[time_entry] %}
- {% if meeting_list %}
+ {% if loop.index == day_index %}
+ <td class="today">
+ {% else %}
<td>
- {% for meeting in meeting_list %}
- <a class="event meeting_{{ meeting.meeting_id }}"
href="{{ url_for('view_meeting',
- meeting_id=meeting.meeting_id) }}">
- {{ meeting.meeting_name }}
- </a>
- {% if not loop.last %}
- -
- {% endif %}
+ {% endif %}
+ {% if meeting_list %}
+ {% for meeting in meeting_list %}
+ <a class="event meeting_{{ meeting.meeting_id }}"
+ href="{{ url_for('view_meeting',
+ meeting_id=meeting.meeting_id) }}">
+ {{ meeting.meeting_name }}
+ </a>
+ {% if not loop.last %}
+ -
+ {% endif %}
{% endfor %}
+ {% endif %}
</td>
- {% else %}
- <td></td>
- {% endif %}
{% endfor %}
</tr>
{% endfor %}