]> projects.mako.cc - selectricity-live/commitdiff
projects / selectricity-live / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fc0a6a8)
changed properties and the name of hyperchad to selectricity
author<mako@atdot.cc> <>
Wed, 18 Jul 2007 18:28:44 +0000 (14:28 -0400)
committer<mako@atdot.cc> <>
Wed, 18 Jul 2007 18:28:44 +0000 (14:28 -0400)
12 files changed:
app/views/layouts/hc.rhtml patch | blob | history
app/views/quickvote/results.rhtml patch | blob | history
app/views/site/_basic_login.rhtml patch | blob | history
app/views/site/index.rhtml patch | blob | history
app/views/voter_notify/votestart.rhtml patch | blob | history
config/environment.rb patch | blob | history
public/404.html [changed mode: 0755->0644] patch | blob | history
public/500.html [changed mode: 0755->0644] patch | blob | history
public/dispatch.rb [changed mode: 0755->0644] patch | blob | history
public/favicon.ico [changed mode: 0755->0644] patch | blob | history
public/robots.txt [changed mode: 0755->0644] patch | blob | history
public/selectricity-anywhere.html [moved from public/hyperchad-anywhere.html with 94% similarity, mode: 0644] patch | blob | history

diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml
index 4daac12ab792e52a52f5edf5b9d3980f5760484c..b090bf181433dead747e15bc9351463fdbf019ba 100755 (executable)
--- a/app/views/layouts/hc.rhtml
+++ b/app/views/layouts/hc.rhtml
@@ -1,7 +1,7 @@
 <% %>
 <html>
     <head>
 <% %>
 <html>
     <head>
-        <title><%= @page_title || "HyperChad" %></title>
+        <title><%= @page_title || "Selectricity" %></title>
         <%= stylesheet_link_tag "hc", :media => "all" %>
         <% #engine_stylesheet 'login_engine' %>
  
         <%= stylesheet_link_tag "hc", :media => "all" %>
         <% #engine_stylesheet 'login_engine' %>
  
@@ -12,7 +12,7 @@
            <% if @page_title %>
               <h3><%= @page_title %></h3>  
            <% else %>
            <% if @page_title %>
               <h3><%= @page_title %></h3>  
            <% else %>
-             <h3>HyperChad<br />
+             <h3>Selectricity<br />
              <font size="-1">Voting Machinery for the Masses</font></h3>
           <% end %>
 
              <font size="-1">Voting Machinery for the Masses</font></h3>
           <% end %>
 
@@ -42,7 +42,8 @@
 
         <div id="footer">
           <hr />
 
         <div id="footer">
           <hr />
-         <%= link_to "Copyleft", "http://mako.cc/projects/hyperchad" %> 2006 |
+         <%= link_to "Copyleft", "http://mako.cc/projects/selectricity"
+         %> 2006, 2007 |
          <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
          <a href="http://mako.cc">Benjamin Mako Hill</a>
        </div>
          <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
          <a href="http://mako.cc">Benjamin Mako Hill</a>
        </div>
diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index ef2ffd9444db3a636fc964af42cf06a7a3721a00..8ce400aebe5e397393d0f46df1426f3a495f0dce 100755 (executable)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -21,7 +21,7 @@
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
 
 <p><strong>Number of voters:</strong></p>
    <blockquote>
-     <%= @election.voters.length %> (see below for details) 
+     <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
 <h2>Winners</h2>
    </blockquote>
 
 <h2>Winners</h2>
diff --git a/app/views/site/_basic_login.rhtml b/app/views/site/_basic_login.rhtml
index 17184b2be9c20376fc9f235f8887e202f9ec0131..d3043dbfd96abf30b4de7cff49d76ee0ccd6b41b 100755 (executable)
--- a/app/views/site/_basic_login.rhtml
+++ b/app/views/site/_basic_login.rhtml
@@ -11,9 +11,10 @@
 'user', :action => 'signup' %></p> -->
       <p><%= link_to 'Lost or forgot your password?', :controller => 'user', :action => 'forgot_password' %></p>
 
 'user', :action => 'signup' %></p> -->
       <p><%= link_to 'Lost or forgot your password?', :controller => 'user', :action => 'forgot_password' %></p>
 
-      <p>Unfortunately, HyperChad is currently being tested and new
+      <p>Unfortunately, Selectricity is currently being tested and new
       accounts for full votes (i.e., non-<em>QuickVotes</em>) can not
       accounts for full votes (i.e., non-<em>QuickVotes</em>) can not
