@@ -56,14 +56,10 @@ function Blog(app) {
+ '</li>';
};
- this.makeTwitterLinks = function(text) {
- return text.replace(/ @([^ .,]+)/g, ' <a href="http://twitter.com/$1">@$1</a>');
- };
-
this.formatBody = function(body, format) {
if (format == 'markdown') {
var converter = new Showdown.converter();
- return this.makeTwitterLinks(converter.makeHtml(body));
+ return converter.makeHtml(body);
} else if (format == 'textile') {
return superTextile(body);
} else {
_attachments/blog.js
@@ -1,5 +1,5 @@
body {
- font: 1.2em "Minion Pro", Georgia, serif;
+ font: 1.2em "Hoefler Text", Georgia, serif;
line-height:1.2em;
margin:0;
padding:0;
@@ -7,7 +7,6 @@ body {
a {
text-decoration:none;
- color:#06266F;
}
h1 {
@@ -24,6 +23,7 @@ h2 {
}
#header a {
+ color:#fff;
}
#header #login, #header #edit {
@@ -40,9 +40,10 @@ h4 {
}
#header {
- background:#FFB273;
+ background:#9a9;
padding:8px;
- color:#333;
+ text-shadow: 0 0 4px #000;
+ color:#fff;
}
#content {
@@ -54,23 +55,13 @@ h4 {
margin-left:240px;
}
-#left {
- float:left;
-}
#tags-front {
+ float:left;
width:220px;
margin:2ex 1em;
color:#999;
}
-#hello {
- width:220px;
- margin:2ex 1em;
- color:#999;
-}
-
-
-
label {
display:block;
clear:left;
_attachments/screen.css
@@ -1,3 +1,3 @@
{
- "title": "plok light"
+ "title": "Daytime Running Lights"
}
\ No newline at end of file
blog.json
@@ -2,7 +2,6 @@
<html>
<head>
<title><%= title %></title>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" href="../../screen.css" type="text/css"/>
<link rel="alternate" type="application/atom+xml"
title="Atom Feed" href="<%= feedPath %>"/>
@@ -12,10 +11,7 @@
<a id="edit" href="../../_show/edit">Create new post</a>
<h2><a href="<%= index %>"><%= title %></a></h2>
</div>
- <div id="left">
- <div id="hello">Hi, this is <a href="http://jan.prima.de/">Jan’s</a> Tumble blog.</div>
- <div id="tags-front"></div>
- </div>
+ <div id="tags-front"></div>
<div id="content">
<h1>Recently...</h1>
<ul id="posts">
templates/index/head.html
@@ -24,7 +24,7 @@
}
var tags = [];
for(var idx in json.rows) {
- var percent = Math.ceil(Math.pow((json.rows[idx].value / total), 0.25) * 100);
+ var percent = Math.ceil(Math.pow((json.rows[idx].value / total), 0.25) * 200);
tags.push('<span style="font-size:'+percent+'%;">' + json.rows[idx].key + '</span>');
}
$("#tags-front").append(tags.join(", "));
templates/index/tail.html
@@ -16,7 +16,26 @@
<div class="body"><%= post %></div>
</div>
<div id="tags"></div>
- <div><a href="http://twitter.com/janl">Please comment via Twitter</a></div>
+ <div id="comments">
+ <ul></ul>
+ <!-- form to create a comment -->
+ <form id="new-comment" action="post.html" method="post">
+ <h3>Comment on this post</h3>
+ <p><label>Name</label>
+ <input type="text" name="commenter-name" value=""></p>
+ <p><label>Url <em>(optional)</em></label>
+ <input type="text" name="commenter-url" value=""></p>
+ <p><label>Email <em>(for <a href="http://gravatar.com">Gravatar</a>)</em></label>
+ <input type="text" name="commenter-email" value=""></p>
+ <p><label>Comment <em>(with <a href="http://warpedvisions.org/projects/markdown-cheat-sheet/">Markdown</a>)</em></label>
+ <textarea name="comment" rows="8" cols="40"></textarea></p>
+ <p>
+ <input type="button" id="preview" value="Preview">
+ <input type="submit" value="Save →">
+ </p>
+ </form>
+ <div id="comment-preview"></div>
+ </div>
</div>
</body>
<script src="/_utils/script/json2.js"></script>
@@ -32,6 +51,53 @@
$('.date').each(function() {
$(this).text(app.prettyDate(this.innerHTML));
});
+
+ function displayComments() {
+ app.design.view("comments", {
+ startkey: [docid],
+ endkey: [docid, {}],
+ reduce : false,
+ success: function(json) {
+ var ul = $("#comments ul");
+ for (var i=0; i < json.rows.length; i++) {
+ var c = json.rows[i].value;
+ ul.append(B.commentListing(c));
+ }
+ $('#comments').fadeIn(2000);
+ }
+ });
+ };
+
+ displayComments();
+
+ var commentForm = app.docForm("form#new-comment", {
+ fields : [
+ "commenter-name",
+ "commenter-email",
+ "commenter-url",
+ "comment"
+ ],
+ template : {
+ type : "comment",
+ post_id : docid,
+ format : "markdown"
+ },
+ beforeSave : function(doc) {
+ doc.html = B.formatBody(doc.comment, doc.format);
+ doc.created_at = new Date();
+ },
+ success : function(resp, doc) {
+ $("#new-comment").html('<h2>Success! Your comment has posted.</h2>');
+ $("#comments ul").append(B.commentListing(doc));
+ $("#comments ul li:last").hide().fadeIn(2000);
+ }
+ });
+
+ $("#preview").click(function() {
+ var doc = commentForm.localDoc();
+ var html = B.formatBody(doc.comment, doc.format);
+ $('#comment-preview').html(html);
+ });
});
</script>
<script src="<%= assets %>/showdown.js"></script>
templates/post.html
@@ -1,17 +1,7 @@
function(doc) {
// only posts have slugs, dates, and html
if (doc.type == "post") {
- // strip out tags for the summary
- var summary = (doc.html.replace(/<(.|\n)*?>/g, '');
-
- // we only want a 350 char preview.
- if(summary.length > 350) {
- summary = summary.substring(0,350)) + "…";
- }
-
- // link twitter names
- // todo: make/use a library function
- summary = summary.replace(/ @([^ .,]+)/g, ' <a href="http://twitter.com/$1">@$1</a>');
+ var summary = (doc.html.replace(/<(.|\n)*?>/g, '').substring(0,350) + '...');
emit(doc.created_at, {
html : doc.html,
summary : summary,
views/recent-posts/map.js
511548c448544089e2a37f641b90017eea9497a3
Chris Anderson
jchris@grabb.it
http://github.com/jchris/sofa/commit/73d92e0745ac9a2f1907d1a3954c976c1f11f70e
73d92e0745ac9a2f1907d1a3954c976c1f11f70e
2009-06-07T12:18:32-07:00
2009-06-07T12:18:32-07:00
Revert "Merge commit '6c1b64a4214eb3088ce75ce6053a6c9eeeade31f'"
This reverts commit 511548c448544089e2a37f641b90017eea9497a3.
f6f03b889230131038031eb822393da132cc0c19
Chris Anderson
jchris@grabb.it