Committing to rebase angie's changes.

julianlconnor · Oct 29, 2011 · d8c4bfd · d8c4bfd
1 parent c4dfe47
commit d8c4bfd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 22 deletions.
diff --git a/app/views/charts/_pagination.html.erb b/app/views/charts/_pagination.html.erb
@@ -1 +1 @@
-<%= will_paginate @charts, :class => "pagination charts", :param_name => "chart_page", :previous_label => 'Previous', :next_label => 'Next' %>
+<%= will_paginate @charts, :class => "pagination charts", :param_name => "chart_page", :previous_label => 'Previous', :next_label => 'Next', :method => :charts_paginate %>
diff --git a/app/views/charts/charts_paginate.js.erb b/app/views/charts/charts_paginate.js.erb
@@ -0,0 +1,2 @@
+$("#chart_pagination").html("<%= escape_javascript(render('charts/pagination')) %>");
+alert("what");
diff --git a/app/views/charts/index.js.erb b/app/views/charts/index.js.erb
@@ -1,7 +1,5 @@
-$("#content").html("<%= escape_javascript(render('charts/charts')) %>").hide().fadeIn();
+$("#charts").html("<%= escape_javascript(render('charts/charts')) %>").hide().fadeIn();
 $("#chart_pagination").html("<%= escape_javascript(render('charts/pagination')) %>");
-$(".chart:first").toggleClass("active");
-$.get($(".chart:first").attr("name"),null,null,"script");
 /*var $list = $('.chart_outside');
 $list.css('left', -$list.outerWidth() + 'px');
 $list.animate({

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
@@ -1,14 +1,9 @@
-<% if notice or alert %>
-  <div id="flash">
-		<div class="alert-message info">
-		  <p><%= notice %></p>
-		</div>
-		<div class="alert-message warning">
-		  <p><%= alert %></p>
-		</div>
-		<!-- <span class="close_flash">[x]</span> -->   
-  </div>
+<% if !!flash %>
+  <% flash.each do |key, value| %>
+    <%= content_tag(:div, value, :class => "flash #{key}") %>
+  <% end %>
 <% end %>
+
 <script>
 	$(function() {
 		$('#flash').delay(5000).fadeOut();

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -28,13 +28,7 @@
     <div class="top_background"></div>
       <% if current_user %>
         <div class="alert">
-            <% for name in flash_names %>
-                <% if flash[name] %>
-                    <div class="alert-message <%= name %>">
-                        <p><%= flash[name] %></p>
-                    </div>
-                <% end %>
-            <% end %>
+          <%= render 'layouts/flash', :locals => {:flash => flash} %>
         </div>
         <div class="topbar">
           <div class="topbar-inner">

diff --git a/app/views/users/favorite.js.erb b/app/views/users/favorite.js.erb
@@ -1,2 +1,2 @@
-$("#flashSpace").html("<%= escape_javascript(render('layouts/flash')) %>");
+$(".alert").html("<%= escape_javascript(render('layouts/flash', :locals => {:flash => flash})) %>");
 $("#chart_songs tr.<%= @song_id %> td.heart").toggleClass('active');