app/views/admin/calendars/_actions.html.haml public/images/admin/edit.png public/images/admin/refresh.png public/images/admin/remove.png public/images/event_calendar/ical16.png public/stylesheets/calendar.css @@ -2,6 +2,7 @@ require 'rubygems' require 'net/http' require 'vpim' require 'date' +require 'ftools' class Ical < ActiveRecord::Base belongs_to :calendar @@ -12,7 +13,9 @@ class Ical < ActiveRecord::Base # Download and save the .ics calendar file, parse and save events to database def refresh - filename = RAILS_ROOT + "/public/" + @@calendars_path + "/" + self.calendar.slug + ".ics" + filepath = File.join RAILS_ROOT, "public", ics_path + filename = File.join filepath, ics_file + File.makedirs filepath # Retrieve calendar specified by URL and Name attributes begin @@ -69,9 +72,9 @@ class Ical < ActiveRecord::Base end def ics_file - "#{self.calendar.name}.ics" + "#{self.calendar.slug}.ics" end - + def refresh_automatically? refresh_interval.nil? || refresh_interval.to_i != 0 end app/models/ical.rb @@ -4,6 +4,8 @@ - main.edit_header do %h1 Edit Calendar Subscription + = render :partial => 'actions' + - main.edit_form do - form_for :calendar, @calendar, :url => admin_calendar_path(@calendar), :html => { :method => "put", :multipart => true } do |f| app/views/admin/calendars/edit.html.haml @@ -44,11 +44,7 @@ - tbody.action_cell do %td - = link_to 'Refresh', refresh_admin_ical_url(calendar.ical.id), :method => :put - | - = link_to 'Edit', edit_admin_calendar_path(calendar) - | - = link_to 'Delete', admin_calendar_path(calendar), :confirm => "Are you sure you want to delete the #{calendar.name} calendar ?", :method => :delete + = render :partial => 'actions', :locals => {:calendar => calendar} - render_region :bottom do |bottom| - bottom.buttons do app/views/admin/calendars/index.html.haml @@ -3,11 +3,7 @@ %h1 = @calendar.name calendar - -%p - = link_to 'Edit', edit_admin_calendar_path(@calendar) - | - = link_to 'Refresh', refresh_admin_ical_url(@calendar.ical.id), :method => :put + = render :partial => 'actions' %div#calendar_help %h3 app/views/admin/calendars/show.html.haml @@ -138,13 +138,14 @@ module EventCalendarTags desc %{ Renders a sensible description of the currently displayed calendars, with links to each separate calendar. + Pass with_subscription="true" to append a little ical subscription icon to each link. *Usage:* <pre><code><r:calendars:summary /></code></pre> } tag 'calendars:summary' do |tag| result = "Showing events from the " - result << tag.render('calendars:list') + result << tag.render('calendars:list', tag.attr.dup) result << ' ' result << pluralize(tag.locals.calendars.length, 'calendar') result << %{ <a href="#{tag.render('url')}" class="note">(show all)</a>} if calendar_category @@ -154,15 +155,19 @@ module EventCalendarTags desc %{ Renders a plain list (in sentence form) of the currently displayed calendars, with links to each separate calendar. + Pass with_subscription="true" to append a little ical subscription icon to each link. *Usage:* <pre><code><r:calendars:list /></code></pre> } tag 'calendars:list' do |tag| links = [] + with_subscription = (tag.attr['with_subscription'] == 'true') tag.locals.calendars.each do |calendar| tag.locals.calendar = calendar - links << tag.render("calendar:link") + link = tag.render("calendar:link") + link << tag.render("calendar:ical_icon") if with_subscription + links << link end links.to_sentence end @@ -286,6 +291,42 @@ module EventCalendarTags %{<a href="#{tag.render('calendar:url')}#{anchor}"#{attributes}>#{text}</a>} end + desc %{ + Renders the path to the local .ics file for this calendar, suitable for read-only subscription in iCal or other calendar programs. + + Usage: + <pre><code><r:calendar:ical_url /></code></pre> + } + tag "calendar:ical_url" do |tag| + tag.locals.calendar.to_ics + end + + desc %{ + Renders a link to the local .ics file for this calendar, suitable for read-only subscription in iCal or other calendar programs. + Link attributes are passed through as usual. + + Usage: + <pre><code><r:calendar:ical_link /></code></pre> + } + tag "calendar:ical_link" do |tag| + options = tag.attr.dup + anchor = options['anchor'] ? "##{options.delete('anchor')}" : '' + attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip + attributes = " #{attributes}" unless attributes.empty? + text = tag.double? ? tag.expand : tag.render('calendar:name') + %{<a href="#{tag.render('calendar:ical_url')}#{anchor}"#{attributes}>#{text}</a>} + end + + desc %{ + Renders a small graphical link to the local .ics file for this calendar. + + Usage: + <pre><code><r:calendar:ical_icon /></code></pre> + } + tag "calendar:ical_icon" do |tag| + %{<a href="#{tag.render('calendar:ical_url')}" class="ical"><img src="/images/event_calendar/ical16.png" alt="subscribe to #{tag.render('calendar:name')}" width="16" height="16" /></a>} + end + # Event:* tags # display attributes of a single event lib/event_calendar_tags.rb @@ -26,6 +26,14 @@ table.index td.subscription-title { font-weight: bold; } +span.calendar_actions img { + opacity: 0.5; +} + +span.calendar_actions a img { + opacity: 1; +} + /**** calendar/show ****/ table.calendar { @@ -63,6 +71,15 @@ table.calendar td div { overflow: hidden; } +table.calendar td.other_month { + color: #ccc; + background-color: white; +} + +table.calendar td.weekend_day { + background-color: #eee; +} + table.calendar td.eventful { background-color: #fee; } @@ -71,21 +88,12 @@ table.calendar td.eventful_weekend { background-color: #edd; } -table.calendar td.other_month { - color: #ccc; - background-color: white; -} - table.calendar td.today { background-color: #eef; font-weight: bold; color: #00c; } -table.calendar td.weekend_day { - background-color: #eee; -} - table.calendar td.weekend_today { background-color: #dde; } @@ -118,3 +126,53 @@ table.calendar td ul { padding: 0 0 0 12px; list-style: square; } + +/**** calendar/new ****/ + +#content .form-area p, #content .form-area p.title { + margin-bottom: 10px; +} + +#content .form-area p label { + display: block; +} + +#content .form-area p.thirdwidth { + float: left; + width: 31%; + margin-right: 2%; +} + +#content .form-area p.halfwidth { + float: left; + width: 48%; + margin-right: 2%; +} + +#content .form-area p.fullwidth { + clear: both; + width: 100%; + margin-right: 2%; +} + +#content .form-area p input.textbox { + width: 100%; + border:1px solid #CDC295; + font-family:Monaco,"Courier New",Courier,monospace; + font-size:95%; + padding: 4px; +} + +#content .form-area p textarea { + width: 100%; + height: 60px; + border:1px solid #CDC295; + font-family:Monaco,"Courier New",Courier,monospace; + font-size:95%; + padding: 4px; +} + +#content .form-area span.info { + font-size: 80%; + color: #7D796C; +} public/stylesheets/admin/calendar.css 11290f24d958305eb53b4bea64db6aaf86711caa will will@spanner.org http://github.com/radiant/radiant-event-calendar-extension/commit/2becadee1ae3eef8df792fbd9be25f3b14613c18 2becadee1ae3eef8df792fbd9be25f3b14613c18 2009-08-20T03:38:43-07:00 2009-08-20T03:38:43-07:00 ical subscription links and general tidying up feabfb6ab7cefe87364204cebf553a8b15bb802f will will@spanner.org