-      be automatically created. If you are interested in using HyperChad to
+      be automatically created. If you are interested in using
+      Selectricity to
       run an organizational election, contact <a
       href="http://mako.cc/contact.html">Benjamin Mako Hill</a>.</p>
 
       run an organizational election, contact <a
       href="http://mako.cc/contact.html">Benjamin Mako Hill</a>.</p>
 
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 22903d9fcb6b500b941c7c2ec20793e01a250c2c..f2f5700e71b8bb0a3ea560a126e479c00915ae10 100755 (executable)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -7,7 +7,7 @@
 <h2>QuickVotes</h2>
 
 <p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
 <h2>QuickVotes</h2>
 
 <p><em>QuickVotes</em> are like polls: unstructured, non-anonymous and
-without the complex features of <em>HyperChad</em>. They are the
+without the complex features of <em>Selectricity</em>. They are the
 quickest way to make a decision or to compare between voting
 methods.</p>
 
 quickest way to make a decision or to compare between voting
 methods.</p>
 
@@ -21,13 +21,13 @@ methods.</p>
 <% end %>
 </ul>
 
 <% end %>
 </ul>
 
-<h2>HyperChad <em>Anywhere</em></h2>
+<h2>Selectricity <em>Anywhere</em></h2>
 
 
-<p>You can also access HyperChad entirely over email or via SMS/text
-messages from your mobile phone using HyperChad anywhere. Email <%=
+<p>You can also access Selectricity entirely over email or via SMS/text
+messages from your mobile phone using Selectricity anywhere. Email <%=
 link_to "vote\@mako.cc", "mailto:vote@mako.cc" %> with <tt>help</tt> in
 the body for more information or read the <%= link_to "documentation
 link_to "vote\@mako.cc", "mailto:vote@mako.cc" %> with <tt>help</tt> in
 the body for more information or read the <%= link_to "documentation
-online", "hyperchad-anywhere.html"%>.</p>
+online", "selectricity-anywhere.html"%>.</p>
 
 </td>
 
 
 </td>
 
diff --git a/app/views/voter_notify/votestart.rhtml b/app/views/voter_notify/votestart.rhtml
index ead6a431b0c9d9b58fb84b690b80da198a319fe4..b844ee23477a9b05e16cbf5db8daf460ae95ebbf 100755 (executable)
--- a/app/views/voter_notify/votestart.rhtml
+++ b/app/views/voter_notify/votestart.rhtml
@@ -1,13 +1,13 @@
 Voter!
 
 Voter!
 
-This is an automated message sent by hyperchad.media.mit.edu.
+This is an automated message sent by selectricity.media.mit.edu.
 
 You have been listed as a voter in an upcoming election.
 
 The election title: <%= @voter.election.name %>
 
 To read more about the election, the candidates, and to vote, you will
 
 You have been listed as a voter in an upcoming election.
 
 The election title: <%= @voter.election.name %>
 
 To read more about the election, the candidates, and to vote, you will
-need to use the following token to log in to hyperchad.media.mit.edu:
+need to use the following token to log in to selectricity.media.mit.edu:
   <%= @voter.password %>
 
 Alternatively, you can just click this URL:
   <%= @voter.password %>
 
 Alternatively, you can just click this URL:
@@ -21,10 +21,10 @@ in error, you should contact:
 
 Alternatively, if you feel there is a technical error, please contact:
 
 
 Alternatively, if you feel there is a technical error, please contact:
 
-  help@hyperchad.media.mit.edu
-  (HyperChad Tech Support)
+  help@selectricity.media.mit.edu
+  (Selectricity Tech Support)
 
 Thanks and happy voting!
 
 Thanks and happy voting!
-HyperChad Staff
+Selectricity Staff
   
   
   
   
diff --git a/config/environment.rb b/config/environment.rb
index d97fd3b6ea3e45c6b91dbee361089bbc43e42fde..7159e1fab6b9bf36d62c3f37b1ed592b3da53aab 100755 (executable)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -50,7 +50,7 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 
-MAIL_CONFIG = { :from => 'HyperChad <info@hyperchad.media.mit.edu>'} 
+MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
 
 # Include your application configuration below
 require 'uniq_token'
 
 # Include your application configuration below
 require 'uniq_token'
