From d5b6d559c351e994f9e838446bc3e2809d6f0c63 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel.ebert@upf.edu>
Date: Wed, 30 May 2012 18:12:10 +0200
Subject: [PATCH] New style display of posts

---
 jrnl/Entry.py   | 20 +++++++++++---------
 jrnl/Journal.py |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/jrnl/Entry.py b/jrnl/Entry.py
index 08e7cac0..91a1bf14 100644
--- a/jrnl/Entry.py
+++ b/jrnl/Entry.py
@@ -19,18 +19,20 @@ class Entry:
 
     def __str__(self):
         date_str = self.date.strftime(self.journal.config['timeformat'])
-        body_wrapper = "\n" if self.body else ""
         if self.journal.config['linewrap']:
-            body = body_wrapper + textwrap.fill(self.body, self.journal.config['linewrap'])
+            title = textwrap.fill(date_str + " " + self.title, self.journal.config['linewrap'])
+            seplen = len(title.splitlines()[-1])
+            body = textwrap.fill(self.body, self.journal.config['linewrap'], initial_indent="| ", subsequent_indent="| ")
         else:
-            body = body_wrapper + self.body.strip()
-        space = "\n"
+            title = date_str + " " + self.title
+            seplen = len(title)
+            body = self.body.strip()
+        separator = "\n" #+ "-"*seplen + "\n"
 
-        return "{date} {title} {body} {space}".format(
-            date=date_str,
-            title=self.title,
-            body=body,
-            space=space
+        return "{title}{sep}{body}\n".format(
+            title=title,
+            sep=separator if self.body else "",
+            body=body
         )
 
     def __repr__(self):
diff --git a/jrnl/Journal.py b/jrnl/Journal.py
index b8c18651..d3983081 100644
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@@ -134,7 +134,7 @@ class Journal:
 
     def __str__(self):
         """Prettyprints the journal's entries"""
-        sep = "-"*60+"\n"
+        sep = "\n"
         pp = sep.join([str(e) for e in self.entries])
         if self.config['highlight']: # highlight tags
             if self.search_tags: