bunch of updates

[iankelling.org] / b.rb

diff --git a/b.rb b/b.rb
index 6bd631d9c9d81489e3263da61b0a6349c61b6699..4bd8f96d0c187dbe365073f90ccad5a9b544c5e4 100644 (file)
--- a/b.rb
+++ b/b.rb
@@ -86,16 +86,16 @@ EOF
       <h3><a href="/">iankelling.org</a>#{o[:header]}</h3>
     </header>
     <div class="main-content-stripe">
-      <div class="content">
+      <div class="#{o[:prose] ? "prose" : "content"}">
         #{content}
       </div>
     </div>
-    <div id="comment-stripe">
+    <div class="comment-stripe">
 #{o[:comments]}
     </div>
     <footer>
 #{o[:footer]}
-      <p>This site has a <a href="/git/?p=iankelling.org;a=summary">git repo</a>. Unless stated otherwise, <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img id="cc-by-sa" alt="Creative Commons License" src="/assets/cc-by-sa-4.0-80x15.png" /></a></p>
+      <p>This site has a <a href="/git/?p=iankelling.org;a=summary">git repo</a>. Unless stated otherwise, <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img class="cc-by-sa" alt="Creative Commons License" src="/assets/cc-by-sa-4.0-80x15.png" /></a></p>
       <p><address><a href="mailto:ian@iankelling.org">ian@iankelling.org</a> let me know what you think</address></p>
     </footer>
   </body>
@@ -125,15 +125,14 @@ EOF
   end
 
   def comment_html(comment, date)
-    inner = Redcarpet::Markdown.new(Redcarpet::Render::Safe, fenced_code_blocks: true).render(<<EOF)
-#{comment}
-<span class="comment-date">#{Time.at(date).strftime("%b %-d '%y")}</span>
-EOF
     # I tried putting the time,  %I:%M %p UTC, but it looks kinda
     # clunky, going against my simple theme.
+    user_input = Redcarpet::Markdown.new(Redcarpet::Render::Safe,
+                                   fenced_code_blocks: true).render(comment)
     <<EOF
 <div class="comment">
-  #{inner}
+  #{user_input}
+  <p class="comment-date">#{Time.at(date).strftime("%b %-d '%y")}</p>
 </div>
 EOF
   end
@@ -221,11 +220,11 @@ EOF
         comment_html("Note: there #{text} pending approval.", NOW)
     end
     com_section = <<-EOF
-      <form class="comment" action="/cgi/comment" method="post">
-        <input class="misc" type="text" name="url">
+      <form action="/cgi/comment" method="post">
+        <input class="misc-comment-input" type="text" name="url">
         <input name="goto" type="hidden" value="#{rel_path}">
-        <textarea rows="10" name="comment" placeholder="markdown" maxlength="1000"></textarea>
-        <input type="submit" value="Leave a comment">
+        <textarea rows="10" name="comment" maxlength="1000"></textarea>
+        <input type="submit" value="Add a comment (markdown works)">
       </form>
       <div id="comments">
          #{com_list}
@@ -243,7 +242,7 @@ EOF
     blog_toc_entry = "<li><a href=\"#{rel_path}\">#{title}</a></li>"
 
     com_section = <<EOF
-<div id="comment-section">
+<div id="comment-section" class="comment-section">
   #{com_section}
 </div>
 EOF
@@ -268,6 +267,11 @@ EOF
     fskel(rel_path, title, page_html,
           header: header_rel,
           footer: footer_extra,
+          # We call the main content prose because it can contain
+          # code, so we want to left justify it, so we dont have
+          # to cram all the code into the middle and can use
+          # a wider area.
+          prose: true,
           comments: com_section,
           description: description)
     url="#{DURL}#{rel_path}"