Scrollbar if someone creates too many electons to fit within defualt given room for...

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 68d59cc520fd1905474a12dea3991894682151af..be2fb3d2c9efd26c5deb6e8ee150249b5e509ac2 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -79,7 +79,6 @@ class ElectionController < ApplicationController
   def update_general_information
     @election = Election.find(params[:id])
     
-    
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}
       unless @election.embed_custom_string
@@ -98,8 +97,10 @@ class ElectionController < ApplicationController
     end
   end
   
-  #Takes care of uploading custom images -- unnecessarily long, how can I compress?
+  #Takes care of uploading custom images 
+  #unnecessarily long, how can I compress?
   def add_theme(prefix)
+    holder = create_theme_hash
     unless params[:top_bar][:uploaded_data].to_s.empty?
       previous = SkinPicture.find(:first,
       :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"])

diff --git a/app/views/front/index.rhtml b/app/views/front/index.rhtml
index afdf35d61e9c8217479ad9a9636f2fe44faca55b..70cad25db4e23155241eb793748475b4c71df5f7 100644 (file)
--- a/app/views/front/index.rhtml
+++ b/app/views/front/index.rhtml
@@ -19,7 +19,8 @@
 </div>
 
 <div id="control-room" class="main-section">
-  <div id="control-room-content">
+  <div id="control-room-content" >
+               
   <h2>Control Room</h2>
   <% if session[:user] %>
     <%= render :partial => 'user_summary' %> 

diff --git a/public/stylesheets/front.css b/public/stylesheets/front.css
index 4c973b125a097ee5cf45a4fafb867cf5fcf3d853..8805abedfe3cfcfefc4cf7af9214ee7c202f8e57 100644 (file)
--- a/public/stylesheets/front.css
+++ b/public/stylesheets/front.css
@@ -127,6 +127,7 @@ h3 {
 
 #control-room-content {
        height: 428px;
+       overflow:auto;
 }
 
 #quickvotes {