From: John Dong Date: Wed, 29 Aug 2007 21:52:42 +0000 (-0400) Subject: Merge jdong X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/94f498a0718776efa90193c918c6dd22f51329ac?hp=5ccb47e8c8b3c782147b9f0ca7c45fc4dd5d034c Merge jdong --- diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb index ff29d8e..b80b5d3 100644 --- a/app/controllers/graph_controller.rb +++ b/app/controllers/graph_controller.rb @@ -74,7 +74,7 @@ class GraphController < ApplicationController :data => data, :interval_labels => labels, :title => "Voters Over Time", - :size => "700x400", + :size => "270x230", :x_axis_label => scale, :y_axis_label => "Number of Votes") send_data(*graph.output) diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index ea7711f..1e5b142 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -212,6 +212,7 @@ class QuickvoteController < ApplicationController @results = @election.results @candidates = {} @election.candidates.each {|c| @candidates[c.id] = c} + @sidebar_content = render_to_string :partial => 'results_sidebar' end def my_quickvotes diff --git a/app/views/quickvote/_results_sidebar.rhtml b/app/views/quickvote/_results_sidebar.rhtml new file mode 100644 index 0000000..704c052 --- /dev/null +++ b/app/views/quickvote/_results_sidebar.rhtml @@ -0,0 +1,2 @@ +<%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%> + diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml index 37e62c6..94081e6 100644 --- a/app/views/quickvote/create.rhtml +++ b/app/views/quickvote/create.rhtml @@ -4,8 +4,6 @@
-
-

@@ -69,4 +67,3 @@ <% end %> -
diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index 8b658f7..a2da83d 100644 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -5,8 +5,6 @@ Results -
- <% if @election.shortdesc %>

Vote Description:

<%=h @election.shortdesc %> @@ -90,9 +88,9 @@ <% end %> -<%=image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%>
+ -
diff --git a/app/views/quickvote/success.rhtml b/app/views/quickvote/success.rhtml index 95ae386..428a3f2 100644 --- a/app/views/quickvote/success.rhtml +++ b/app/views/quickvote/success.rhtml @@ -4,8 +4,6 @@
-
-

Please direct voters to:

@@ -19,4 +17,3 @@ HyperChad site. Voters do not need to log in or authenticate to participate in this election.

<%= link_to "Jump to QuickVote", quickvote_url( :ident => @quickvote.name ) %>

-
diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml index 506677f..b57ac0b 100644 --- a/app/views/quickvote/thanks.rhtml +++ b/app/views/quickvote/thanks.rhtml @@ -3,8 +3,6 @@ Vote Recorded Successfully -
-

Your vote has been recorded with the following ranked preferences:

@@ -22,4 +20,3 @@ preferences:

  • <%= link_to "View Current Results", quickaction_url( :ident => @voter.election.name, :action => 'results' ) %>
  • -
    diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 313dee5..4e84579 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -152,8 +152,12 @@ h5 { overflow: hidden; } +#page-title { + margin: -20px -20px 1em -20px; +} + .plain-header { - margin: 1em -1.2em 1em -1.2em; + margin: 1em -20px 1em -20px; } .header { @@ -185,19 +189,13 @@ h5 { #main-box { float: right; - width: 611px; - padding: 0; + width: 571px; + padding: 20px; background: #f9f9f9; border: 1px solid #b3b3b3; } -.main-content { - margin: 1.2em; - line-height: 1.5em; - text-color: #454545; -} - -.main-content p, .main-content blockquote, .main-content ul { +#main-box p, #main-box blockquote, #main-box ul { margin-bottom: 1em; }