From: Benjamin Mako Hill <mako@atdot.cc>
Date: Sun, 17 Jun 2012 22:59:36 +0000 (-0400)
Subject: Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/005f5a86085c9cbcbc09c6655f3851a877462638

Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

Conflicts:
	README
	app/controllers/voter_controller.rb
	app/views/layouts/_footer.rhtml
---

005f5a86085c9cbcbc09c6655f3851a877462638
diff --cc README
index 9ec9d62,afa0a25..5ce586b
--- a/README
+++ b/README
@@@ -8,35 -8,28 +8,43 @@@ distribute, or rework Selectricity unde
  course, we'd sure like it if you would send fixes back to us and tell us
  about cool stuff you do with our software!
  
--The best way to get Selectricity is just to download it from our source
- tree.  At the moment, we're hosting our code at Gitorious which is a
- free software hosting provider. You can download Gitorious at the
- project page by following detailed instructions at Gitorious:
++The best way to get Selectricity is just to download it from our
+ source repository. You'll need the Git version control system or
+ source control manager to check it. You can get it here:
  
-   http://gitorious.org/selectricity
+   http://git-scm.com/
+ 
+ Once you have it, getting the source code is pretty easy. You just need
+ to check out a branch with a command like this:
+ 
+   git clone http://projects.mako.cc/source/selectricity/.git
+ 
+ By default, this will create a working copy with the latest
+ *development* version of our code. If you want the latest production
+ version (i.e., what we're running on the site), you need to switch to
+ the live version of the software which is kept in a branch called
+ "live." Once you cloned the repository above, you can switch into the
+ directory (i.e., run "cd selectricity") and then run the following
+ command:
+ 
+   git checkout -b live origin/live
  
  
 +===============================================
 +=== Getting Help and Contributing =============
 +===============================================
 +
 +If you have a question, you can always email the core team at:
 +
 +  team@selectricity.org
 +
 +If you want to get involved in development, want to discuss
 +selectricity, or want to participate, please subscribe to our mailing
 +list here:
 +
 +  http://mailman.mit.edu/mailman/listinfo/selectricity
 +
- In terms of bugs and documentation, we current plan to build this out in
- our Gitorious wiki so feel free to get started with your own efforts
- along these lines there:
- 
-   http://gitorious.org/selectricity/pages/Home
- 
 +
  ===============================================
  === Dependencies ==============================
  ===============================================
@@@ -65,12 -58,7 +73,11 @@@ On Ubuntu, you can install install the 
  Our server configuration uses Mongrel (installed from gems) behind an
  Apache2 load balancing proxy using mod_proxy.
  
 +You'll also need to have a MTA installed. We use Postfix and have not
 +tried it with any other system. Presumably though, anything that
 +provides '/usr/bin/sendmail' should work.
 +
  
- 
  ===============================================
  === Contributors to Selectricity Include ======
  ===============================================
diff --cc app/controllers/voter_controller.rb
index 408bdab,78f9a0c..a550f67
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@@ -97,16 -127,19 +97,18 @@@ class VoterController < ApplicationCont
    end
  
    def confirm
-     @voter.vote.confirm!
- 
-     if @voter.election.embeddable? and params[:embed] == "true" \
-       and @voter.election.early_results?
-       redirect_to :action => :results, :id => @password, :embed => 'true'
-     elsif not(@voter.election.verifiable) \
-       and @voter.election.kiosk and params[:kiosk] == "true"
-       redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true
 -    if authenticate
 -      if @voter.vote.confirm!
 -        if @voter.election.embeddable? and params[:embed] == "true" \
 -          and @voter.election.early_results?
 -          redirect_to :action => :results, :id => @password, :embed => 'true'
 -        else
 -          render :action => 'thanks'
 -        end
++    if @voter.vote.confirm!
++      if @voter.election.embeddable? and params[:embed] == "true" \
++        and @voter.election.early_results?
++        redirect_to :action => :results, :id => @password, :embed => 'true'
++      elsif not(@voter.election.verifiable) \
++        and @voter.election.kiosk and params[:kiosk] == "true"
++        redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true
+       else
 -        redirect_to :action => 'index'
++        render :action => 'thanks'
+       end
      else
-       render :action => 'thanks'
 -        redirect_to :action => 'index'
++      redirect_to :action => 'index'
      end
    end