radiant-event_calendar-extension 1.3.3 → 1.3.4

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

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

@@ -50,8 +50,15 @@
                 - else
                   n/a
             - tbody.action_cell do
-              %td
-                = render :partial => 'actions', :locals => {:calendar => calendar}
+              %td.actions
+                - if calendar.ical
+                  = link_to image('redo') + ' ' + t('refresh_calendar'), refresh_admin_ical_url(calendar.ical.id), :method => :put, :class => 'action'
+                - else
+                  %span.action.disabled
+                    = image('redo_disabled') + ' ' + t('refresh_calendar')
+                = link_to image('delta') + ' ' + t('edit_calendar'), edit_admin_calendar_path(calendar), :class => 'action'
+                = link_to image('minus') + ' ' + t('delete_calendar'), admin_calendar_path(calendar), :confirm => t('really_delete_calendar', :name => calendar.name), :method => :delete, :class => 'action'
+              
 
 - render_region :bottom do |bottom|
   - bottom.buttons do

data/event_calendar_extension.rb

@@ -1,5 +1,5 @@
 class EventCalendarExtension < Radiant::Extension
-  version "1.3.3"
+  version "1.3.4"
   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"
 

data/lib/event_calendar_tags.rb

@@ -500,6 +500,13 @@ module EventCalendarTags
     end
   end
   
+  desc %{
+    Renders a simple list of the keywords attached to this event.
+  }
+  tag 'event:keywords' do |tag|
+    %{<span class="keywords">#{tag.locals.event.keywords}</span>}
+  end
+  
   desc %{ 
     Renders a standard block listing the event and adding whatever links and descriptions are available.
     

data/radiant-event_calendar-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-event_calendar-extension}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
      "app/models/event_recurrence_rule.rb",
      "app/models/event_venue.rb",
      "app/models/ical.rb",
-     "app/views/admin/calendars/_actions.html.haml",
      "app/views/admin/calendars/_form.html.haml",
      "app/views/admin/calendars/edit.html.haml",
      "app/views/admin/calendars/help.html.erb",
@@ -97,6 +96,8 @@ Gem::Specification.new do |s|
      "lib/tasks/event_calendar_extension_tasks.rake",
      "public/icals/blank",
      "public/images/admin/calendar.png",
+     "public/images/admin/redo.png",
+     "public/images/admin/redo_disabled.png",
      "public/images/event_calendar/flag.png",
      "public/images/event_calendar/ical.png",
      "public/javascripts/admin/event_calendar.js",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - spanner
@@ -115,7 +115,6 @@ files:
 - app/models/event_recurrence_rule.rb
 - app/models/event_venue.rb
 - app/models/ical.rb
-- app/views/admin/calendars/_actions.html.haml
 - app/views/admin/calendars/_form.html.haml
 - app/views/admin/calendars/edit.html.haml
 - app/views/admin/calendars/help.html.erb
@@ -180,6 +179,8 @@ files:
 - lib/tasks/event_calendar_extension_tasks.rake
 - public/icals/blank
 - public/images/admin/calendar.png
+- public/images/admin/redo.png
+- public/images/admin/redo_disabled.png
 - public/images/event_calendar/flag.png
 - public/images/event_calendar/ical.png
 - public/javascripts/admin/event_calendar.js

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

@@ -1,6 +0,0 @@
-- calendar ||= @calendar
-%span.calendar_actions
-  - if calendar.ical
-    = link_to_unless_current image('refresh', :alt => 'Refresh calendar'), refresh_admin_ical_url(calendar.ical.id), :method => :put
-    = link_to_unless_current image('edit', :alt => 'Edit calendar'), edit_admin_calendar_path(calendar) 
-    = link_to_unless_current image('remove', :alt => 'Delete calendar'), admin_calendar_path(calendar), :confirm => "Are you sure you want to delete the #{calendar.name} calendar ?", :method => :delete