A bit of work on #22 and other fixes

DemocracyOS · Sep 16, 2013 · 48077d5 · 48077d5
1 parent a8b21a2
commit 48077d5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/lib/homepage/main.css b/lib/homepage/main.css
@@ -287,13 +287,13 @@ article.proposal .share-links a.google-plus:hover {
   background: #c0392b;
 }
 .proposal-options {
-  width: 200px;
-  position: absolute;
   top: 30px;
   right: 20px;
 }
 .proposal-options .vote-options .vote-option {
-  display: block;
+  display: inline-block;
+  width: 200px;
+  margin-right: 20px;
   color: #fff;
   text-transform: uppercase;
   font-weight: bold;
@@ -323,6 +323,9 @@ article.proposal .share-links a.google-plus:hover {
 .proposal-options .vote-options .vote-option.vote-abstain {
   background-color: #666;
 }
+.proposal-options .vote-options .vote-option.delegate-vote {
+  background-color: #3498db;
+}
 .proposal-options .vote-box,
 .proposal-options .results-box {
   border: 1px solid #eee;

diff --git a/lib/homepage/main.styl b/lib/homepage/main.styl
@@ -282,14 +282,14 @@ article.proposal
 
 
 .proposal-options
-	width: 200px;
-	position: absolute;
 	top: 30px;
 	right: spacing;
 
 	.vote-options
 		.vote-option
-			display: block;	
+			display: inline-block;
+			width: 200px;
+			margin-right: 20px;	
 			color: white;
 			text-transform: uppercase;
 			font-weight: bold;
@@ -313,6 +313,8 @@ article.proposal
 
 			&.vote-abstain
 				background-color: #666;
+			&.delegate-vote
+				background-color: #3498db;
 
 	.vote-box, .results-box
 		border: 1px solid #eee;

diff --git a/lib/proposal-options/component.json b/lib/proposal-options/component.json
@@ -8,7 +8,8 @@
     "visionmedia/superagent": "*",
     "visionmedia/page.js": "*",
     "visionmedia/jade": "*",
-    "cristiandouce/Chart.js": "*"
+    "cristiandouce/Chart.js": "*",
+    "discore/closest": "*"
   },
   "local": [ ],
   "scripts": [ "proposal-options.js" ],

diff --git a/lib/proposal-options/options.jade b/lib/proposal-options/options.jade
@@ -22,11 +22,6 @@
       a.vote-option.vote-no(href="#", data-proposal=proposal.id)
         i.flaticon.solid.thumbs-up-1
         span Negative
-
-      a(href="") Ver resultados
-
-  //- h5 Delegations
-
-  .results-box
-    h5 Results
-    canvas(id="vote-chart", width="200", height="220")
+      a.vote-option.delegate-vote(href="#", data-proposal=proposal.id)
+        i.flaticon.solid.thumbs-up-1
+        span Delegate
diff --git a/lib/proposal-options/proposal-options.js b/lib/proposal-options/proposal-options.js
@@ -8,7 +8,9 @@ var page = require('page')
   , classes = require('classes')
   , request = require('superagent')
   , options = require('./options')
-  , Chart = require('Chart.js');
+  , closest = require('closest')
+  , Chart = require('Chart.js')
+  , log = require('debug')('proposal-options');
 
 /**
  * Expose ProposalOptions.
@@ -65,7 +67,7 @@ ProposalOptions.prototype.showvote = function(ev) {
 ProposalOptions.prototype.vote = function(ev) {
   ev.preventDefault();
 
-  var target = ev.target.parentNode
+  var target = closest(ev.target, '.vote-option') 
     , id = target.getAttribute('data-proposal')
     , value;
 
@@ -81,20 +83,20 @@ ProposalOptions.prototype.vote = function(ev) {
   .send({value:value})
   .end(function (err, res) {
     if (err) {
-      console.log(err);
+      log(err);
       return;
     };
 
     if (res.body.error) {
-      console.log(res.body.error);
+      log(res.body.error);
       if (res.body.action && res.body.action.redirect) {
         return window.location.replace(res.body.action.redirect);
       };
     }
     // reload location.
     page(window.location.pathname);
   });
-}
+} 
 
 /**
  * Render options
@@ -104,7 +106,7 @@ ProposalOptions.prototype.vote = function(ev) {
  */
 
 ProposalOptions.prototype.render = function() {
-  this.renderChart();
+  // this.renderChart();
   return this.options;
 }