merged in some more fixes fromdevel

diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb
index 4e36ad4fd60a0288bbff7f724440d0bccf2762c9..8b8ae68203a7a2de1a6e396be6c72c0b674e81eb 100644 (file)
--- a/app/controllers/front_controller.rb
+++ b/app/controllers/front_controller.rb
@@ -5,7 +5,7 @@ class FrontController < ApplicationController
   require_dependency "account"
 
   def index
-    @quickvotes = QuickVote.find(:all).sort {|a,b| a.enddate <=> b.enddate}[0..1]
+    @quickvotes = QuickVote.find(:all).sort {|a,b| b.startdate <=> a.startdate}[0..1]
     # if the person claims they are logged in
    
     if logged_in?

diff --git a/app/views/about/thanks.rhtml b/app/views/about/thanks.rhtml
index fdf4ce7d0dd13441290a4f4459ef920611d35218..f05587a60f7c4e9dcf44b82cc556142265ef6035 100644 (file)
--- a/app/views/about/thanks.rhtml
+++ b/app/views/about/thanks.rhtml
@@ -18,8 +18,13 @@ called <em>HyperChad</em>.</p>
 
 <p>Funding for the current version of the project comes from the <%=
 link_to("Digital Incubator", "http://www.digitalincubator.net/") %>
-initiative -- a joint effort between <%= link_to("MTV",
-"http://www.mtv.com") %>/<%= link_to("MTVu", "http://www.mtvu.com") %>
+initiative -- a joint effort between <%= link_to("mtv",
+"http://www.mtv.com") %>/<%= link_to("mtvU", "http://www.mtvu.com") %>
 and <%= link_to("Cisco", "http://www.cisco.com") %>. <em>MTVu</em> has
 also played an important role in publicizing the project.</p>
 
+<div class="photo">
+<a href="http://www.digitalincubator.net">
+<img src="/images/digital_incubator_logo.jpg" alt="Digital Incubator Logo" />
+</a>
+</div>

diff --git a/public/images/digital_incubator_logo.jpg b/public/images/digital_incubator_logo.jpg
new file mode 100644 (file)
index 0000000..59ad0c1
Binary files /dev/null and b/public/images/digital_incubator_logo.jpg differ