Merge pull request #11 from jonathanpberger/master

Clean up (and DRY up) some markdown.
mkocher · Aug 26, 2012 · 5f2620f · 5f2620f
2 parents 221f2d1 + 44850e3
commit 5f2620f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -14,6 +14,8 @@ def dynamic_new_item_path(opts={})
   end
 
   def standup_closing
+    return "STRETCH! It's Floor Friday!" if Date.today.wday == 5
+
     index = rand(STANDUP_CLOSINGS.length)
     STANDUP_CLOSINGS[index]
   end
@@ -29,4 +31,10 @@ def show_or_edit_post_path(post)
       edit_post_path(post)
     end
   end
+
+  def markdown_placeholder
+    "A description will appear in the email (and the blog if public), but not be visible during standup. Wrap code in backticks (\"`\") and wrap URLs in angle brackets (\"<\" and \">\") for Markdown goodness."
+
+  end
+
 end
diff --git a/app/views/items/_as_markdown.html.erb b/app/views/items/_as_markdown.html.erb
@@ -4,9 +4,9 @@
 
     <% items[kind].each do |item| %>
       <% if item.date.present? %>
-  * <%= Date::DAYNAMES[item.date.wday] %>: <%= item.title %>
+### <%= Date::DAYNAMES[item.date.wday] %>: <%= item.title %>
       <% else %>
-  * <%= item.title.html_safe %>
+### <%= item.title.html_safe %>
       <% end %>
     <% if item.description.present? %>
 

diff --git a/app/views/items/new.html.erb b/app/views/items/new.html.erb
@@ -49,7 +49,7 @@
     <div class='control-group'>
       <%= f.label :description, class: 'control-label' %><br />
       <div class='controls'>
-        <%= f.text_area :description, placeholder: "A description will appear in the email (and the blog if public), but not be visible during standup.  Markdown available." %>
+        <%= f.text_area :description, placeholder: markdown_placeholder %>
       </div>
     </div>
 

diff --git a/app/views/items/new_event.html.erb b/app/views/items/new_event.html.erb
@@ -55,7 +55,7 @@
     <div class='control-group'>
       <%= f.label :description, class: 'control-label' %><br />
       <div class='controls'>
-        <%= f.text_area :description, placeholder: "A description will appear in the email (and the blog if public), but not be visible during standup.  Markdown available." %>
+        <%= f.text_area :description, placeholder: markdown_placeholder %>
       </div>
     </div>
 

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -3,9 +3,15 @@
 describe ApplicationHelper do
   describe "#close_standup" do
     it "picks a closing" do
+      Date.stub_chain(:today, :wday).and_return(4)
       helper.should_receive(:rand).and_return(0)
       helper.standup_closing.should == "STRETCH!"
     end
+
+    it "should remind us when its Floor Friday" do
+      Date.stub_chain(:today, :wday).and_return(5)
+      helper.standup_closing.should == "STRETCH! It's Floor Friday!"
+    end
   end
 
   describe "#pending_post_count" do