[CMF-checkins] CVS: CMF/CMFCalendar/skins/zpt_calendar -
getDaysClass.py:1.1.28.1 getEndAsString.py:1.1.28.1
getMonthAndYear.py:1.2.20.1 getNextDayLink.py:1.1.28.1
getNextMonthLink.py:1.1.28.1 getPreviousDayLink.py:1.1.28.1
getPreviousMonthLink.py:1.1.28.1 getStartAsString.py:1.1.28.1
Sidnei da Silva
sidnei at awkly.org
Thu Apr 22 13:48:15 EDT 2004
Update of /cvs-repository/CMF/CMFCalendar/skins/zpt_calendar
In directory cvs.zope.org:/tmp/cvs-serv30596/CMFCalendar/skins/zpt_calendar
Modified Files:
Tag: CMF-1_4-branch
getDaysClass.py getEndAsString.py getMonthAndYear.py
getNextDayLink.py getNextMonthLink.py getPreviousDayLink.py
getPreviousMonthLink.py getStartAsString.py
Log Message:
Fix version.txt to right version. Run reindent.py for removing extra tabs and whitespaces
=== CMF/CMFCalendar/skins/zpt_calendar/getDaysClass.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getDaysClass.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getDaysClass.py Thu Apr 22 13:47:44 2004
@@ -10,12 +10,12 @@
current = DateTime.DateTime()
if current.year()==year and current.month()==month and current.day()==int(day):
- if event:
- return "todayevent"
- else:
- return "todaynoevent"
-
+ if event:
+ return "todayevent"
+ else:
+ return "todaynoevent"
+
if event:
- return "event"
+ return "event"
else:
- return ""
\ No newline at end of file
+ return ""
=== CMF/CMFCalendar/skins/zpt_calendar/getEndAsString.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getEndAsString.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getEndAsString.py Thu Apr 22 13:47:44 2004
@@ -9,7 +9,6 @@
last_date=DateTime(thisDay.Date()+" 23:59:59")
if event.end > last_date:
- return event.end.aCommon()[:12]
+ return event.end.aCommon()[:12]
else:
- return event.end.TimeMinutes()
-
+ return event.end.TimeMinutes()
=== CMF/CMFCalendar/skins/zpt_calendar/getMonthAndYear.py 1.2 => 1.2.20.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getMonthAndYear.py:1.2 Fri Aug 2 13:23:29 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getMonthAndYear.py Thu Apr 22 13:47:44 2004
@@ -20,15 +20,15 @@
if session:
if not year: year = session.get('calendar_year', None)
if not month: month = session.get('calendar_month', None)
-
+
# Last resort to Today
if not year: year = current.year()
if not month: month = current.month()
# Then store the results in the session for next time
if session:
- session.set('calendar_year', year)
- session.set('calendar_month', month)
-
+ session.set('calendar_year', year)
+ session.set('calendar_month', month)
+
# Finally return the results
return (year, month)
=== CMF/CMFCalendar/skins/zpt_calendar/getNextDayLink.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getNextDayLink.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getNextDayLink.py Thu Apr 22 13:47:44 2004
@@ -9,4 +9,4 @@
thisDay.Date()
)
-return x
\ No newline at end of file
+return x
=== CMF/CMFCalendar/skins/zpt_calendar/getNextMonthLink.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getNextMonthLink.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getNextMonthLink.py Thu Apr 22 13:47:44 2004
@@ -9,4 +9,4 @@
nextMonthTime.year()
)
-return x
\ No newline at end of file
+return x
=== CMF/CMFCalendar/skins/zpt_calendar/getPreviousDayLink.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getPreviousDayLink.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getPreviousDayLink.py Thu Apr 22 13:47:44 2004
@@ -9,4 +9,4 @@
thisDay.Date()
)
-return x
\ No newline at end of file
+return x
=== CMF/CMFCalendar/skins/zpt_calendar/getPreviousMonthLink.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getPreviousMonthLink.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getPreviousMonthLink.py Thu Apr 22 13:47:44 2004
@@ -9,4 +9,4 @@
prevMonthTime.year()
)
-return x
\ No newline at end of file
+return x
=== CMF/CMFCalendar/skins/zpt_calendar/getStartAsString.py 1.1 => 1.1.28.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/getStartAsString.py:1.1 Thu May 2 09:51:49 2002
+++ CMF/CMFCalendar/skins/zpt_calendar/getStartAsString.py Thu Apr 22 13:47:44 2004
@@ -7,6 +7,6 @@
first_date=DateTime(thisDay.Date()+" 00:00:00")
if event.start < first_date:
- return event.start.aCommon()[:12]
+ return event.start.aCommon()[:12]
else:
- return event.start.TimeMinutes()
+ return event.start.TimeMinutes()
More information about the CMF-checkins
mailing list