added letters to user actions page

changed some copy
opencongress · Jul 10, 2011 · 707587a · 707587a
1 parent c642607
commit 707587a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 7 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -152,6 +152,8 @@ class User < ActiveRecord::Base
 
   has_one :political_notebook
   has_many :notebook_items, :through => :political_notebook
+
+  has_many :contact_congress_letters
 
 #  has_many :bill_comments
   def self.human_attribute_name(attr, options = {})

diff --git a/app/views/contact_congress_letters/show.html.haml b/app/views/contact_congress_letters/show.html.haml
@@ -5,11 +5,16 @@
 .contact_congress_letter
   - if @contact_congress_letter.bill
     #bill
-      This letter was sent regarding:
+      This letter was sent by OpenCongress user
-      %strong= link_to truncate("#{@contact_congress_letter.bill.typenumber} #{@contact_congress_letter.bill.title_common}", :length => 170), bill_path(@contact_congress_letter.bill)
+      = link_to @contact_congress_letter.formageddon_threads.first.formageddon_sender.login, user_profile_path(@contact_congress_letter.formageddon_threads.first.formageddon_sender.login)
-      - if @contact_congress_letter.formageddon_threads.first.formageddon_sender
+      on
-        by
+      = @contact_congress_letter.formageddon_threads.first.created_at.strftime('%B %d, %Y')
-        = link_to @contact_congress_letter.formageddon_threads.first.formageddon_sender.login, user_profile_path(@contact_congress_letter.formageddon_threads.first.formageddon_sender.login)
+      = case @contact_congress_letter.disposition when 'support': 'in support of' when 'oppose': 'in opposition to' else 'tracking' end
+      %strong
+        = "#{link_to(truncate(@contact_congress_letter.bill.typenumber + ' ' + @contact_congress_letter.bill.title_common, :length => 170), bill_path(@contact_congress_letter.bill))}.".html_safe
+      Privacy setting:
+      = @contact_congress_letter.formageddon_threads.first.privacy
+
   #recipients{ :class => "num#{@contact_congress_letter.formageddon_threads.size}" }
     .to To:
     %ul

diff --git a/app/views/profile/actions.html.erb b/app/views/profile/actions.html.erb
@@ -19,6 +19,40 @@
 
 <div id="linkcontent">
 		<div class="my_left">
+
+<h3 class="dark"><%= user_name("My","'s") %> Letters to Congress</h3>
+<% if @user.contact_congress_letters.empty? %>
+  <p>No letters to Congress written yet.</p>
+<% else %>
+
+
+  <ul class="grid_16">
+    <li class="grid_16">
+      <span class="grid_2"><strong>Date</strong></span>
+      <span class="grid_3"><strong>To</strong></span>
+      <span class="grid_6"><strong>Regarding</strong></span>
+      <span class="grid_2"><strong>Privacy</strong></span>
+    </li>
+    <% @user.contact_congress_letters.each do |l| %>
+      <li class="grid_16 margin-bottom">
+        <div class="grid_2"><%= l.formageddon_threads.first.created_at.strftime('%B %d, %Y')%> </div>
+        <div class="grid_3">
+          <% l.formageddon_threads.each do |t| %>
+            <%= link_to_person(t.formageddon_recipient) %><br />
+          <% end %>
+        </div>
+        <div class="grid_6"><%= l.bill.typenumber %> <%= l.bill.title_common %></div>
+        <div class="grid_2">
+          <%= l.formageddon_threads.first.privacy %>
+        </div>
+        <div class="grid_1">
+          <%= link_to "View", contact_congress_letter_path(l), :class => 'button silver small' %>
+        </div>
+      </li>
+    <% end %>    
+  </ul>
+<% end %>
+
 		<h3 class="dark"><%= user_name("My","'s") %> Comments</h3>
 		<p style="text-align:center;clear:both;"><%= will_paginate(@my_comments) %></p>
 		  <% if @my_comments.empty? %>

diff --git a/public/stylesheets/contact_congress_letters.css b/public/stylesheets/contact_congress_letters.css
@@ -1101,10 +1101,11 @@ padding-bottom: 0px;
 text-align: center;
 font-size: 16px;
 height: 30px;
+line-height: 1.5em;
 padding-top: 20px ;
 padding-bottom: 40px ;
-
+margin: 0 auto;
-width: 100%;
+width: 60%;
 }
 
 #comments-container{