Permalink
Browse files

Text changes, links and more.

  • Loading branch information...
1 parent 343c632 commit 7bfc51f1b0ca1cd7d7b996aa8ef07527ddfad209 @digidave digidave committed Jan 31, 2010
Showing with 449 additions and 237 deletions.
  1. +1 −1 app/controllers/pages_controller.rb
  2. +2 −1 app/views/assignments/index.html.haml
  3. +1 −1 app/views/layouts/__header.html.haml
  4. +9 −6 app/views/layouts/_footer_notes.html.erb
  5. +5 −5 app/views/layouts/_header.html.erb
  6. +7 −0 app/views/mailer/assignment_application_accepted_notification.text.plain.erb
  7. +13 −1 app/views/mailer/assignment_application_notification.text.plain.erb
  8. +6 −0 app/views/mailer/assignment_application_rejected_notification.text.plain.erb
  9. +5 −1 app/views/mailer/citizen_signup_notification.text.plain.erb
  10. +3 −1 app/views/mailer/comment_notification.html.erb
  11. +6 −22 app/views/mailer/organization_approved_notification.text.plain.erb
  12. +2 −0 app/views/mailer/organization_signup_notification.text.plain.erb
  13. +2 −0 app/views/mailer/password_reset_notification.text.plain.erb
  14. +4 −8 app/views/mailer/reporter_signup_notification.text.plain.erb
  15. +2 −2 app/views/myspot/pitches/_pitch.html.haml
  16. +123 −143 app/views/pages/_what_is.html.haml
  17. +2 −3 app/views/pages/contact.html.haml
  18. +165 −0 app/views/pages/examples.html.haml
  19. +2 −2 app/views/pages/press.html.haml
  20. +7 −3 app/views/pages/privacy.html.haml
  21. +7 −6 app/views/pages/reporter_agreement.html.haml
  22. +8 −7 app/views/pages/terms.html.haml
  23. +64 −22 app/views/pages/who.html.haml
  24. +2 −1 app/views/pitches/show.html.erb
  25. BIN public/images/new_design/actionitems.png
  26. BIN public/images/new_design/actionitems1.png
  27. BIN public/images/report.gif
  28. +1 −1 spec/views/myspot/pitches/index.html.haml_spec.rb