@@ -79,7 +79,7 @@ module LoginEngine
   config :salt, "voothingboat"
   config :email_from, MAIL_CONFIG[:from]
   config :admin_email, MAIL_CONFIG[:from]
   config :salt, "voothingboat"
   config :email_from, MAIL_CONFIG[:from]
   config :admin_email, MAIL_CONFIG[:from]
-  config :app_name, 'HyperChad'
+  config :app_name, 'Selectricity'
   config :changeable_fields, []
   config :use_email_notification, true
   config :confirm_account, false
   config :changeable_fields, []
   config :use_email_notification, true
   config :confirm_account, false
diff --git a/public/404.html b/public/404.html
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/public/500.html b/public/500.html
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/public/dispatch.rb b/public/dispatch.rb
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/public/favicon.ico b/public/favicon.ico
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/public/robots.txt b/public/robots.txt
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/public/hyperchad-anywhere.html b/public/selectricity-anywhere.html
old mode 100755 (executable)
new mode 100644 (file)
similarity index 94%
rename from public/hyperchad-anywhere.html
rename to public/selectricity-anywhere.html
index a329460..10e36e4
--- a/public/hyperchad-anywhere.html
+++ b/public/selectricity-anywhere.html
@@ -1,28 +1,28 @@
 <html>
    <link rel="stylesheet" type="text/css" href="stylesheets/hc.css" />
    <div id="top">
 <html>
    <link rel="stylesheet" type="text/css" href="stylesheets/hc.css" />
    <div id="top">
-  <h3>HyperChad Anywhere<br />
+  <h3>Selectricity Anywhere<br />
   <font size="-1">Voting Machinery for the <em>Mobile</em> Masses</font></h3>
 </div>
 
 
   <font size="-1">Voting Machinery for the <em>Mobile</em> Masses</font></h3>
 </div>
 
 
-<p><em>HyperChad Anywhere</em> tries to help groups make better
+<p><em>Selectricity Anywhere</em> tries to help groups make better
 decisions in their everyday lives. It tries to make voting technology
 created for state elections and government use easily accessible for
 every day decisions.</p>
 
 decisions in their everyday lives. It tries to make voting technology
 created for state elections and government use easily accessible for
 every day decisions.</p>
 
-<p><em>HyperChad Anywhere</em> is an email and SMS based interface to <a
+<p><em>Selectricity Anywhere</em> is an email and SMS based interface to <a
 href="http://rubyvote.rubyforge.org">RubyVote</a> a full-featured
 election methods library with a focus on preferential decision-making.
 href="http://rubyvote.rubyforge.org">RubyVote</a> a full-featured
 election methods library with a focus on preferential decision-making.
-It is similar to <a href="http://hyperchad.media.mit.edu">HyperChad</a>,
+It is similar to <a href="http://selectricity.media.mit.edu">Selectricity</a>,
 a flexible web-based interface to the same voting machinery.</p>
 
 <h2>Usage</h2>
 
 a flexible web-based interface to the same voting machinery.</p>
 
 <h2>Usage</h2>
 
-<p>You can use <em>HyperChad Anywhere</em> entirely by sending and
+<p>You can use <em>Selectricity Anywhere</em> entirely by sending and
 receiving emails or short text messages (SMS). In the US, most mobile
 phones that cannot send email can send an text message or SMS to an
 receiving emails or short text messages (SMS). In the US, most mobile
 phones that cannot send email can send an text message or SMS to an
-email address. <em>HyperChad Anywhere's</em> is designed to minimize the
+email address. <em>Selectricity Anywhere's</em> is designed to minimize the
 amount of typing necessary to use the system while ensuring that answers
 are small enough that they can fit in a mobile phone text message.</p>
 
 amount of typing necessary to use the system while ensuring that answers
 are small enough that they can fit in a mobile phone text message.</p>
 
@@ -156,7 +156,7 @@ designed to fit inside a 155 character text message and will be
 
 <h2>Advanced Usage</h2>
 
 
 <h2>Advanced Usage</h2>
 
-<p>There are two advanced types of usages that users of <em>HyperChad
+<p>There are two advanced types of usages that users of <em>Selectricity
 Anywhere</em> might want to be aware of.</p>
 
 <dt><strong>Candidate Descriptions</strong></dt>
 Anywhere</em> might want to be aware of.</p>
 
 <dt><strong>Candidate Descriptions</strong></dt>
Voting machinery for the masses!

Benjamin Mako Hill || Want to submit a patch?