From bbaa8f554f941e9fadfce3e82f2209a1bf0b764d Mon Sep 17 00:00:00 2001
From: joshua stein <jcs@jcs.org>
Date: Sat, 30 Jun 2012 19:43:16 -0500
Subject: [PATCH] fix markdown help display on story submission

---
 app/assets/stylesheets/application.css | 18 ++++++++++++++++++
 app/models/story.rb                    |  2 +-
 app/views/stories/_form.html.erb       | 12 +++++-------
 app/views/stories/edit.html.erb        | 17 ++++++++++++++---
 app/views/stories/new.html.erb         | 15 +++++++++++++--
 5 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ab4d567..4ab36a6 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -519,6 +519,24 @@ div.markdown_help_label {
 	line-height: 2em;
 }
 
+
+div#story_box input#story_url {
+	width: 506px;
+}
+div#story_box input#story_title {
+	width: 600px;
+}
+div#story_box #story_tags_a {
+	width: 624px;
+}
+div#story_box textarea {
+	width: 600px;
+}
+div#story_box div.markdown_help_toggler {
+	margin-left: 7em;
+	width: 610px;
+}
+
 /* data tables */
 
 table.data caption {
diff --git a/app/models/story.rb b/app/models/story.rb
index d4afe3d..72539c4 100644
--- a/app/models/story.rb
+++ b/app/models/story.rb
@@ -80,7 +80,7 @@ class Story < ActiveRecord::Base
   end
 
   def comments_url
-    "http://lobste.rs/p/#{self.short_id}/#{self.title_as_url}"
+    "/p/#{self.short_id}/#{self.title_as_url}"
   end
 
   @_comment_count = nil
diff --git a/app/views/stories/_form.html.erb b/app/views/stories/_form.html.erb
index b7be0ea..3b08ca8 100644
--- a/app/views/stories/_form.html.erb
+++ b/app/views/stories/_form.html.erb
@@ -9,7 +9,7 @@
     </div>
 	<% elsif !f.object.id %>
     <%= f.label :url, "URL:", :class => "required" %>
-		<%= f.text_field :url, :style => "width: 475px;" %>
+		<%= f.text_field :url %>
 		<%= button_to_function "Fetch Title",
       "Lobsters.fetchURLTitle($(this), $('#story_url'), $('#story_title'));" %>
 	<% end %>
@@ -17,7 +17,7 @@
 
   <div class="boxline">
     <%= f.label :title, "Title:", :class => "required" %>
-    <%= f.text_field :title, :maxlength => 100, :style => "width: 475px;" %>
+    <%= f.text_field :title, :maxlength => 100 %>
 	</div>
 
   <div class="boxline" style="margin-bottom: 2px;">
@@ -25,14 +25,12 @@
     :style => "line-height: 2.3em;" %>
   <%= f.select "tags_a", Tag.order(:tag).map{|t|
     [ "#{t.tag} - #{t.description}", t.tag ] }, {},
-    { :multiple => true, :style => "width: 487px;" } %>
+    { :multiple => true } %>
   </div>
 
   <div class="boxline">
     <%= f.label :description, "Text:", :class => "required" %>
-    <%= f.text_area :description, :size => "100x10",
-      :placeholder => "optional, not recommended when submitting a link" %>
+    <%= f.text_area :description, :rows => 15,
+      :placeholder => "optional when submitting a link" %>
   </div>
-
-  <%= render :partial => "global/markdownhelp" %>
 </div>
diff --git a/app/views/stories/edit.html.erb b/app/views/stories/edit.html.erb
index 7441763..284ec68 100644
--- a/app/views/stories/edit.html.erb
+++ b/app/views/stories/edit.html.erb
@@ -1,4 +1,4 @@
-<div class="box">
+<div class="box" id="story_box">
 	<div class="legend">
 		Edit Story
 	</div>
@@ -9,9 +9,20 @@
       :f => f } %>
 
     <p></p>
+    
     <div class="box">
-      <%= submit_tag "Save" %>
-      &nbsp;or <a href="<%= story_url(@story.short_id) %>">cancel editing</a>
+      <div class="boxline markdown_help_toggler">
+        <div class="markdown_help_label">
+          <span class="fakea">Limited Markdown formatting available</span>
+        </div>
+
+        <%= submit_tag "Save" %>
+        &nbsp;or <a href="<%= story_url(@story.short_id) %>">cancel editing</a>
+
+        <div style="clear: both;"></div>
+
+        <%= render :partial => "global/markdownhelp" %>
+      </div>
     </div>
 	<% end %>
 </div>
diff --git a/app/views/stories/new.html.erb b/app/views/stories/new.html.erb
index 022bd4d..9ab5cfe 100644
--- a/app/views/stories/new.html.erb
+++ b/app/views/stories/new.html.erb
@@ -1,4 +1,4 @@
-<div class="box">
+<div class="box" id="story_box">
 	<div class="legend">
 		Submit a Story
 	</div>
@@ -8,8 +8,19 @@
       :f => f } %>
 
     <p></p>
+
     <div class="box">
-      <%= submit_tag "Submit" %>
+      <div class="boxline markdown_help_toggler">
+        <div class="markdown_help_label">
+          <span class="fakea">Limited Markdown formatting available</span>
+        </div>
+
+        <%= submit_tag "Submit" %>
+
+        <div style="clear: both;"></div>
+
+        <%= render :partial => "global/markdownhelp" %>
+      </div>
     </div>
 	<% end %>
 </div>