fixed js and template stuff, front-end pieces still fritzing

mjording · Mar 11, 2011 · 3c359d4 · 3c359d4
1 parent aa3006a
commit 3c359d4
Show file tree

Hide file tree

Showing 21 changed files with 457 additions and 31 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -9,21 +9,6 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
-  rescue_from(Exception) do |e|
-    #TODO: Flash something?
-    flash[:alert] = e.message
-    logger.error "Error: '#{e.message}'"
-
-    respond_to do |format|
-      format.html { redirect_to :back }
-      format.js { 
-        render :update do |page| 
-          page.redirect_to(:back)
-        end
-      }
-    end
-  end
-
   protected
 
   SHOW_LIMIT = 10

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
@@ -1,5 +1,22 @@
 class IssuesController < ApplicationController
 
+  #custom exception handler puts errors in the pop-down flash area
+  rescue_from(VoteException) do |e|
+    #TODO: Flash something?
+
+    flash[:alert] = e.inspect
+    logger.error "Error: '#{e.message}'"
+    e.backtrace
+
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js { 
+        render :update do |page| 
+          page.redirect_to(:back)
+        end
+      }
+    end
+  end
 
   def show 
     @issue  = Issue.find(params[:id])
@@ -47,10 +64,13 @@ def vote
       return
     end
 
+    #@issue.add_vote_for_user(current_user)
+
     begin
       @issue.add_vote_for_user(current_user)
     rescue Exception => e
-      flash[:alert] = e.message
+
+      flash[:alert] = e.inspect
       puts e.backtrace
       logger.warn(flash[:alert])
 

diff --git a/app/models/issue.rb b/app/models/issue.rb
@@ -19,7 +19,7 @@ def self.find_similar(report)
   def add_vote_for_user(user)
 
     unless(user.votes_remaining > 0)
-      throw 'Not enough votes. Please return in a few hours to vote on more issues.'
+      throw VoteException.new('Not enough votes. Please return in a few hours to vote on more issues.')
     end
 
     @vote = votes.create({:user => user})

diff --git a/app/models/kajoo_exception.rb b/app/models/kajoo_exception.rb
@@ -0,0 +1,3 @@
+class KajooException < Exception
+
+end
diff --git a/app/models/solution.rb b/app/models/solution.rb
@@ -4,7 +4,7 @@ class Solution < ActiveRecord::Base
 
   def add_vote_for_user(user)
     unless(user.votes_remaining > 0)
-      throw Exception.new('Not enough votes')
+      throw VoteException.new('Not enough votes')
     end
 
     @vote = votes.create({:user => current_user})

diff --git a/app/models/vote_exception.rb b/app/models/vote_exception.rb
@@ -0,0 +1,3 @@
+class VoteException < KajooException
+
+end
diff --git a/app/views/layouts/application.erb → app/views/layouts/application.html.erb b/app/views/layouts/application.erb → app/views/layouts/application.html.erb
@@ -20,8 +20,10 @@
 <body>
 
 <div id="wrapper" class="container_24">
-<% if notice %><div class="grid_24"><div class="flash_message" id="flash_notice"><%= notice %></div></div><% end %>
-<% if alert %><div class="grid_24"><div class="flash_message" id="flash_alert"><%= alert %></div></div><% end %>
+<div id="notices">
+  <div class="grid_24"><% if notice %><div class="flash_message" id="flash_notice"><%= notice %></div><% end %></div>
+  <div class="grid_24"><% if alert %><div class="flash_message" id="flash_alert"><%= alert %></div><% end %></div>
+</div>
 <div id="header" class="container_24"><!--Header starts-->
   <%= render :partial => 'shared/navigation' %>
 </div><!--closes header--><div class="clear"></div>

diff --git a/app/views/reports/_form.erb → app/views/reports/_form.html.erb b/app/views/reports/_form.erb → app/views/reports/_form.html.erb
diff --git a/app/views/reports/new.erb → app/views/reports/new.html.erb b/app/views/reports/new.erb → app/views/reports/new.html.erb
diff --git a/app/views/reports/new.js.erb b/app/views/reports/new.js.erb
@@ -1,7 +1,5 @@
 $("#flash_notice").html("<%= escape_javascript(flash[:notice])%>").show();
 $("#alert_notice").html("<%= escape_javascript(flash[:alert])%>").show();
-
-$('#flash_notice').delay(2000).slideUp(1000);
-$('#alert_notice').delay(2000).slideUp(1000);
+$('#notices').show().delay(2000).slideUp(1000);
 
 $('#feature').slideUp(1000).html("<%= escape_javascript(render :partial => 'form')%>").slideDown(1000);
diff --git a/app/views/shared/_issues.erb → app/views/shared/_issues.html.erb b/app/views/shared/_issues.erb → app/views/shared/_issues.html.erb
diff --git a/app/views/shared/_navigation.erb → app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.erb → app/views/shared/_navigation.html.erb
diff --git a/app/views/shared/_sidebar.erb → app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.erb → app/views/shared/_sidebar.html.erb
diff --git a/config/initializers/dragonfly b/config/initializers/dragonfly
diff --git a/config/initializers/dragonfly.rb b/config/initializers/dragonfly.rb
@@ -0,0 +1,2 @@
+require 'dragonfly/rails/images'
+
diff --git a/config/site.yml b/config/site.yml
@@ -3,7 +3,7 @@ development: &default
   state_name: 'Texas'
   country_name: 'United States'
   site_name: 'SXSW Civic Hackathon'
-  daily_vote_limit: 5
+  daily_vote_limit: 100
 
 test: &test
   <<: *default

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -18,14 +18,34 @@ $(document).ready(function(){
 
   //fade out alerts
 
-  $('#flash_notice').delay(2000).slideUp(1000);
-  $('#flash_alert').delay(2000).slideUp(1000);
+  $('#notices').delay(2000).slideUp(1000);
+//  $('#flash_alert').delay(2000).slideUp(1000);
 
+  //fixed positioning for iPhone
+  //$(window).bind( "scroll", maybeShowNavBar );
 });
 
 $.fn.animateHighlight = function(highlightColor, duration) {
   var highlightBg = highlightColor || "#FFFF9C";
   var animateMs = duration || 1500;
   var originalBg = this.css("backgroundColor");
   this.stop().css("background-color", highlightBg).animate({backgroundColor: originalBg}, animateMs);
-};
+};
+
+function showNavBar() {
+ var win_y = $(window).height();
+ var scroll_y = $(window).scrollTop();
+ $("footer").css({ top: ((win_y - 36) + scroll_y) + "px" });
+ $("header").css({ top: scroll_y + "px" });
+}
+
+var showTimer = false;
+
+function maybeShowNavBar(evt) {
+ if ( showTimer ) {
+   clearTimeout( showTimer );
+ }
+ showTimer = setTimeout( showNavBar, 175 );
+}
+
+