diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index bf6e6bc6a..781aa0e26 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -704,8 +704,9 @@ class news_admin_ui extends e_admin_ui $ecache = e107::getCache(); $ecache->clear("news.php"); //TODO change it to 'news_*' everywhere $ecache->clear("news_", false, true); //NEW global news cache prefix - $ecache->clear("othernews"); //TODO change it to 'news_othernews' everywhere - $ecache->clear("othernews2"); //TODO change it to 'news_othernews2' everywhere + $ecache->clear("othernews"); //TODO change it to 'news_other' everywhere + $ecache->clear("othernews2"); //TODO change it to 'news_other2' everywhere + //$ecache->clear("nq_news_"); - supported by cache::clear() now //$ecache->clear("nomd5_news_"); supported by cache::clear() now diff --git a/e107_plugins/news/other_news2_menu.php b/e107_plugins/news/other_news2_menu.php index 62b44cfc9..b85083e00 100644 --- a/e107_plugins/news/other_news2_menu.php +++ b/e107_plugins/news/other_news2_menu.php @@ -44,7 +44,7 @@ if(!empty($parm)) if(!$OTHERNEWS2_STYLE) { - if(deftrue('BOOTSTRAP')) // v2.x + if(THEME_LEGACY !== true) // v2.x { if(!defined("OTHERNEWS_COLS")) { diff --git a/e107_plugins/news/other_news_menu.php b/e107_plugins/news/other_news_menu.php index 8ce2186eb..d23eefd17 100644 --- a/e107_plugins/news/other_news_menu.php +++ b/e107_plugins/news/other_news_menu.php @@ -49,7 +49,7 @@ if(!empty($parm)) if(!$OTHERNEWS_STYLE) { - if(deftrue('BOOTSTRAP')) // v2.x + if(THEME_LEGACY !== true) // v2.x { if(!defined("OTHERNEWS_COLS")) { diff --git a/e107_themes/landingzero/templates/news/news_menu_template.php b/e107_themes/landingzero/templates/news/news_menu_template.php index 52500e336..c739c2b37 100644 --- a/e107_themes/landingzero/templates/news/news_menu_template.php +++ b/e107_themes/landingzero/templates/news/news_menu_template.php @@ -54,7 +54,8 @@ $NEWS_MENU_WRAPPER['latest']['NEWSCOMMENTCOUNT'] = "({---})"; -// Other News Menu. +// Other News Menu. + /* $NEWS_MENU_TEMPLATE['other']['caption'] = ''; $NEWS_MENU_TEMPLATE['other']['start'] = " {SETIMAGE: w=700&h=400&crop=1}"; // set the {NEWSIMAGE} dimensions. @@ -71,12 +72,28 @@ $NEWS_MENU_TEMPLATE['other']['item'] = ' </div> </div> <div class="col-md-4"> - <a href="{NEWSURL}" class="btn btn-primary btn-block">'.LAN_THEME_NEWS_1.'</a> + <a href="{NEWSURL}" class="btn btn-primary btn-block">'.LAN_READ_MORE.'</a> </div> </div>'; $NEWS_MENU_TEMPLATE['other']['end'] = ""; +*/ + + +$NEWS_MENU_TEMPLATE['other']['caption'] = TD_MENU_L1; +$NEWS_MENU_TEMPLATE['other']['start'] = "<div id='otherNews' data-interval='false' class='carousel slide othernews-block'> + <div class='carousel-inner'> + {SETIMAGE: w=500&h=300&crop=1}"; // set the {NEWSIMAGE} dimensions. +$NEWS_MENU_TEMPLATE['other']['item'] = '<div class="item {ACTIVE}"> + {NEWSTHUMBNAIL=placeholder} + <h3>{NEWSTITLE}</h3> + <p>{NEWSSUMMARY}</p> + <p class="text-right"><a class="btn btn-primary btn-othernews" href="{NEWSURL}">'.LAN_READ_MORE.' »</a></p> + </div>'; +$NEWS_MENU_TEMPLATE['other']['end'] = "</div></div>"; + +