end
def fwrite(output_path, string)
+ output_path = File.join('./', output_path)
FileUtils.mkdir_p(File.dirname(output_path))
File.write(output_path, string)
end
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>. Code is gpl, content is <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> unless otherwise noted</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)
-#{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
b = File.basename(file,'.md')
# date is in the format: YYYY-MM-DD-
date = Time.parse(b[0..DATE_LEN])
- rel_path = "blog/#{b[(DATE_LEN + 1)..-1]}.html"
+ rel_path = "/blog/#{b[(DATE_LEN + 1)..-1]}.html"
comments = $db.execute <<-SQL, [WAIT_DATE]
select comment, date from c
where page = '#{rel_path}' and (
- state = 'picked' or state = 'known'
+ state = 'picked' or state = 'known' or state = 'timed'
or (state = 'waiting' and date < ?))
SQL
# get earliest comment. earlier ones stored in git will also be
comment_html("Note: there #{text} pending approval.", NOW)
end
com_section = <<-EOF
- <form class="comment" action="/comment.rb" 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">
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
footer: footer_extra,
comments: com_section,
description: description)
- url="#{DURL}/#{rel_path}"
+ url="#{DURL}#{rel_path}"
# following from https://creativecommons.org/choose,