Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v diff -u -r1.30.2.2 -r1.30.2.3 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 23 May 2008 21:18:59 -0000 1.30.2.2 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 10 Oct 2008 13:08:00 -0000 1.30.2.3 @@ -191,6 +191,7 @@ sync with Outlook Thursday Time: + Time Title: Title to Index: openacs-4/packages/calendar/www/view-list-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/calendar/www/view-list-display.adp 4 Jan 2008 15:47:48 -0000 1.15 +++ openacs-4/packages/calendar/www/view-list-display.adp 10 Oct 2008 13:08:00 -0000 1.15.2.1 @@ -1,5 +1,4 @@ - - - - - + - - - - - - - - - - - -
+
[ 1  |  7 @@ -12,61 +11,6 @@  |  60 ] -
-

@start_month@ @start_day@ @start_year@ – @end_month@ @end_day@ @end_year@

-
- - - -
- - - - - - - - - - - - - - - -
- @items.weekday@, @items.start_date@     @items.start_time@ – @items.end_time@ -
- #calendar.Event# @items.event_name@ - - (@items.calendar_name@) - - -
- #calendar.Description# - none@items.description;noquote@ - - #calendar.Print# -
- -
- - - -
#calendar.No_Items#
+ Index: openacs-4/packages/calendar/www/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v diff -u -r1.28 -r1.28.2.1 --- openacs-4/packages/calendar/www/view-list-display.tcl 15 May 2007 20:14:21 -0000 1.28 +++ openacs-4/packages/calendar/www/view-list-display.tcl 10 Oct 2008 13:08:00 -0000 1.28.2.1 @@ -113,10 +113,7 @@ end_time \ today \ description \ - name_style_class \ - description_style_class \ - container_style_class \ - event_print_url + calendar_name set last_pretty_start_date "" # Loop through the events, and add them @@ -143,11 +140,11 @@ # Localize set pretty_weekday [lc_time_fmt $ansi_start_date "%A"] - set pretty_start_date [lc_time_fmt $ansi_start_date "%x"] - set pretty_end_date [lc_time_fmt $ansi_end_date "%x"] + set pretty_start_date [lc_time_fmt $ansi_start_date "%Q"] + set pretty_end_date [lc_time_fmt $ansi_end_date "%Q"] set pretty_start_time [lc_time_fmt $ansi_start_date "%X"] set pretty_end_time [lc_time_fmt $ansi_end_date "%X"] - set pretty_today [lc_time_fmt $ansi_today "%x"] + set pretty_today [lc_time_fmt $ansi_today "%Q"] set start_date_seconds [clock scan [lc_time_fmt $ansi_start_date "%Y-%m-%d"]] set today_seconds [clock scan [lc_time_fmt $ansi_today "%Y-%m-%d"]] @@ -191,6 +188,10 @@ set url_stub $url_stubs($calendar_id) } + if { !$show_calendar_name_p } { + set calendar_name "" + } + multirow append items \ $name \ [subst $event_url_template] \ @@ -203,12 +204,39 @@ $pretty_end_time \ $today \ $description \ - "calendar-ItemListName" \ - "calendar-ItemListDescription" \ - "calendar-ItemListContainer" \ - "[subst $event_url_template]&export=print" + $calendar_name } +template::list::create -name "items-list" -multirow items -no_data [_ calendar.No_Items] -caption $title -elements { + start_date { + label "[_ calendar.Date_1]" + } + time { + label "[_ calendar.Time_1]" + display_template { + + @items.start_time@ – @items.end_time@ + + + #calendar.All_Day_Event# + + } + } + event { + label "[_ calendar.Event]" + display_col event_name + link_url_col event_url + link_html {title "#calendar.goto_items_event_name#"} + } + calendar { + label "[_ calendar.Calendar]" + display_col calendar_name + } + description { + label "[_ calendar.Description]" + } +} + set start_year [lc_time_fmt $start_date "%Y"] set start_month [lc_time_fmt $start_date "%B"] set start_day [lc_time_fmt $start_date "%d"] @@ -245,11 +273,11 @@ } -ad_form -name frmdays -has_submit 1 -html {style float:right} -export $noprocessing_vars -form { +ad_form -name frmdays -has_submit 1 -html {class "inline-form"} -export $noprocessing_vars -form { {period_days:integer,optional {label ""} {html {size 3} {maxlength 3} {class "cal-input-field"}} {value "$period_days"} {after_html "[_ calendar.days]"} } -} -on_submit { } \ No newline at end of file +} -on_submit { } Index: openacs-4/packages/calendar/www/resources/calendar-hc.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar-hc.css,v diff -u -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/calendar/www/resources/calendar-hc.css 16 Jun 2008 08:39:06 -0000 1.1.2.7 +++ openacs-4/packages/calendar/www/resources/calendar-hc.css 10 Oct 2008 13:08:00 -0000 1.1.2.8 @@ -46,6 +46,7 @@ .cal-table-caption { color: inherit; + background: #222222; } /* at-a-glance ---------------------------------------------------*/ @@ -157,9 +158,8 @@ /* view-list-display ---------------------------------------------------*/ -.cal-table-list thead { - background-color:#555555; - color: inherit; +.list-table caption { + background: #222222; } /* END view-list-display ---------------------------------------------------*/ Index: openacs-4/packages/calendar/www/resources/calendar.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v diff -u -r1.12.2.10 -r1.12.2.11 --- openacs-4/packages/calendar/www/resources/calendar.css 16 Jun 2008 08:39:06 -0000 1.12.2.10 +++ openacs-4/packages/calendar/www/resources/calendar.css 10 Oct 2008 13:08:00 -0000 1.12.2.11 @@ -71,8 +71,8 @@ .cal-table-caption { font-size: 1.2em; font-weight: bold; - color: #646c61; margin: 1em; + background: #fff; } .cal-table-caption img { @@ -178,7 +178,7 @@ .day-time-1 { border:1px #ffffff solid; - background-color:#D8E0E6; + background-color:#F0EFF0; height:43px; } .day-time-1 p, .day-time-2 p { @@ -188,7 +188,7 @@ .day-time-2 { border:1px #ffffff solid; - background-color:#e8edf1; + background-color:#f0eff0; height:43px; } @@ -273,31 +273,13 @@ /* view-list-display ---------------------------------------------------*/ -.cal-table-list { - padding:5px; +.list-table caption { + font-size: 1.2em; + font-weight: bold; + margin: 1em; + background: #fff; } -.cal-table-list td { - padding-top:2px; - padding-bottom:2px; - padding-left:5px; - padding-right:5px; -} - -.cal-table-list thead { - background-color:#547083; - font-weight:bold; - color:#ffffff; - padding:0px; -} - -.cal-table-list tbody td { - padding-left:5px; - text-align:left; - padding-top:5px; - padding-bottom:5px; -} - /* END view-list-display ---------------------------------------------------*/ @@ -386,40 +368,6 @@ opacity:.9; } -.calendar-classItem { - background-color:#F2E18F; -} - -.calendar-communityItem { - background-color:#DBC9C3; -} - -.calendar-personalItem { - background-color:#CBD3AB; -} - - -.cal-table-list .calendar-personalItemListName { - background-color:#CBD3AB; -} -.cal-table-list .calendar-personalItemListDescription { - border:1px #CBD3AB solid; -} - -.cal-table-list .calendar-classItemListName { - background-color:#F2E18F; -} -.cal-table-list .calendar-classItemListDescription { - border:1px #F2E18F solid; -} - -.cal-table-list .calendar-communityItemListName { - background-color:#DBC9C3; -} -.cal-table-list .calendar-communityItemListDescription { - border:1px #DBC9C3 solid; -} - .bottomnavbar { margin-top:20px; background:#89A2B3;