diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php
index 102b3cd7c..20fc49598 100644
--- a/e107_core/shortcodes/batch/news_shortcodes.php
+++ b/e107_core/shortcodes/batch/news_shortcodes.php
@@ -457,8 +457,7 @@ class news_shortcodes extends e_shortcode
$words = array();
foreach($tmp as $val)
{
- $words[] = "".$val."";
-
+ $words[] = "".$val."";
}
return implode(", ",$words);
}
diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php
index 65f39b1dd..6bc7aa2a4 100644
--- a/e107_plugins/news/templates/news_template.php
+++ b/e107_plugins/news/templates/news_template.php
@@ -50,13 +50,14 @@ $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'] = '
{SETIMAGE: w=400}
{NEWSTITLE}
-
in {NEWSCATEGORY}
-
{NEWSDATE=short}
-
{NEWSAUTHOR}
+
+ {NEWSDATE=short} by {NEWSAUTHOR}
+
{NEWSIMAGE}
@@ -64,7 +65,7 @@ $NEWS_TEMPLATE['default']['item'] = '
{EXTENDED}
- {NEWSCOMMENTS} {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
+ {NEWSCATEGORY} {NEWSTAGS} {NEWSCOMMENTS} {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
';
@@ -78,13 +79,15 @@ $NEWS_TEMPLATE['default']['item'] = '
//$NEWS_MENU_TEMPLATE['view']['end'] = '';
// As displayed by news.php?extend.1
+
+//XXX TODO GEt this looking good in the default Bootstrap theme.
$NEWS_TEMPLATE['view']['item'] = '
{SETIMAGE: w=800}
{NEWSTITLE}
-
in {NEWSCATEGORY}
-
{NEWSDATE=short}
-
{NEWSAUTHOR}
+
+ {NEWSDATE=short} by {NEWSAUTHOR}
+
{NEWSIMAGE}
@@ -92,14 +95,14 @@ $NEWS_TEMPLATE['view']['item'] = '
{EXTENDED}
- {NEWSCOMMENTS} {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
+ {NEWSCATEGORY} {NEWSTAGS} {NEWSCOMMENTS} {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
';
//$NEWS_MENU_TEMPLATE['view']['separator'] = '
';
-###### news_categories.sc (temporary) - TODO rewrite news, template standards ######
+###### news_categories.sc (temporary) - TODO rewrite news
$NEWS_TEMPLATE['category']['body'] = '
{NEWSCATICON} {NEWSCATEGORY}