diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index 863c06dd2..0cf22ae27 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -155,6 +155,50 @@ class news_shortcodes extends e_shortcode return ($this->param['trackbackbeforestring'] ? $this->param['trackbackbeforestring'] : '')."news_item)."'>".$this->param['trackbackstring'].$this->news_item['tb_count'].''.($this->param['trackbackafterstring'] ? $this->param['trackbackafterstring'] : ''); } + + + /** + * Render a news navigation link + * @param $parm array + * @example {NEWSNAVLINK: list=all} + */ + function sc_newsnavlink($parm='') //TODO add more options. + { + + if(varset($parm['list']) == 'all') // A list of all items - usually headings and thumbnails + { + $url = e107::getUrl()->create('news/list/all'); + } + elseif(varset($parm['items']) == 'all') // default page of news items, one after the other. (depending on news prefs) + { + $url = e107::getUrl()->create('news/list/items'); + } + elseif(varset($parm['items']) == 'category') // news items for current category. + { + $url = e107::getUrl()->create('news/list/category', $this->news_item); + } + elseif(varset($parm['list']) == 'category') // A list of all items - usually headings and thumbnails from the current category. + { + $url = e107::getUrl()->create('news/list/short', $this->news_item); //default for now. + } + else + { + $url = e107::getUrl()->create('news/list/items'); // default for now. + } + + + $caption = vartrue($parm['text'],LAN_BACK); + + $text = ''; + + return $text; + } + + + + function sc_newsheader($parm) { return $this->sc_newscaticon('src'); diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index ab71da3d6..c51a1ba15 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -64,6 +64,7 @@ define("LAN_ENTER_CODE", "Enter code"); define("LAN_INVALID_CODE", "Incorrect code entered."); define("LAN_SEARCH", "Search"); define("LAN_SHARE", "Share"); +define("LAN_BACK", "Back"); ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index c35831a00..3819dadc8 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -290,7 +290,7 @@ define("LAN_BOOL_REVERSE", "Invert"); define("LAN_PRESET_CONFIRMSAVE","Save current form values as the default for this page?"); define("LAN_CONFIGURE", "Configure"); -define("LAN_BACK", "Back"); +// define("LAN_BACK", "Back"); @see e107_languages/English.php define("LAN_NOPERMISSION", "no permissions"); diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php index d0fefcb52..e4881b470 100644 --- a/e107_plugins/news/templates/news_template.php +++ b/e107_plugins/news/templates/news_template.php @@ -155,6 +155,7 @@ $NEWS_TEMPLATE['view']['item'] = ' {NEWSRELATED}
+ {NEWSNAVLINK} '; //$NEWS_MENU_TEMPLATE['view']['separator'] = '
';