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/green/calendar_nav.tpl | 151 -------------------------- templates/green/day.tpl | 104 ------------------ templates/green/default.css | 16 +++ templates/green/header.tpl | 4 +- templates/green/month.tpl | 88 --------------- templates/green/month_large.tpl | 42 -------- templates/green/month_medium.tpl | 45 -------- templates/green/sidebar.tpl | 225 --------------------------------------- templates/green/year.tpl | 140 ------------------------ 9 files changed, 19 insertions(+), 796 deletions(-) delete mode 100644 templates/green/calendar_nav.tpl delete mode 100644 templates/green/day.tpl delete mode 100644 templates/green/month.tpl delete mode 100644 templates/green/month_large.tpl delete mode 100644 templates/green/month_medium.tpl delete mode 100644 templates/green/sidebar.tpl delete mode 100644 templates/green/year.tpl (limited to 'templates/green') diff --git a/templates/green/calendar_nav.tpl b/templates/green/calendar_nav.tpl deleted file mode 100644 index a48cfbe..0000000 --- a/templates/green/calendar_nav.tpl +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - -
- {MONTH_SMALL|-1} - - - - - - -
- 		- - - - - - -
- - - - - - - -
{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} - -
-
- - - - - - -
-
- 		- {MONTH_SMALL|+1} - - - - - - -
-
diff --git a/templates/green/day.tpl b/templates/green/day.tpl deleted file mode 100644 index c66d40f..0000000 --- a/templates/green/day.tpl +++ /dev/null @@ -1,104 +0,0 @@ -{HEADER} -
- - - - - - -
- - - - - - - - - - -
- - - - - - - - -

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 -
- - - - - - - -
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
-
-
- - - - - - - - -
- « - - {DAY} - - » -
-
-
- -
- {ALLDAY} -
- -
- - - - - - - - - - - - - - - - - - - - - -
-
{CONFIRMED}{EVENT_START} - {EVENT_END}
-
{EVENT}
-
- -
9:00 AM 
 
 
 
-
- - - - - - -
- 		- {SIDEBAR} -
-
-{FOOTER} - diff --git a/templates/green/default.css b/templates/green/default.css index 96c47f0..4b9ef4b 100644 --- a/templates/green/default.css +++ b/templates/green/default.css @@ -66,6 +66,9 @@ 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; } + /* Month View */ .monthback { background-color: #A1A5A9; } @@ -83,6 +86,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 */ @@ -160,3 +166,13 @@ body { background-image: url(images/background.gif); } .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/green/header.tpl b/templates/green/header.tpl index d8e07dc..cd2a631 100644 --- a/templates/green/header.tpl +++ b/templates/green/header.tpl @@ -4,7 +4,9 @@ {CALENDAR_NAME} - {DISPLAY_DATE} - + + + diff --git a/templates/green/month.tpl b/templates/green/month.tpl deleted file mode 100644 index 7dcff53..0000000 --- a/templates/green/month.tpl +++ /dev/null @@ -1,88 +0,0 @@ -{HEADER} -
- - - - -
- - - - - -

{DISPLAY_DATE}

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

{L_THIS_MONTHS}

{L_NEXT}
-
- - - - - - - - - - - - - -
- {START_DATE}
- {START_TIME} - 		- {EVENT_TEXT}
{CALNAME} -
- {START_DATE}
- {START_TIME} - 		- {EVENT_TEXT}
{CALNAME} -
-
- - - - - - -
- -
-{FOOTER} diff --git a/templates/green/month_large.tpl b/templates/green/month_large.tpl deleted file mode 100644 index ca3d3d3..0000000 --- a/templates/green/month_large.tpl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -
-
{LOOP_WEEKDAY}
-
-
- {DAY} -
- {ALLDAY} - {EVENT} - 		-
- {DAY} -
- {ALLDAY} - {EVENT} - 		-
- {DAY} -
- {ALLDAY} - {EVENT} -
diff --git a/templates/green/month_medium.tpl b/templates/green/month_medium.tpl deleted file mode 100644 index 96e8e6b..0000000 --- a/templates/green/month_medium.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - -
{MONTH_TITLE}
- - - - - - - - - - - - - - - - - - - - - -
{LOOP_WEEKDAY}
- {DAY} - - {DAY} -
- {ALLDAY} - {EVENT} -
- 		- {DAY} -
- {ALLDAY} - {EVENT} -
-
-
diff --git a/templates/green/sidebar.tpl b/templates/green/sidebar.tpl deleted file mode 100644 index 8a96ae6..0000000 --- a/templates/green/sidebar.tpl +++ /dev/null @@ -1,225 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - -
{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} - -
-
- - - - - - -
-
- - - - - - - - -
{L_JUMP}
-
-
-
-
-
-
-
- - -
- - {SEARCH_BOX} - - -
- - - -
- -
-
{L_PICK_MULTIPLE}:
-
- - -
- -
-
-
- - - - - - -
-
- - - - - - - - - - -
{L_TOMORROWS}
-
- - {T_ALLDAY}
- - - • {T_EVENT}
- -
-
- - - - - - -
-
- - - - - - - - - - - - -
{L_TODO}
-
- - - - - - - - - - - - - - - - - - - - - - -
{VTODO_ARRAY} {VTODO_TEXT}
{VTODO_ARRAY} {VTODO_TEXT}
{VTODO_ARRAY} {VTODO_TEXT}
-
-
- - - - - - -
-
- - - - -{MONTH_SMALL|-1} - - - - - - -
-
- -{MONTH_SMALL|+0} - - - - - - -
-
- -{MONTH_SMALL|+1} - - - - - - -
diff --git a/templates/green/year.tpl b/templates/green/year.tpl deleted file mode 100644 index adb9eb4..0000000 --- a/templates/green/year.tpl +++ /dev/null @@ -1,140 +0,0 @@ -{HEADER} -
- - - - - -
- - - - -
- - - - - - -
-   - - - - - - - -
- [Previous Year] - -

{THIS_YEAR}

- 		- [Next Year] -
- 		- - - - - - - -
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {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} -
-
-{FOOTER} -- cgit v1.2.3