From: Date: Wed, 18 Jul 2007 18:28:44 +0000 (-0400) Subject: changed properties and the name of hyperchad to selectricity X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/25bfcc0f6b5344acb4039457f8492df7fbada7fc?ds=inline changed properties and the name of hyperchad to selectricity --- diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml index 4daac12..b090bf1 100755 --- a/app/views/layouts/hc.rhtml +++ b/app/views/layouts/hc.rhtml @@ -1,7 +1,7 @@ <% %> - <%= @page_title || "HyperChad" %> + <%= @page_title || "Selectricity" %> <%= stylesheet_link_tag "hc", :media => "all" %> <% #engine_stylesheet 'login_engine' %> @@ -12,7 +12,7 @@ <% if @page_title %>

<%= @page_title %>

<% else %> -

HyperChad
+

Selectricity
Voting Machinery for the Masses

<% end %> @@ -42,7 +42,8 @@ diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml index ef2ffd9..8ce400a 100755 --- a/app/views/quickvote/results.rhtml +++ b/app/views/quickvote/results.rhtml @@ -21,7 +21,7 @@

Number of voters:

- <%= @election.voters.length %> (see below for details) + <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details)

Winners

diff --git a/app/views/site/_basic_login.rhtml b/app/views/site/_basic_login.rhtml index 17184b2..d3043db 100755 --- a/app/views/site/_basic_login.rhtml +++ b/app/views/site/_basic_login.rhtml @@ -11,9 +11,10 @@ 'user', :action => 'signup' %>

-->

<%= link_to 'Lost or forgot your password?', :controller => 'user', :action => 'forgot_password' %>

-

Unfortunately, HyperChad is currently being tested and new +

Unfortunately, Selectricity is currently being tested and new accounts for full votes (i.e., non-QuickVotes) 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 Benjamin Mako Hill.

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index 22903d9..f2f5700 100755 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -7,7 +7,7 @@

QuickVotes

QuickVotes are like polls: unstructured, non-anonymous and -without the complex features of HyperChad. They are the +without the complex features of Selectricity. They are the quickest way to make a decision or to compare between voting methods.

@@ -21,13 +21,13 @@ methods.

<% end %> -

HyperChad Anywhere

+

Selectricity Anywhere

-

You can also access HyperChad entirely over email or via SMS/text -messages from your mobile phone using HyperChad anywhere. Email <%= +

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 help in the body for more information or read the <%= link_to "documentation -online", "hyperchad-anywhere.html"%>.

+online", "selectricity-anywhere.html"%>.

diff --git a/app/views/voter_notify/votestart.rhtml b/app/views/voter_notify/votestart.rhtml index ead6a43..b844ee2 100755 --- a/app/views/voter_notify/votestart.rhtml +++ b/app/views/voter_notify/votestart.rhtml @@ -1,13 +1,13 @@ 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 -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: @@ -21,10 +21,10 @@ in error, you should 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! -HyperChad Staff +Selectricity Staff diff --git a/config/environment.rb b/config/environment.rb index d97fd3b..7159e1f 100755 --- a/config/environment.rb +++ b/config/environment.rb @@ -50,7 +50,7 @@ end # inflect.uncountable %w( fish sheep ) # end -MAIL_CONFIG = { :from => 'HyperChad '} +MAIL_CONFIG = { :from => 'Selectricity '} # 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 :app_name, 'HyperChad' + config :app_name, 'Selectricity' 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 new mode 100644 diff --git a/public/500.html b/public/500.html old mode 100755 new mode 100644 diff --git a/public/dispatch.rb b/public/dispatch.rb old mode 100755 new mode 100644 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100755 new mode 100644 diff --git a/public/robots.txt b/public/robots.txt old mode 100755 new mode 100644 diff --git a/public/hyperchad-anywhere.html b/public/selectricity-anywhere.html old mode 100755 new mode 100644 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 @@
-

HyperChad Anywhere
+

Selectricity Anywhere
Voting Machinery for the Mobile Masses

-

HyperChad Anywhere tries to help groups make better +

Selectricity Anywhere 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.

-

HyperChad Anywhere is an email and SMS based interface to Selectricity Anywhere is an email and SMS based interface to RubyVote a full-featured election methods library with a focus on preferential decision-making. -It is similar to HyperChad, +It is similar to Selectricity, a flexible web-based interface to the same voting machinery.

Usage

-

You can use HyperChad Anywhere entirely by sending and +

You can use Selectricity Anywhere 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 -email address. HyperChad Anywhere's is designed to minimize the +email address. Selectricity Anywhere's 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.

@@ -156,7 +156,7 @@ designed to fit inside a 155 character text message and will be

Advanced Usage

-

There are two advanced types of usages that users of HyperChad +

There are two advanced types of usages that users of Selectricity Anywhere might want to be aware of.

Candidate Descriptions