head = <<EOF
<link rel="canonical" href="#{DURL}/#{rel_path}">
EOF
- if rel_path =~ %r{^blog/.}
+ if rel_path =~ %r{^/blog/|^blog.html}
head += <<EOF
<link rel="alternate" type="application/atom+xml" title="#{DN}" href="#{DURL}/feed.xml">
EOF
<head>
<meta charset="utf-8">
<title>#{title}</title>
- <link rel="stylesheet" href="/main.css">
- <link rel="stylesheet" href="/common.css">
+ <link rel="stylesheet" href="/css/main.css">
<link rel="shortcut icon" href="/assets/favicon.png" />
<meta name="description" content="#{o[:description] || DESCRIPTION}">
#{o[:head]}
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
- <header>
+ <header class="page_header">
<h3><a href="/">iankelling.org</a>#{o[:header]}</h3>
</header>
<div class="main-content-stripe">
#{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><address><a href="ian@iankelling.org">ian@iankelling.org</a> let me know what you think</address></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>
</html>
end
def comment_html(comment, date)
- inner = Redcarpet::Markdown.new(Redcarpet::Render::HTML, fenced_code_blocks: true).render(<<EOF)
+ 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
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