app/views/myspot/credits/_credit_pitch.html.haml @@ -2,6 +2,11 @@ class Myspot::DonationsController < ApplicationController before_filter :login_required, :except => :create resources_controller_for :donations, :only => [:index, :create, :destroy] + response_for :index do |format| + @credit_pitches = current_user.credit_pitches + update_balance_cookie + end + response_for :create do |format| if resource_saved? update_balance_cookie app/controllers/myspot/donations_controller.rb @@ -1,4 +1,4 @@ - form_for CreditPitch.new(:pitch => news_item, :amount => current_user.remaining_credits), :url => myspot_credit_pitches_path, :html => {:id => "new_credit_pitch_#{news_item.id}", :class => "auth"} do |f| = f.hidden_field :amount, :id => "credit_pitch_amount" = f.hidden_field :pitch_id - = submit_tag "Apply #{number_to_currency(current_user.remaining_credits)} Credits", :alt => "Allocate credits", :title => "Allocate credits" \ No newline at end of file + = submit_tag "Apply Credits", :alt => "Allocate credits", :title => "Allocate credits" \ No newline at end of file app/views/credits/_credit_pitch.html.haml @@ -6,6 +6,9 @@ = render :partial => "myspot/dashboard_nav" %table.donations %tr + %td{:colspan => 5,:class=>"header"} + My Pitches + %tr %th.pitch_header Pitch %th.donated_header Donated %th.donation_header Donation @@ -15,6 +18,20 @@ %td{:colspan => 5} .double_content_border = render :partial => "myspot/donations/donation", :collection => @donations, :spacer_template => "myspot/donations/donation_spacer" + %table.donations + %tr + %td{:colspan => 5,:class=>"header"} + My Credits + %tr + %th.pitch_header Pitch + %th.donated_header Credited + %th.donation_header Amount + %th.status_header Status + %th.actions_header Actions + %tr + %td{:colspan => 5} + .double_content_border + = render :partial => "myspot/credits/credit_pitch", :collection => @credit_pitches, :spacer_template => "myspot/donations/donation_spacer" - if current_user.has_spotus_donation? = render :partial => "myspot/donations/donation_spacer" %tr app/views/myspot/donations/index.html.haml @@ -857,6 +857,18 @@ table.pledges th, table.tips th { background: none; } +table.donations th.pitch_header{ + width:200px; +} +table.donations th.donated_header{ + width:100px; +} +table.donations th.donation_header{ + width:80px; +} +table.donations th.status_header{ + width:200px; +} table.pledges tr.pledge td.pledge .number { font-size: 200%; padding-top: 0px; @@ -864,6 +876,11 @@ table.pledges tr.pledge td.pledge .number { table.pledges tr.pledge td.pledge { text-align: right; } +table.donations td.header{ + background:#eee; + font-weight:bold; + border-bottom:solid 2px #333; +} #dashboard_tab_container { width: 625px; height: 37px; public/stylesheets/screen_spotus.css 9e83120b516082f9919ddab88ad0266c6b62665c Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/d30d61003854b044be28d58f4fc8519993f288d6 d30d61003854b044be28d58f4fc8519993f288d6 2009-10-19T11:00:51-07:00 2009-10-19T11:00:51-07:00 Displays credit pitches in dashboard 6ebe367239cd7756d96336f903d70c9acb1182dd Dan Newman dpnewman@gmail.com