radiant-event_calendar-extension 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/app/views/admin/calendars/index.html.haml

@@ -59,5 +59,3 @@
       = pagination_for @calendars
       %ul
         %li= link_to image('plus') + " " + "new calendar", new_admin_calendar_url
-        %li= link_to "évent list", admin_events_url
-        %li= link_to "venue list", admin_event_venues_url

data/app/views/admin/event_venues/index.html.haml

@@ -32,5 +32,3 @@
         = pagination_for @event_venues
         %ul
           %li= link_to image('plus') + " " + "new venue", new_admin_event_venue_url
-          %li= link_to "évent list", admin_events_url
-          %li= link_to "calendar list", admin_calendars_url

data/app/views/admin/event_venues/remove.html.haml

@@ -31,9 +31,3 @@
     %input.button{:type=>"submit", :value=>"Delete location"}
     or
     = link_to 'Cancel', admin_event_venues_url
-
-#actions
-  %ul
-    %li= link_to "event list", admin_events_url
-    %li= link_to "calendar list", admin_calendars_url
-    %li= link_to "venue list", admin_event_venues_url

data/app/views/admin/events/index.html.haml

@@ -45,5 +45,3 @@
         = pagination_for @events
         %ul
           %li= link_to image('plus') + " " + "new event", new_admin_event_url
-          %li= link_to "calendar list", admin_calendars_url
-          %li= link_to "venue list", admin_event_venues_url

data/app/views/admin/events/remove.html.haml

@@ -14,9 +14,3 @@
     %input.button{:type=>"submit", :value=>"Delete event"}/
     or
     = link_to 'Cancel', admin_events_url
-    
-#actions
-  %ul
-    %li= link_to "event list", admin_events_url
-    %li= link_to "calendar list", admin_calendars_url
-    %li= link_to "venue list", admin_event_venues_url

data/app/views/events/_event.html.haml

@@ -24,7 +24,7 @@
         - if event.event_venue
           at
           - if event.event_venue.url
-            = link_to event.event_venue.title, event.event_venue.url
+            = link_to event.event_venue.title, event.event_venue.url, :class => 'location'
           - else
             = event.event_venue.title
           = event.event_venue.address

data/event_calendar_extension.rb

@@ -1,5 +1,5 @@
 class EventCalendarExtension < Radiant::Extension
-  version "1.1.1"
+  version "1.1.2"
   description "An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)"
   url "http://github.com/radiant/radiant-event_calendar-extension"
 
@@ -27,8 +27,10 @@ class EventCalendarExtension < Radiant::Extension
     end
     
     if respond_to?(:tab)
-      tab("Content") do
-        add_item("Calendar", '/admin/event_calendar')
+      tab("Calendar") do
+        add_item("Events", '/admin/event_calendar')
+        add_item("Calendars", '/admin/event_calendar/calendars')
+        add_item("Locations", '/admin/event_calendar/event_venues')
       end
     else
       admin.tabs.add "Calendar", '/admin/event_calendar', :after => "Snippets", :visibility => [:all]

data/lib/event_calendar_tags.rb

@@ -69,6 +69,23 @@ module EventCalendarTags
     end
     result
   end
+
+  desc %{ 
+    Equivalent to calling events:each with a limit of 1. All the usual attributes are passed through.
+    If no events match the specification, nothing is returned.
+    
+    To show the next event in a particular calendar:
+
+    <pre><code><r:events:first calendar="slug"><r:event:summary /></r:events:first></code></pre>
+  }
+
+  tag "events:first" do |tag|
+    tag.locals.events ||= get_events(tag)
+    if tag.locals.event = tag.locals.events.first
+      tag.locals.calendar = tag.locals.event.calendar
+      tag.expand
+    end
+  end
     
   tag "if_events" do | tag|
     tag.locals.events ||= get_events(tag)
@@ -442,7 +459,7 @@ module EventCalendarTags
   #todo: venue:* tags
   
   desc %{ 
-    If the current event has a venue, this renders a sensible description and link. If not, it returns the location string.
+    Renders a sensible location string, based on whatever venue information is available.
 
     Usage:
     <pre><code><r:event:venue /></code></pre> 
@@ -450,10 +467,12 @@ module EventCalendarTags
   tag "event:venue" do |tag|
     if venue = tag.locals.event.event_venue
       if venue.url
-        %{<a href="#{venue.url}">#{venue.title}</a>, #{venue.address}}
+        html = %{<a class="location" href="#{venue.url}">#{venue.title}</a>}
       else
-        %{#{venue.title}, #{venue.address}}
+        html = %{<span class="location">venue.title</span>}
       end
+      html << %{, <span class="address">#{venue.address}</span>} unless venue.address.blank?
+      html
     else
       tag.render('event:location')
     end
@@ -520,11 +539,7 @@ module EventCalendarTags
     <pre><code><r:event:time />: <r:event:title /></code></pre> 
   }
   tag "event:time" do |tag|
-    if tag.locals.event.all_day?
-      "All day"
-    else
-      tag.locals.event.start_time
-    end
+    tag.locals.event.summarize_start
   end
 
   [:start, :end].each do |attribute|
@@ -688,7 +703,7 @@ module EventCalendarTags
   
   def _datemark(date=Time.now)
     %{
-      <div class="datemark"><span class="month">#{Date::ABBR_MONTHNAMES[date.month]}</span><span class="dom">#{"%02d" % date.mday}</span></div>
+      <div class="datemark"><span class="mon">#{Date::ABBR_MONTHNAMES[date.month]}</span><span class="dom">#{"%02d" % date.mday}</span></div>
     }
   end
   

data/radiant-event_calendar-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-event_calendar-extension}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-10-05}
   s.description = %q{An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -98,6 +98,7 @@ Gem::Specification.new do |s|
      "pkg/radiant-event_calendar-extension-1.0.1.gem",
      "pkg/radiant-event_calendar-extension-1.0.2.gem",
      "pkg/radiant-event_calendar-extension-1.1.0.gem",
+     "pkg/radiant-event_calendar-extension-1.1.1.gem",
      "public/icals/blank",
      "public/images/admin/calendar.png",
      "public/images/event_calendar/calendarlinkbg.png",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +01:00
+date: 2010-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,6 +181,7 @@ files:
 - pkg/radiant-event_calendar-extension-1.0.1.gem
 - pkg/radiant-event_calendar-extension-1.0.2.gem
 - pkg/radiant-event_calendar-extension-1.1.0.gem
+- pkg/radiant-event_calendar-extension-1.1.1.gem
 - public/icals/blank
 - public/images/admin/calendar.png
 - public/images/event_calendar/calendarlinkbg.png