@@ -5,8 +5,8 @@ class PagesController < ApplicationController
about
contact
dmc_agreement
+ examples
license
- media_partners
press
privacy
quick_donate
@@ -22,7 +22,8 @@
- elsif @pitch.assignments.open.any?
= render :partial => @pitch.assignments.open
- else
- This pitch has no assignments.
+ Not every pitch has assignments. Like large cats, some reporters like to work alone. Check
+ to see if other pitches do have assignments you can help out with!
%br
.span-220.column_v.box_white
= render :partial => "donations/button", :locals => { :news_item => @pitch }
@@ -2,7 +2,7 @@
#header
.logo{ :class => "#{(@current_network && @current_network.name ? @current_network.name.to_s.downcase : '')}" }
%p
- = link_to "<span class='hide'>Spot.us - Community Funded Reporting</span>", "/", :class => "logo-link", :title => "Spot.us - Community Funded Reporting"
+ = link_to "<span class='hide'>Spot.us - Community Funded Reporting</span>", "/", :class => "logo-link", :title => "Spot.us - Community Powered Reporting"
.nav-container
%ul#main-nav
%li{:class=>"suggest_story#{check_if_tab("suggest_story",@selected_tab)}"}= facebox_login_link_to "Suggest a Story", new_tip_path
@@ -28,16 +28,19 @@
<div class="right-column">
<h3>What is Spot.Us</h3>
<p>
- Spot.Us is a nonprofit project to pioneer “community funded reporting.” Through Spot.Us the public can commission investigations with tax deductible donations for important and perhaps overlooked stories. If a news organization buys exclusive rights to the content, donations are reimbursed. Otherwise content is made available through a Creative Commons license.
- <%= link_to 'More', page_path("about")%>
+ Spot.Us is an open source project to pioneer “community powered reporting.” Through
+ Spot.Us the public can commission and participate with journalists to do reporting on
+ important and perhaps overlooked topics. Contributions are tax deductible and we partner
+ with news organizations to distribute content under appropriate licenses.
+ <%= link_to 'READ MORE', page_path("about")%>
</p>
<hr/>
<strong>Connect with Spot.us</strong>
<p>
- <img width="61" height="57" alt="Facebook" src="/images/new_design/facebookicon.png"/>
- <img width="61" height="57" alt="Twitter" src="/images/new_design/twittericon.png"/>
- <img width="61" height="57" alt="Flickr" src="/images/new_design/flickrlogo.png"/>
- <img width="61" height="57" alt="rss" src="/images/new_design/rssicon.png"/>
+ <a href="http://www.facebook.com/pages/SpotUs/74947774190"><img width="61" height="57" alt="Facebook" src="/images/new_design/facebookicon.png"/></a>
+ <a href="http://twitter.com/spotus"><img width="61" height="57" alt="Twitter" src="/images/new_design/twittericon.png"/></a>
+ <a href="http://www.flickr.com/photos/29792566@N08/"><img width="61" height="57" alt="Flickr" src="/images/new_design/flickrlogo.png"/></a>
+ <a href="http://blog.spot.us"><img width="61" height="57" alt="rss" src="/images/new_design/rssicon.png"/></a>
</p>
</div>
</div>
@@ -1,7 +1,7 @@
<div class="container">
<div class="logo">
<p>
- <a href="/" class="logo-link" title="Spot.us - Community Funded Reporting"><span class="hide">Spot.us - Community Funded Reporting</span>
+ <a href="/" class="logo-link" title="Spot.us - Community Funded Reporting"><span class="hide">Spot.us - Community Powered Reporting</span>
<%if @current_network && @current_network.name=="la"%>
<br /><img src="/images/new_design/usc.png" />
<%end%>
@@ -22,7 +22,7 @@
<div class="roundedcornr_box_807323">
<div class="roundedcornr_top_807323"><div></div></div>
<div class="roundedcornr_content_807323">
- Newsletter
+ <a href="http://spot.us1.list-manage.com/subscribe?u=eed5c3b3aed45d5f05eca391c&id=b693cc07c0">Newsletter</a>
</div>
<div class="roundedcornr_bottom_807323"><div></div></div>
</div>
@@ -31,7 +31,7 @@
<div class="roundedcornr_box_807323">
<div class="roundedcornr_top_807323"><div></div></div>
<div class="roundedcornr_content_807323">
- Blog
+ <a href="http://blog.spot.us">Blog</a>
</div>
<div class="roundedcornr_bottom_807323"><div></div></div>
</div>
@@ -40,7 +40,7 @@
<div class="roundedcornr_box_807323">
<div class="roundedcornr_top_807323"><div></div></div>
<div class="roundedcornr_content_807323">
- Media Partners
+ <a href="/pages/examples">Projects and Partners</a>
</div>
<div class="roundedcornr_bottom_807323"><div></div></div>
</div>
@@ -50,7 +50,7 @@
<div class="roundedcornr_box_807323">
<div class="roundedcornr_top_807323"><div></div></div>
<div class="roundedcornr_content_807323">
- About Spot.Us
+ <a href="/pages/about">About Spot.Us</a>
</div>
<div class="roundedcornr_bottom_807323"><div></div></div>
</div>
@@ -4,6 +4,13 @@ See the assignment at:
<%= @assignment.pitch.headline %>
<%= pitch_assignment_url(@assignment.pitch, @assignment) %>
+If you go back to the pitch you'll notice a big red button that says
+"Take These Actions." From there you can create blog posts.
+
+These posts will be a way to turn in your assignment.
+
+You should email info@spot.us so we can put you in touch with the reporter.
+They may have specific hints/tips for this assignment.
Sincerely,
Spot.Us
@@ -1,9 +1,21 @@
-<%= @contributor.full_name %> has applied to contribute to this assignment.
+Hello Spot.Us Reporter
+
+<%= @contributor.full_name %> has applied to contribute to one of your assignments assignment.
<%= @assignment.pitch.headline %>
See the assignment at:
<%= pitch_assignment_url(@assignment.pitch, @assignment) %>
+Who becomes part of your reporting team is up to your discretion.
+
+Visit your pitch and click into the specific assignment in question.
+At the bottom you can see who applied for the task and can approve/reject them.
+
+If approved they will have access to your pitche's "story updates" where
+they can turn in their reporting.
+
+If you want to be introduced to them, email info@spot.us
+
Sincerely,
Spot.Us
@@ -1,7 +1,13 @@
+Hello Spot.Us Community Member
+
Your application to contribute to this assignment has been rejected.
<%= @assignment.pitch.headline %>
+We apologize and don't want you to be discouraged. Every reporting project
+is unique. Some lend themselves to collaboration. Others do not.
+
+Perhaps there is another assignment out there to which you can contribute.
Sincerely,
Spot.Us
@@ -8,12 +8,16 @@ Spot.Us is yours to shape (including your profile: http://spot.us/myspot/profile
Our goal is to make sure that reporters cover the issues that are
important to you. The best way to make this happen is to....
-1. Start a tip: This lets our reporters know what is important to you.
+1. Suggest a Story: This lets our reporters know what is important to you.
2. Fund a pitch: Perhaps our reporters have already created a pitch that
would be of interest to you. Your donation could turn it into a reality.
Check out our action items here: http://spot.us/news_items
+3. Pick up an Assignment: Some pitches have assignments where you can help
+out with the reporting by donating time. Search through our reporting
+projects here: http://spot.us/news_items
+
If you have any questions – don’t hesitate to contact Spot.Us: info@spot.us
We are very hands on and passionate about making sure that the
@@ -1,6 +1,8 @@
Hello,
-There is a new comment by <%= @comment.user.full_name %> on the <%= @comment.commentable.type.to_s.downcase %> "<%=h @comment.commentable.headline %>" at Spot.Us.
+There is a new comment on Spot.Us to a story you've shown interest in.
+
+by <%= @comment.user.full_name %> on the <%= @comment.commentable.type.to_s.downcase %> "<%=h @comment.commentable.headline %>"
Check it out at <%= news_item_url(@comment.commentable) %>
@@ -6,35 +6,19 @@ Organizations are the ONLY type of account that we grant special
privileges to and as a result we are very careful about who is given a
"news organization" account on Spot.Us
+But now that you are in - we work for you!
+
If you have any questions - don't hesitate to contact David Cohn:
David@spot.us
In the meantime - here are some ideas on how to get started.
-1. Start a story: This lets other freelance reporters know what you want
-covered.
-
-2. Start a pitch: You could use this to raise money for a freelancer.
-Perhaps a freelance reporter has already created a
-pitch that would be of interest to you. Your donation could turn it into
+Start a pitch: You could use this to raise money for a freelancer.
+Perhaps a freelance reporter has already created a pitch that would
+be of interest to you. Your donation could turn it into
a reality. Check out our browse feature here: http://spot.us/news_items
-As a news organization you are NOT limited in how much you can donate
-towards a pitch. This is because you have been vetted to follow the code
-of journalistic ethics as described by the Society of Professional
-Journalists.
-
-If you donate 50% or more towards a pitch, Spot.Us will grant you
-temporary exclusive rights to the content.
-
-Or: You can donate 100% towards a pitch and Spot.Us will grant you
-temporary exclusive rights to the content and reimburse any community
-members that had pre-funded the pitch. This is a way to build a new
-relationship with your readers. Trust us, they'll love you for refunding
-their donation.
-
-We are very hands on and passionate about making sure that the
-information needs of our communities are met. We work for you!!!!
+You can get more ideas at our FAQ: http://spot.us/pages/about#faq_news_organization
Sincerely,
David Cohn
@@ -12,6 +12,8 @@ some additional information about your news organization. Once we receive
this and have a chance to look over your site we will move forward and get you
up and running on Spot.Us!!!
+This usually takes less than 24 hours. It's even faster if you email info@spot.us
+
If you want - feel free to sign up as a "citizen" or "reporter," but use a different email address.
Sincerely,
@@ -9,5 +9,7 @@ You can login here: http://spot.us/session/new
This is a temporary password and should be changed immediately upon signing in.
If you did not request this new password, contact us immediately.
+info@spot.us
+
Sincerely,
Spot Us
@@ -1,5 +1,5 @@
Welcome to Spot.Us and thanks for joining our effort to produce
-community funded investigative journalism.
+community powered reporting.
You can login here: http://spot.us/session/new
@@ -8,15 +8,11 @@ In the meantime, here are some ideas on how to get started:
1. Start a pitch: Traditionally you would pitch editors, because they
were the only people that had a freelance budget. At Spot.Us community
members band together to build a budget of their own. Now you can pitch
-the public to do the journalism you want! Here is some advice on how to
-build good pitches:
+the public to do the journalism you want!
-http://snipurl.com/48ywx
+Here are answers to some FAQ's
-2. Find a tip: Community members let freelance reporters know what is
-important to them through story tips. You can search these (and how much
-money is potentially on the table) on the browse function here:
-http://spot.us/news_items
+http://spot.us/pages/about#faq_reporter
We are very hands on and passionate about making sure that the
information needs of our communities are met. We work for you!!!!
@@ -15,11 +15,11 @@
- if pitch.can_be_accepted?
.action= link_to "Accept", accept_myspot_pitch_url(pitch), :method => :put, :confirm => "Are you sure you want to accept this pitch, even though it isn't fully funded?"
- if pitch.story
- .action= link_to "Go to story", story_path(pitch.story)
+ .action= link_to "Go to Draft", story_path(pitch.story)
- if pitch.funded? || pitch.accepted?
- unless pitch.story.nil?
- if pitch.story.draft?
- .action= link_to "Report", edit_story_url(pitch.story)
+ .action= link_to "Submit Draft", edit_story_url(pitch.story)
- elsif pitch.story.published?
.action= link_to "View Published Story", story_url(pitch.story)
= link_to 'Make blog post', new_pitch_post_path(pitch)
Oops, something went wrong.

0 comments on commit 7bfc51f

Please sign in to comment.