e9_polls 1.0.4 → 1.0.5

data/app/models/poll.rb

@@ -1,5 +1,10 @@
 class Poll < ::Renderable
   include E9Polls::Model
+  include E9Rails::ActiveRecord::InheritableOptions
+
+  self.options_parameters = [
+    :header_text
+  ]
 
   has_many :poll_answers
 

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

@@ -9,6 +9,11 @@
     = f.label :template, nil, :class => :req
     = f.text_field :template
 
+  = f.fields_for f.object.options do |ff|
+    .field
+      = ff.label :header, nil
+      = ff.text_field :header
+
   %fieldset.poll-answers.nested-associations
     %legend= f.label(:poll_answers)
     .fields

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

@@ -1,7 +1,10 @@
 .e9-poll{:"data-votes" => poll.votes}
+  - if poll.options.header.present?
+    .poll-header
+      = poll.options.header
+
   .poll-question
     = poll.question
-
   .poll-answers
     - if poll_answered?(poll)
       = render(:partial => 'e9_polls/polls/results_inner', :locals => { :poll => poll })

data/lib/e9_polls/version.rb

@@ -1,3 +1,3 @@
 module E9Polls
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

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

@@ -4,25 +4,25 @@
     width: '35%',
     height: '50%',
     onComplete: function() {
-      $('#cboxLoadedContent div.poll-question')
-        .replaceWith(function(i, content) {
-          return "<h1>" + content + "</h1>";
-        });
+      $('#cboxLoadedContent div.poll-question').replaceWith(function(i, content) {
+        return "<h1>" + content + "</h1>";
+      });
     }
   });
 
-  $('.renderable.poll form').live('submit', function(e) {
+  $('.renderable.poll form #poll_submit').live('click', function(e) {
     e.preventDefault();
-    var el = $(this);
+
+    var el = $(this).closest('form');
 
     // return if no selection
     if (!$("input[@name='poll[vote]']:checked").val()) return;
 
     $.ajax({
       url: el.attr('action'),
-      data: el.serializeArray(),
       dataType: 'json',
       type: 'POST',
+      data: el.serializeArray(),
       success: function(data, status, xhr) {
         el.closest('.renderable.poll').html(data.html);
       }

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

@@ -1,5 +1,6 @@
 .e9-poll { }
-.poll-question { font-size: large; font-weight: bold; padding: 0 1.2em; }
+.poll-header, .poll-question { font-size: large; padding: 0 1.2em; }
+.poll-header { font-weight: bold; }
 .poll-answers { padding: 0 1.2em; margin-bottom: 1em; }
 .poll-answer-bar { height: 15px; display: block; }
 .poll-answer-bar-outer { display: block; background-color: #eee; }

metadata

@@ -2,7 +2,7 @@
 name: e9_polls
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-07-28 00:00:00 -04:00
 default_executable: 
 dependencies: []