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}

{NEWSTITLE}

@@ -69,8 +69,29 @@ $NEWS_TEMPLATE['default']['item'] = '
'; +*/ +// Attempt at bootstrap style +$NEWS_TEMPLATE['default']['item'] = ' + {SETIMAGE: w=600} +
+

{NEWSTITLE}

+
+ {NEWSDATE} + {NEWSAUTHOR} + {NEWSCOMMENTS} + {NEWSTAGS} +
- +
+ {NEWSIMAGE} + {NEWSBODY} + {EXTENDED} +
+
+ {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS} +
+
+'; @@ -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}

{NEWSTITLE}

- - {NEWSDATE=short} by {NEWSAUTHOR} - +
+ {NEWSDATE} + {NEWSAUTHOR} + {NEWSCOMMENTS} + {NEWSTAGS} +
{NEWSIMAGE} @@ -98,9 +122,31 @@ $NEWS_TEMPLATE['view']['item'] = ' {NEWSCATEGORY} {NEWSTAGS} {NEWSCOMMENTS} {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS}
-'; +';*/ //$NEWS_MENU_TEMPLATE['view']['separator'] = '
'; +// Attempt at bootstrap style +$NEWS_TEMPLATE['view']['item'] = ' +{SETIMAGE: w=800} +
+

{NEWSTITLE}

+
+ {NEWSDATE} + {NEWSAUTHOR} + {NEWSCOMMENTS} + {NEWSTAGS} +
+ +
+ {NEWSIMAGE} + {NEWSBODY} + {EXTENDED} +
+
+ {EMAILICON} {PRINTICON} {PDFICON} {ADMINOPTIONS} +
+
+'; ###### 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 }