From f36d3298f0401e4fb1ca131d18d51d3d47e39818 Mon Sep 17 00:00:00 2001 From: Jason Oster Date: Tue, 7 Jul 2009 14:48:28 +0000 Subject: HTML/CSS template rewrites, nice-title integration, XSS fixes, version bump --- templates/default/calendar_nav.tpl | 265 +++++++++++++++++++------------------ templates/default/day.tpl | 20 +-- templates/default/default.css | 26 +++- templates/default/event.tpl | 4 +- templates/default/footer.tpl | 2 +- templates/default/header.tpl | 4 +- templates/default/month.tpl | 153 +++++++++++---------- templates/default/month_large.tpl | 4 +- templates/default/month_medium.tpl | 4 +- templates/default/print.tpl | 10 +- templates/default/week.tpl | 12 +- templates/default/year.tpl | 87 ++++-------- 12 files changed, 305 insertions(+), 286 deletions(-) (limited to 'templates/default') diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl index a48cfbe..82c43ff 100644 --- a/templates/default/calendar_nav.tpl +++ b/templates/default/calendar_nav.tpl @@ -1,7 +1,74 @@ - +
+ - + + + + + + -
- {MONTH_SMALL|-1} + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
@@ -10,136 +77,82 @@
- + + + + + + + + + + + + - + + + + +
+ + + + - - -
{L_JUMP}
- - - - - - - -
{L_JUMP}
-
-
-
-
-
-
-
- +
+
+ +
+
+
+
+
+ - - - {SEARCH_BOX} - - -
- - - - -
- -
-
{L_PICK_MULTIPLE}:
-
- - -
- -
-
-
- - - - - - -
- 		- - - -
- - - - - - - - - - - - - - - - - - - - - -
{L_LOGIN}
-
- {L_INVALID_LOGIN} -
-
{L_USERNAME}:
{L_PASSWORD}:
-
- - - - - - -
-
- - - - - - - - -
{SIDEBAR_DATE}
-
- {L_LEGEND}:
- {LEGEND} - {L_GOPRINT}
- - {L_PREFERENCES}
- - - {L_SUBSCRIBE} | {L_DOWNLOAD}
- - - {L_LOGOUT} {USERNAME} - -
-
- - - - - - -
+ + + {SEARCH_BOX} + + +
+ + + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+ + + + + + +
+
+ {MONTH_SMALL|-1} + + + + + + +
+
{MONTH_SMALL|+1} - +
diff --git a/templates/default/day.tpl b/templates/default/day.tpl index c66d40f..b9cbf10 100644 --- a/templates/default/day.tpl +++ b/templates/default/day.tpl @@ -1,19 +1,19 @@ {HEADER}
-
+
-
- +
+
- +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}

{DISPLAY_DATE}

