Newsitem news_feed_id is none by default

elipsized_content without links
anchors for news items

mixins/newsitemmixin.py

@@ -8,7 +8,7 @@ class NewsItemMixin(MessageMixin):
 	news_item_edit_time = None
 	news_item_url = '/index.html'
 
-	news_feed_id = 'news'
+	news_feed_id = None
 
 
 	def get_news_item(self):
@@ -26,7 +26,7 @@ class NewsItemMixin(MessageMixin):
 	def process_message(self, message):
 		other_messages = super(NewsItemMixin, self).process_message(message)
 
-		if message == None:
+		if message == None and self.news_feed_id != None:
 			other_messages += [{
 				'type' : 'news_feed_item',
 				'feed_id' : self.news_feed_id,

modules/gallery.py

@@ -60,8 +60,6 @@ class Gallery(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
         lines = self.description['content'].split('\n')
         elipsized_description = '\n'.join(lines[0:self.news_item_len])
 
-        elipsized_description += '\n\n View the [images](%s) ...' % self.url
-
         item = {
             'title': self.description['title'],
             'content': elipsized_description,

modules/newsfeed.py

@@ -48,12 +48,11 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin):
 		rendered_items = []
 		for item in self.items:
 			item['content'] = markdown_converter.convert(item['content'])
-			item['url'] = self.url
 			rendered_items += [item]
 
 		item_directory = os.path.join(self.content_directory, self.news_item_directory)
 		for news_file in os.listdir(item_directory):
-			_, ext = os.path.splitext(news_file)
+			filename, ext = os.path.splitext(news_file)
 			if ext == '.md':
 				item = {}
 
@@ -62,6 +61,8 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin):
 				item = self.read_content_file(full_path)
 
 				item['content'] = markdown_converter.convert(item['content'])
+				item['anchor'] = filename
+				item['url'] = "%s#%s" % (self.url, filename)
 
 				rendered_items += [item]
 

modules/page.py

@@ -35,8 +35,6 @@ class Page(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin):
 		lines = self.content['content'].split('\n')
 		elipsized_content = '\n'.join(lines[0:self.news_item_len])
 
-		elipsized_content += '\n\n Read [more](%s) ...' % self.url
-
 		item = {
 			'title': self.content['title'],
 			'content': elipsized_content,