From: Date: Sun, 7 Jun 2009 09:39:45 +0000 (-0400) Subject: merged in licensing changes (we'll have to undo this eventually) X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/d06c024c7dddeca27c658b668ed313f3f107d2e6?hp=-c merged in licensing changes (we'll have to undo this eventually) --- d06c024c7dddeca27c658b668ed313f3f107d2e6 diff --combined NOTES index 0000000,0000000..e543bb3 new file mode 100644 --- /dev/null +++ b/NOTES @@@ -1,0 -1,0 +1,53 @@@ ++=============================================== ++=== Log ======================================= ++=============================================== ++ ++07/31/07 ++jlsharps: I've added a user authentication system known as ++"acts_as_authenticated" to the code. The plugin is the the vendor/plugins ++directory. The two most noticeable changes are the AccountController and a ++redone User model. I've left the UserController in place for now, but the ++AccountController works in a different manner, so am switching over to that ++gradually. I saved the 5 lines or so in the old User model, overwrote ++it with the authenticated generator and then recopied the old stuff back in: ++has_many :elections and the name() method. The generator also creates its own ++migration file, but since we are using a create.sql file I adopted the ++migration file into a new users table in the create.sql file. I have yet to ++delete the old table because I haven't fully combed through the code yet and ++determined how many of the old attributes (such as first_name, last_name) may ++need to be retained. ++http://technoweenie.stikipad.com/plugins/show/Acts+as+Authenticated is the ++best site for documentation regarding acts_as_authenticaed. Also, currently ++it only stores the user_id in the session, but i just found a guide to help ++me make it store the entire user object, so I'll do that while my battery ++charges. ++ ++08/03/07 ++Handy trick: use the command 'gem_server' from a shell to create a server at ++http://localhost:8008 that is an easy to navigate locally-hosted website with ++all the documentation on local gems you have in a easy to read format. ++ ++jlsharps: I added the Gruff plug-in today, which is viewable under the folder ++vender/plugins/gruff. I installed it directly using the Gruff plug-in and ++included controller generate utility. The version 0.1.2, which doesn't seem to ++be the latest version. I've looked into it and it see and it seems that the ++latest version is 0.2.8. However, I wasn't sure how including a gem w/o a plugin ++would function in end-game rails so I just what I used for now. If you guys ++(mako of john) know how to do it, it'd probably be better to upgrade, but it ++didn't seem like the best use of my time right now. I got the plug-in here: ++http://topfunky.net/svn/plugins/gruff. You can get the gruff gem v 0.2.8 by ++typing "sudo gem install gruff", I believe it's also hosted on RubyForge. ++ ++I created the GraphsController for Gruff methods to use. In Pollarize I put them ++in the ApplicationContorller file, so they would be accessible to all. While ++that it also an option here, it would also mean there wouldn't be much room for ++playing around because everything in the Application file has to be perfect or ++it seems to throw Error Code 500 (basically everything breaks). The show() ++is a sample sample provided with Gruff. ++ ++Documentation is here:http://gruff.rubyforge.org/ Alternately, if you have the ++gem installed, you can use the ri command, or the above mentioned gem_server. ++ ++If you guys want more helpful stuff here, let me know. ++ ++= diff --combined README index 9980f41,9980f41..859f0ca --- a/README +++ b/README @@@ -1,5 -1,5 +1,31 @@@ =============================================== --=== Depedendencies ============================ ++=== Getting Selectricity ====================== ++=============================================== ++ ++Selectricity is free software and is distributed under the MIT or ++BSD-like ExPat license. You are free to use, modify, and distribute, or ++rework Selectricity. Of 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 ++source repository. You'll need the Bazaar version control system or ++source control manager to check it. You can get it here: ++ ++ http://bazaar-vcs.org ++ ++Once you have it, getting the source code is pretty easy. You just need ++to check out a branch with a command like this: ++ ++ bzr branch http://projects.mako.cc/source/selectricity ++ ++This will give you the latest *development* version of our code. If you ++want the latest production version (i.e., what we're running on the ++site), you can grab that here: ++ ++ bzr branch http://projects.mako.cc/source/selectricity-live ++ ++=============================================== ++=== Dependencies ============================== =============================================== To use Selectricity, you'll need to install the following gems in @@@ -33,59 -33,59 +59,7 @@@ Apache2 load balancing proxy using mod_ * John Dong * Justin Sharps --=============================================== --=== Log ======================================= --=============================================== -- --07/31/07 --jlsharps: I've added a user authentication system known as --"acts_as_authenticated" to the code. The plugin is the the vendor/plugins --directory. The two most noticeable changes are the AccountController and a --redone User model. I've left the UserController in place for now, but the --AccountController works in a different manner, so am switching over to that --gradually. I saved the 5 lines or so in the old User model, overwrote --it with the authenticated generator and then recopied the old stuff back in: --has_many :elections and the name() method. The generator also creates its own --migration file, but since we are using a create.sql file I adopted the --migration file into a new users table in the create.sql file. I have yet to --delete the old table because I haven't fully combed through the code yet and --determined how many of the old attributes (such as first_name, last_name) may --need to be retained. --http://technoweenie.stikipad.com/plugins/show/Acts+as+Authenticated is the --best site for documentation regarding acts_as_authenticaed. Also, currently --it only stores the user_id in the session, but i just found a guide to help --me make it store the entire user object, so I'll do that while my battery --charges. -- --08/03/07 --Handy trick: use the command 'gem_server' from a shell to create a server at --http://localhost:8008 that is an easy to navigate locally-hosted website with --all the documentation on local gems you have in a easy to read format. -- --jlsharps: I added the Gruff plug-in today, which is viewable under the folder --vender/plugins/gruff. I installed it directly using the Gruff plug-in and --included controller generate utility. The version 0.1.2, which doesn't seem to --be the latest version. I've looked into it and it see and it seems that the --latest version is 0.2.8. However, I wasn't sure how including a gem w/o a plugin --would function in end-game rails so I just what I used for now. If you guys --(mako of john) know how to do it, it'd probably be better to upgrade, but it --didn't seem like the best use of my time right now. I got the plug-in here: --http://topfunky.net/svn/plugins/gruff. You can get the gruff gem v 0.2.8 by --typing "sudo gem install gruff", I believe it's also hosted on RubyForge. -- --I created the GraphsController for Gruff methods to use. In Pollarize I put them --in the ApplicationContorller file, so they would be accessible to all. While --that it also an option here, it would also mean there wouldn't be much room for --playing around because everything in the Application file has to be perfect or --it seems to throw Error Code 500 (basically everything breaks). The show() --is a sample sample provided with Gruff. -- --Documentation is here:http://gruff.rubyforge.org/ Alternately, if you have the --gem installed, you can use the ri command, or the above mentioned gem_server. -- --If you guys want more helpful stuff here, let me know. -- --====================================== ++===================================== === XML-RPC INFO == ====================================== diff --combined app/views/election/_overview_form.rhtml index eed92da,eed92da..be90de6 --- a/app/views/election/_overview_form.rhtml +++ b/app/views/election/_overview_form.rhtml @@@ -23,11 -23,11 +23,11 @@@ <% type_hash = {}; ELECTION_TYPES.each {|k,v| type_hash[v] = k} %> <%= select_tag 'election[election_method]', options_for_select(type_hash, @election.election_method) %>

-- ++