From 559bf283ebe2f96d5d6fef7156622d71b570e74d Mon Sep 17 00:00:00 2001
From: LongHairedHacker <sebastian@sebastians-site.de>
Date: Mon, 14 Nov 2016 23:39:58 +0100
Subject: [PATCH] Move titles into content files Renamed page_title into title

---
 mixins/templatemixin.py |  7 +++++++
 modules/gallery.py      |  5 ++---
 modules/newsfeed.py     | 28 ++--------------------------
 modules/page.py         |  5 ++---
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/mixins/templatemixin.py b/mixins/templatemixin.py
index 59094c5..f7e3805 100644
--- a/mixins/templatemixin.py
+++ b/mixins/templatemixin.py
@@ -44,6 +44,12 @@ class TemplateMixin(object):
 		first_line = content_file.readline()
 		second_line = content_file.readline()
 
+		third_line = content_file.readline().strip()
+		while third_line == '':
+			third_line = content_file.readline().strip()
+
+		result['title'] = third_line
+
 		result['content'] = content_file.read().decode('utf-8')
 
 		result['creation_time'] = parser.parse(first_line)
@@ -51,4 +57,5 @@ class TemplateMixin(object):
 
 		content_file.close()
 
+
 		return result
diff --git a/modules/gallery.py b/modules/gallery.py
index 298676d..df1f757 100644
--- a/modules/gallery.py
+++ b/modules/gallery.py
@@ -12,7 +12,6 @@ from verdandi.mixins.newsitemmixin import NewsItemMixin
 from verdandi.constants import CONTENT_DIRECTORY, MARKDOWN_EXTENSIONS
 
 class Gallery(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
-    title = 'Gallery Title'
     gallery_description_file = 'description.md'
     gallery_directory = 'gallery'
     gallery_images_url = 'img/gallery'
@@ -64,7 +63,7 @@ class Gallery(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
         elipsized_description += '\n\n View the [images](%s) ...' % self.url
 
         item = {
-            'title': self.title,
+            'title': self.description['title'],
             'content': elipsized_description,
             'creation_time': self.description['creation_time'],
             'edit_time': self.description['edit_time'],
@@ -76,7 +75,7 @@ class Gallery(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
 
     def get_context(self):
         context = super(Gallery,self).get_context()
-        context['page_title'] = self.title
+        context['title'] = self.title
 
         markdown_converter = markdown.Markdown(extensions = self.markdown_extensions)
 
diff --git a/modules/newsfeed.py b/modules/newsfeed.py
index b25d8d9..286ac68 100644
--- a/modules/newsfeed.py
+++ b/modules/newsfeed.py
@@ -40,7 +40,7 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin):
 
 	def get_context(self):
 		context = super(NewsFeed,self).get_context()
-		context['page_title'] = self.title
+		context['title'] = self.title
 		context['feed_url'] = self.feed_url
 
 		markdown_converter = markdown.Markdown(extensions = self.markdown_extensions)
@@ -59,7 +59,7 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin):
 
 				full_path = os.path.join(item_directory, news_file)
 
-				item = self.read_news_item_file(full_path)
+				item = self.read_content_file(full_path)
 
 				item['content'] = markdown_converter.convert(item['content'])
 
@@ -71,30 +71,6 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin):
 		return context
 
 
-	def read_news_item_file(self, path):
-		item_file = open(path, 'r')
-
-		result = {}
-
-		first_line = item_file.readline()
-		second_line = item_file.readline()
-
-		third_line = item_file.readline().strip()
-		while third_line == '':
-			third_line = item_file.readline().strip()
-
-		result['title'] = third_line
-
-		result['content'] = item_file.read().decode('utf-8')
-
-		result['creation_time'] = parser.parse(first_line)
-		result['edit_time'] = parser.parse(second_line)
-
-		item_file.close()
-
-		return result
-
-
 	def render_files(self, context, output_directory, jinja_env):
 		self.render_to_file(self.feed_template, self.feed_url, context, output_directory, jinja_env)
 		super(NewsFeed, self).render_files(context, output_directory, jinja_env)
diff --git a/modules/page.py b/modules/page.py
index ebd36d8..2fb78b7 100644
--- a/modules/page.py
+++ b/modules/page.py
@@ -12,7 +12,6 @@ from verdandi.constants import CONTENT_DIRECTORY, MARKDOWN_EXTENSIONS
 
 class Page(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
 
-	title = "Page Title"
 	content_file = "content.md"
 	content_is_markdown = True
 	content_directory = CONTENT_DIRECTORY
@@ -39,7 +38,7 @@ class Page(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
 		elipsized_content += '\n\n Read [more](%s) ...' % self.url
 
 		item = {
-			'title': self.title,
+			'title': self.content['title'],
 			'content': elipsized_content,
 			'creation_time': self.content['creation_time'],
 			'edit_time': self.content['edit_time'],
@@ -51,7 +50,7 @@ class Page(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
 
 	def get_context(self):
 		context = super(Page,self).get_context()
-		context['page_title'] = self.title
+		context['title'] = self.content['title']
 
 		context['content_creation_time'] = self.content['creation_time']
 		context['content_edit_time'] =  self.content['edit_time']