diff --git a/e107_core/templates/chapter_template.php b/e107_core/templates/chapter_template.php index f2e0d746a..be24c55d8 100644 --- a/e107_core/templates/chapter_template.php +++ b/e107_core/templates/chapter_template.php @@ -111,7 +111,7 @@ $CHAPTER_TEMPLATE['nav']['showPage'] = $CHAPTER_TEMPLATE['nav']['listChapters']; // Used by e107_plugins/page/chapter_menu.php & /page.php?bk=x $CHAPTER_TEMPLATE['panel']['listChapters']['caption'] = "{BOOK_NAME}"; -$CHAPTER_TEMPLATE['panel']['listChapters']['start'] = "
"; +$CHAPTER_TEMPLATE['panel']['listChapters']['start'] = "
"; $CHAPTER_TEMPLATE['panel']['listChapters']['item'] = "

{CHAPTER_NAME}

{CHAPTER_ICON}

{CHAPTER_DESCRIPTION}

{CHAPTER_BUTTON}

"; @@ -119,12 +119,20 @@ $CHAPTER_TEMPLATE['panel']['listChapters']['end'] = "
"; $CHAPTER_TEMPLATE['panel']['listPages']['caption'] = "{CHAPTER_NAME}"; -$CHAPTER_TEMPLATE['panel']['listPages']['start'] = "{CHAPTER_BREADCRUMB}
"; +$CHAPTER_TEMPLATE['panel']['listPages']['start'] = "{CHAPTER_BREADCRUMB}
"; $CHAPTER_TEMPLATE['panel']['listPages']['item'] = "
{CPAGEMENU}
"; $CHAPTER_TEMPLATE['panel']['listPages']['end'] = "
"; -$CHAPTER_TEMPLATE['grid']['listChapters']['start'] = "{SETIMAGE: w=450}
"; + +$CHAPTER_TEMPLATE['grid']['listPages']['caption'] = "{CHAPTER_NAME}"; +$CHAPTER_TEMPLATE['grid']['listPages']['start'] = "{SETIMAGE: w=450}{CHAPTER_BREADCRUMB}
"; +$CHAPTER_TEMPLATE['grid']['listPages']['item'] = "
{CPAGEMENU}
"; +$CHAPTER_TEMPLATE['grid']['listPages']['end'] = "
"; + + + +$CHAPTER_TEMPLATE['grid']['listChapters']['start'] = "{SETIMAGE: w=450}
"; $CHAPTER_TEMPLATE['grid']['listChapters']['item'] = "
{CHAPTER_IMAGE}

{CHAPTER_NAME}

{CHAPTER_DESCRIPTION}

{CHAPTER_BUTTON}

"; @@ -133,4 +141,3 @@ $CHAPTER_TEMPLATE['grid']['listChapters']['end'] = "
"; -?> \ No newline at end of file diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php index 1f777dad2..37b192569 100644 --- a/e107_plugins/news/news.php +++ b/e107_plugins/news/news.php @@ -1149,6 +1149,15 @@ class news_front } $template = $tmp['item']; + + if(isset($tmp['caption']) && $tmp['caption'] !== null) // to initiate tablerender() usage. + { + $this->addDebug('Internal Route', $this->route); + $this->route = 'news/view'; // used for tablerender id. + $this->templateKey = $newsViewTemplate; // used for tablerender id. + $this->caption = e107::getParser()->parseTemplate($tmp['caption'], true, $news); + } + unset($tmp); } diff --git a/e107_plugins/news/templates/news_view_template.php b/e107_plugins/news/templates/news_view_template.php index 2aa8b48f9..fc0fff20c 100644 --- a/e107_plugins/news/templates/news_view_template.php +++ b/e107_plugins/news/templates/news_view_template.php @@ -21,6 +21,8 @@ $NEWS_VIEW_INFO = array( // Default $NEWS_VIEW_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '{---}'; + +$NEWS_VIEW_TEMPLATE['default']['caption'] = null; // add a value to user tablerender() $NEWS_VIEW_TEMPLATE['default']['item'] = ' {SETIMAGE: w=900&h=600}