From 9b881b1e3f1300c12e4ff6ac75b8b1636f271b49 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Fri, 11 Nov 2011 18:03:48 +0530
Subject: [PATCH] added comments

---
 comments/categori1/cat_2/hello_comments/1320927226.json | 1 -
 css/comments.css                                        | 8 ++++----
 lib/model.php                                           | 2 --
 templates/comments.html.tpl                             | 8 ++++----
 4 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 comments/categori1/cat_2/hello_comments/1320927226.json

diff --git a/comments/categori1/cat_2/hello_comments/1320927226.json b/comments/categori1/cat_2/hello_comments/1320927226.json
deleted file mode 100644
index 4278222..0000000
--- a/comments/categori1/cat_2/hello_comments/1320927226.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"","www":"","timestamp":"1320927226","comment":"this is a test comment"}
\ No newline at end of file
diff --git a/css/comments.css b/css/comments.css
index 6fac0a8..f45764c 100644
--- a/css/comments.css
+++ b/css/comments.css
@@ -1,4 +1,4 @@
-/* comments.css */
+/* comments */
 
 .comments {
     margin-top:50px;
@@ -11,12 +11,12 @@
 	color:#900;
 }
 .comments .comment {
-	color:#aaa;
+
     margin:20px 0;
 }
 .comments .comment .name {
-	font-style:italic;
-    color:#ccc;
+    font-style:italic;
+    color:#aaa;
 }
 .comments .comment_form {
     margin-top:40px;
diff --git a/lib/model.php b/lib/model.php
index c8910bf..e30822d 100644
--- a/lib/model.php
+++ b/lib/model.php
@@ -81,10 +81,8 @@ class Model
 	}
 
 	function process_post_request( &$entry ) {
-
 		if ($entry['comments']) 
 			$entry['comments']->process_post_request();
-			
 	}
 
 	function has_config()
diff --git a/templates/comments.html.tpl b/templates/comments.html.tpl
index a165598..f4459d1 100644
--- a/templates/comments.html.tpl
+++ b/templates/comments.html.tpl
@@ -7,8 +7,8 @@
 		
 		<? foreach($entry['comments']->comments as $comment) : ?>
 		<div class="comment">
-			<?=$comment['comment'];?>
-			<div class="name">posted by <?=$comment['name'];?> at <?=date("g:i a,  M d Y", $comment['timestamp'])?></div>
+			<?=Markdown($comment['comment']);?>
+			<div class="name"><?=$comment['name'];?>, <?=approximate_time(date('U') - $comment['timestamp'])?> ago</div>
 		</div>
 		<? endforeach; ?>
 
@@ -17,8 +17,8 @@
 	<div class="comment_form">
 
     <form action="" method="post">
-    <input type="text" name="name" /> <label for="name">name</label>  <br />
-    <input type="text" name="www" /> <label for="www">www (optional)</label>  <br />
+    <input type="text" name="name" /><label for="name">name</label>  <br />
+    <input type="text" name="www" /><label for="www">www (optional)</label>  <br />
     <textarea name="comment"></textarea>
     <br />
     
-- 
2.34.1