e9_polls 1.0.2 → 1.0.3

data/app/controllers/e9_polls/polls_controller.rb

@@ -1,11 +1,12 @@
 class E9Polls::PollsController < AdminController
+  inherit_resources
+
   include E9Rails::Helpers::Translation
   include E9Rails::Helpers::Title
   include E9Rails::Helpers::ResourceErrorMessages
   include E9Rails::Helpers::Pagination
   include E9Rails::Controllers::Orderable
-
-  inherit_resources
+  include E9::DestroyRestricted::Controller
 
   respond_to :json, :only => [:answer, :show]
 
@@ -73,6 +74,12 @@ class E9Polls::PollsController < AdminController
     end
   end
 
+  def destroy
+    destroy! do |format|
+      format.js
+    end
+  end
+
   protected
 
   def render_html_for_action(action = nil)

data/app/helpers/e9_polls/polls_helper.rb

@@ -31,8 +31,8 @@ module E9Polls::PollsHelper
     if action == :destroy
       opts[:method] = :delete
       opts.reverse_merge!({
-        :confirm => t(:"#{scope}.confirm_destroy", 
-                      :default => :"e9_polls.confirm_destroy")
+        :remote  => true, 
+        :confirm => t(:"#{scope}.confirm_destroy", :default => :"e9_polls.confirm_destroy")
       })
     end
 

data/app/models/poll.rb

@@ -34,7 +34,7 @@ class Poll < ::Renderable
   end
 
   def votes
-    poll_answers.sum(:votes)
+    poll_answers.sum(:votes).to_i
   end
 
   def percentage_for(poll_answer)

data/app/views/e9_polls/poll_answers/_poll_answer.html.haml

@@ -1,15 +1,20 @@
-.poll-answer{:id => poll_answer.to_anchor}
+.poll-answer{:id => poll_answer.to_anchor, :"data-votes" => poll_answer.votes, :"data-percentage" => poll_answer.percentage}
+
   - if f = local_assigns[:f]
-    - unless poll_answered?(poll_answer.poll)
+    - if !poll_answered?(poll_answer.poll)
       = f.radio_button :vote, poll_answer.id, :id => "#{poll_answer.to_anchor}_input"
     %label{:for => "#{poll_answer.to_anchor}_input"}
       = poll_answer.value
       - if poll_answered?(poll_answer.poll, poll_answer)
         %span.poll-answer-voted
           = t(:your_vote, :scope => :e9_polls)
+
   - else
     %span.poll-answer-value
       = poll_answer.value
+      - if poll_answered?(poll_answer.poll, poll_answer)
+        %span.poll-answer-voted
+          = t(:your_vote, :scope => :e9_polls)
     %span.poll-answer-bar-outer
       %span.poll-answer-bar{:style => "width:#{poll_answer.percentage}%", :class => "pab-#{cycle(*(1..(E9Polls.bar_css_class_count)).to_a)}"}
     %span.poll-answer-votes

data/app/views/e9_polls/polls/_form.html.haml

@@ -10,10 +10,11 @@
     = f.text_field :template
 
   %fieldset.poll-answers.nested-associations
-    %legend
-      %span= f.label(:poll_answers)
+    %legend= f.label(:poll_answers)
+    .fields
+      = render_nested_attribute_association(:poll_answers, f)
+    .actions
       = link_to_add_nested_attribute(:poll_answers)
-    = render_nested_attribute_association(:poll_answers, f)
 
   - unless request.xhr?
     = render 'shared/admin/region_type_select', :f => f

data/app/views/e9_polls/polls/_poll.html.haml

@@ -1,4 +1,4 @@
-.e9-poll
+.e9-poll{:"data-votes" => poll.votes}
   .poll-question
     = poll.question
 

data/app/views/e9_polls/polls/_results.html.haml

@@ -1,4 +1,4 @@
-.e9-poll
+.e9-poll{:"data-votes" => poll.votes}
   .poll-question
     = poll.question
     

data/config/locales/en.yml

@@ -33,6 +33,7 @@ en:
       models:
         poll:
           attributes:
+            delete_restricted: "This poll is being used in a layout and/or by a page. You can not delete it until you remove all instances where it is used."
             vote:
               already_voted: "Sorry but you've already voted on this poll!"
               no_argument: "Oops, sorry but your vote was not able to be processed!"

data/lib/e9_polls/global_helper.rb

@@ -2,7 +2,7 @@ module E9Polls
   module GlobalHelper
     def poll_answered?(poll, answer = nil)
       if cookie = e9_polls_cookie
-        cookie[poll.id] && !answer || cookie[poll.id].to_s == answer.id.to_s
+        cookie[poll.id] and !answer || cookie[poll.id].to_s == answer.id.to_s
       end
     end
 

data/lib/e9_polls/version.rb

@@ -1,3 +1,3 @@
 module E9Polls
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/generators/e9_polls/templates/javascript.js

@@ -77,7 +77,7 @@
     e.preventDefault();
 
     var $this   = $(this), 
-        $parent = $this.closest('.nested-associations'),
+        $fields = $this.closest('.nested-associations').find('.fields'),
         obj,
         template,
         index;
@@ -88,7 +88,7 @@
 
     template = obj.template.replace(new RegExp(obj.index++, 'g'), obj.index);
 
-    $(template).appendTo($parent);
+    $(template).appendTo($fields);
 
     try { $.colorbox.resize() } catch(e) {}
   });

data/lib/generators/e9_polls/templates/stylesheet.css

@@ -7,7 +7,7 @@
 .poll-answer { margin: 1em 0; clear: both; }
 .poll-answer textarea { height: 3em; margin-bottom: 0; }
 .poll-answer .field { margin-bottom: 0; }
-form.edit-poll .actions { margin-top: 1em; }
+form.edit_poll .actions { padding: 0.5em 0; }
 
 /*  Poll answers or poll percentage.  */
 .poll-answer-votes { display: none; }

metadata

@@ -2,7 +2,7 @@
 name: e9_polls
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -70,7 +70,6 @@ files:
 - app/views/e9_polls/polls/_results.html.haml
 - app/views/e9_polls/polls/_results_inner.html.haml
 - app/views/e9_polls/polls/_table.html.haml
-- app/views/e9_polls/polls/create.js.erb
 - app/views/e9_polls/polls/destroy.js.erb
 - app/views/e9_polls/polls/edit.html.haml
 - app/views/e9_polls/polls/index.html.haml

data/app/views/e9_polls/polls/create.js.erb

@@ -1,6 +0,0 @@
-<% if resource.errors.any? %>
-  $('form .errors').html("<%= escape_javascript(resource_error_messages!) %>");
-  $.fn.colorbox.resize();
-<% else %>
-  window.location.reload(true);
-<% end %>