{CALENDAR_NAME}
- + @@ -30,7 +30,7 @@ « - @@ -55,7 +55,7 @@ - - + diff --git a/templates/default/default.css b/templates/default/default.css index 65ac720..bfff9f1 100644 --- a/templates/default/default.css +++ b/templates/default/default.css @@ -48,12 +48,18 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .title { background-image: url(images/time_bg.gif); padding: 5px; } .title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} +/* Main class used for all page wrapper tables */ +.maintable { width: 990px; } + +/* Week view */ +.weektoday { background-color: #eff; } + /* Month View */ .monthback { background-color: #A1A5A9; } -.monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } -.monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } -.monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthreg { background-color: #fff; height: 105px; text-align: left; vertical-align: top; } +.monthoff { background-color: #F2F2F2; height: 105px; text-align: left; vertical-align: top; } +.monthon { background-color: #F2F9FF; height: 105px; text-align: left; vertical-align: top; } .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } .montheventline { border-right: 1px dotted #A1A5A9; } @@ -65,7 +71,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } .yearmonth { background-color: #ccc; } .yearweek { background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; } - +.yearleft { padding-right: 5px; padding-top: 5px; padding-bottom: 5px; } +.yearmiddle { padding: 5px; } +.yearright { padding-left: 5px; padding-top: 5px; padding-bottom: 5px; } /* older styles */ @@ -139,3 +147,13 @@ body { background-color: #E5E5E5; } .query_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; } .search_style { font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; } .login_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; } + + +/* Make printed pages look nice */ +@media print { + .sidebar { width: 0px; display: none; } + .footer { display: none; } + .monthback { border-spacing: 0; } + .monthback td { border: 1px solid #606060; } + .calborder { border: 1px solid #606060; } +} diff --git a/templates/default/event.tpl b/templates/default/event.tpl index 0ac7e24..43a5d7c 100644 --- a/templates/default/event.tpl +++ b/templates/default/event.tpl @@ -8,13 +8,13 @@
-
{L_DAY}{L_DAY} {L_WEEK} {L_MONTH} {L_YEAR} + {DAY}
- +
@@ -93,8 +93,10 @@
9:00 AM
 + + + {SIDEBAR}
+
{CAL_TITLE_FULL}
-
+

{L_SUMMARY}: {EVENT_TEXT} - ({EVENT_TIMES})

{L_DESCRIPTION}: {DESCRIPTION}

diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl index 7d2ccab..5af1c40 100644 --- a/templates/default/footer.tpl +++ b/templates/default/footer.tpl @@ -1,4 +1,4 @@ -

{L_POWERED_BY} PHP iCalendar {VERSION}
+

{L_POWERED_BY} PHP iCalendar {VERSION}

diff --git a/templates/default/header.tpl b/templates/default/header.tpl index d8e07dc..cd2a631 100644 --- a/templates/default/header.tpl +++ b/templates/default/header.tpl @@ -4,7 +4,9 @@ {CALENDAR_NAME} - {DISPLAY_DATE} - + + + diff --git a/templates/default/month.tpl b/templates/default/month.tpl index 8258228..4c22f48 100644 --- a/templates/default/month.tpl +++ b/templates/default/month.tpl @@ -1,88 +1,107 @@ {HEADER}

- +
-
- - - -

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 -
- + - -
+ + + - +
+ - - - - - + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+ + + + + + +
{L_PREV}

{DISPLAY_DATE}

{L_NEXT}
+ {CALENDAR_NAME} + 		+
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
-
-
- {MONTH_LARGE|+0} - - - - - - -
-
- {CALENDAR_NAV} - -
- - - - - -
- + {MONTH_LARGE|+0} +
- - - + + +
{L_PREV}

{L_THIS_MONTHS}

{L_NEXT}
-
- - - - + +
- {START_DATE}
- {START_TIME} + +
+ + + + + - - - - - +
+ + + + + + +
{L_PREV}

{L_THIS_MONTHS}

{L_NEXT}
- {EVENT_TEXT}
{CALNAME} + + + + + + + + + + + + + +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
- {START_DATE}
- {START_TIME} - 		- {EVENT_TEXT}
{CALNAME} -
+ + + + + -
+ + 		+ + + {CALENDAR_NAV}
- - - - - - -
- {FOOTER} \ No newline at end of file diff --git a/templates/default/month_large.tpl b/templates/default/month_large.tpl index ca3d3d3..1d74ff0 100644 --- a/templates/default/month_large.tpl +++ b/templates/default/month_large.tpl @@ -1,7 +1,7 @@ - +
- diff --git a/templates/default/month_medium.tpl b/templates/default/month_medium.tpl index 8088a0e..62940f6 100644 --- a/templates/default/month_medium.tpl +++ b/templates/default/month_medium.tpl @@ -1,10 +1,10 @@ -
+
{LOOP_WEEKDAY}
+
{MONTH_TITLE}
- +
diff --git a/templates/default/print.tpl b/templates/default/print.tpl index 16b566a..fadce1b 100644 --- a/templates/default/print.tpl +++ b/templates/default/print.tpl @@ -1,12 +1,12 @@ {HEADER}
-
{LOOP_WEEKDAY}
+
- +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
- {L_VIEW_CALENDARS}

{DISPLAY_DATE}

{CALENDAR_NAME}
+ {L_VIEW_CALENDARS}
@@ -32,7 +32,7 @@
-
{DAYOFMONTH}
+
{DAYOFMONTH}
@@ -70,7 +70,7 @@
- +
diff --git a/templates/default/week.tpl b/templates/default/week.tpl index e84632c..4f18b2a 100644 --- a/templates/default/week.tpl +++ b/templates/default/week.tpl @@ -1,20 +1,20 @@ {HEADER}
-
+
- +
- +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}

{DISPLAY_DATE}

{CALENDAR_NAME}
- + @@ -56,7 +56,7 @@ - - diff --git a/templates/default/year.tpl b/templates/default/year.tpl index f15fd79..e830e9e 100644 --- a/templates/default/year.tpl +++ b/templates/default/year.tpl @@ -1,9 +1,9 @@ {HEADER}
-
{L_DAY}{L_WEEK}{L_WEEK} {L_MONTH} {L_YEAR}
+
{ALLDAY} @@ -110,7 +110,7 @@
+ {SIDEBAR}
+
-
- + - + -- cgit v1.2.3
+ @@ -41,97 +41,62 @@
@@ -32,7 +32,7 @@ - +
{L_DAY} {L_WEEK} {L_MONTH}{L_YEAR}{L_YEAR}
-
- +
- - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {MONTH_MEDIUM|01} + + - +
+ {MONTH_MEDIUM|01} + {MONTH_MEDIUM|02} - - + {MONTH_MEDIUM|03} - -
- -
+ {MONTH_MEDIUM|04} - - + {MONTH_MEDIUM|05} - - + {MONTH_MEDIUM|06}
- -
+ {MONTH_MEDIUM|07} - - + {MONTH_MEDIUM|08} - - + {MONTH_MEDIUM|09}
- -
+ {MONTH_MEDIUM|10} - - + {MONTH_MEDIUM|11} - - + {MONTH_MEDIUM|12}
+ + + {SIDEBAR}