From cc3f597b856f33023f362eb0b5a0ef050d0bcbb9 Mon Sep 17 00:00:00 2001
From: Moc <moc@mochosting.nl>
Date: Tue, 30 Apr 2013 15:56:58 +0200
Subject: [PATCH] News template styling (bootstrap) - work in progress

---
 e107_plugins/news/templates/news_template.php | 60 ++++++++++++++++---
 e107_themes/bootstrap/style.css               |  9 +++
 2 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php
index 6bc7aa2a4..cd79797cf 100644
--- a/e107_plugins/news/templates/news_template.php
+++ b/e107_plugins/news/templates/news_template.php
@@ -51,7 +51,7 @@ $NEWS_TEMPLATE['list']['item'] = '
 
 // XXX As displayed by news.php (no query) or news.php?list.1.1 (ie. regular view of a particular category)
 //XXX TODO GEt this looking good in the default Bootstrap theme. 
-$NEWS_TEMPLATE['default']['item'] = '
+/*$NEWS_TEMPLATE['default']['item'] = '
 	{SETIMAGE: w=400}
 	<div class="view-item">
 		<h2>{NEWSTITLE}</h2>
@@ -69,8 +69,29 @@ $NEWS_TEMPLATE['default']['item'] = '
 		</div>
 	</div>
 ';
+*/
+// Attempt at bootstrap style 
+$NEWS_TEMPLATE['default']['item'] = '
+	{SETIMAGE: w=600}
+	<div class="view-item">
+		<h2>{NEWSTITLE}</h2>
+		<div class="post-meta">
+			<span><i class="icon-calendar"></i>{NEWSDATE}</span>
+			<span><i class="icon-user"></i>{NEWSAUTHOR}</span>
+			<span><i class="icon-comment"></i>{NEWSCOMMENTS}</span>
+			<span><i class="icon-tag"></i>{NEWSTAGS}</span>
+		</div>
 
-
+		<div class="body">
+			{NEWSIMAGE}
+			{NEWSBODY}
+			{EXTENDED}
+		</div>
+		<div class="options">
+			{EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
+		</div>
+	</div>
+';
 
 
 
@@ -81,13 +102,16 @@ $NEWS_TEMPLATE['default']['item'] = '
 // As displayed by news.php?extend.1
 
 //XXX TODO GEt this looking good in the default Bootstrap theme. 
-$NEWS_TEMPLATE['view']['item'] = '
+/*$NEWS_TEMPLATE['view']['item'] = '
 {SETIMAGE: w=800}
 	<div class="view-item">
 		<h2>{NEWSTITLE}</h2>
-		<small class="muted">
-		<span class="date">{NEWSDATE=short} by <span class="author">{NEWSAUTHOR}</span></span>
-		</small>
+		<div class="post-meta">
+			<span><i class="icon-calendar"></i>{NEWSDATE}</span>
+			<span><i class="icon-user"></i>{NEWSAUTHOR}</span>
+			<span><i class="icon-comment"></i>{NEWSCOMMENTS}</span>
+			<span><i class="icon-tag"></i>{NEWSTAGS}</span>
+		</div>
 
 		<div class="body">
 			{NEWSIMAGE}
@@ -98,9 +122,31 @@ $NEWS_TEMPLATE['view']['item'] = '
 			<span class="category">{NEWSCATEGORY}</span> {NEWSTAGS} {NEWSCOMMENTS} {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
 		</div>
 	</div>
-';
+';*/
 //$NEWS_MENU_TEMPLATE['view']['separator']   = '<br />';
 
+// Attempt at bootstrap style
+$NEWS_TEMPLATE['view']['item'] = '
+{SETIMAGE: w=800}
+	<div class="view-item">
+		<h2>{NEWSTITLE}</h2>
+		<div class="post-meta">
+			<span><i class="icon-calendar"></i>{NEWSDATE}</span>
+			<span><i class="icon-user"></i>{NEWSAUTHOR}</span>
+			<span><i class="icon-comment"></i>{NEWSCOMMENTS}</span>
+			<span><i class="icon-tag"></i>{NEWSTAGS}</span>
+		</div>
+
+		<div class="body">
+			{NEWSIMAGE}
+			{NEWSBODY}
+			{EXTENDED}
+		</div>
+		<div class="options">
+			{EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
+		</div>
+	</div>
+';
 
 ###### news_categories.sc (temporary) - TODO rewrite news
 $NEWS_TEMPLATE['category']['body'] = '
diff --git a/e107_themes/bootstrap/style.css b/e107_themes/bootstrap/style.css
index 91d29e524..a8ed4ef9c 100644
--- a/e107_themes/bootstrap/style.css
+++ b/e107_themes/bootstrap/style.css
@@ -69,6 +69,15 @@ legend { font-size: 14px; font-weight: bold; padding: 5px; }
 /******** Horizontal navigation ADMIN_NAV_ALT */
 .navigation { border: 1px solid #DDDDDD;}
 
+
+/******** News item styling */
+.post-meta { margin: -7px 0 10px; }
+.post-meta span { margin-right: 7px; margin-bottom: 0; padding-right: 10px; white-space: nowrap; border-right: 1px solid #dddddd; font-size: 12px; }
+.post-meta span:last-child { margin: 0; padding: 0; border: none; }
+.post-meta span i[class^="icon-"] { margin-right: 7px; }
+
+.news_image { margin-bottom: 10px; }
+
 /******** FEATUREBOX PLUGIN */
 #featurebox-ajax-container { display: block }
 #featurebox-ajax-container img { padding: 1px; margin: 5px; border: 1px solid #DDDDDD }