From 85895b825b2d048dcd76a40c2701c574d54ef4fe Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 1 Jan 2017 15:19:21 -0800 Subject: [PATCH] Update gallery template format. --- e107_plugins/gallery/controllers/index.php | 54 ++++++++++++++----- e107_plugins/gallery/gallery.php | 52 ++++++++++++++---- .../gallery/templates/gallery_template.php | 21 +++++--- e107_web/css/e107.css | 2 +- 4 files changed, 98 insertions(+), 31 deletions(-) diff --git a/e107_plugins/gallery/controllers/index.php b/e107_plugins/gallery/controllers/index.php index 2fdd0723d..4e826d151 100644 --- a/e107_plugins/gallery/controllers/index.php +++ b/e107_plugins/gallery/controllers/index.php @@ -83,9 +83,39 @@ class plugin_gallery_index_controller extends eControllerFront } } - public function actionCategory() + + private function getTemplate() { $template = e107::getTemplate('gallery'); + + $oldKeys = array( + 'list_start', 'list_item', 'list_caption', 'list_end', + 'cat_start', 'cat_item', 'cat_caption', 'cat_end' + ); + + if(isset($template['list_start'])) + { + foreach($oldKeys as $k) + { + list($main,$sub) = explode("_",$k); + $template[$main][$sub] = $template[$k]; + unset($template[$k]); + + } + + + } + + return $template; + } + + + + public function actionCategory() + { + // print_a("Hi there"); + + $template = $this->getTemplate(); $template = array_change_key_case($template); $sc = e107::getScBatch('gallery', true); @@ -96,19 +126,19 @@ class plugin_gallery_index_controller extends eControllerFront $template['cat_start'] = str_replace('row', 'row-fluid', $template['cat_start']); } - $text = e107::getParser()->parseTemplate($template['cat_start'], true, $sc); + $text = e107::getParser()->parseTemplate($template['cat']['start'], true, $sc); foreach($this->catList as $val) { $sc->setVars($val); - $text .= e107::getParser()->parseTemplate($template['cat_item'], true); + $text .= e107::getParser()->parseTemplate($template['cat']['item'], true); } - $text .= e107::getParser()->parseTemplate($template['cat_end'], true, $sc); + $text .= e107::getParser()->parseTemplate($template['cat']['end'], true, $sc); if(isset($template['cat_caption'])) { - $title = e107::getParser()->parseTemplate($template['cat_caption'], true, $sc); + $title = e107::getParser()->parseTemplate($template['cat']['caption'], true, $sc); $this->addTitle($title)->addBody($text); } @@ -151,7 +181,7 @@ class plugin_gallery_index_controller extends eControllerFront } $tp = e107::getParser(); - $template = e107::getTemplate('gallery'); + $template = $this->getTemplate(); $template = array_change_key_case($template); $sc = e107::getScBatch('gallery', true); @@ -178,22 +208,22 @@ class plugin_gallery_index_controller extends eControllerFront $sc->setVars($row) ->addVars($cat); - $inner .= $tp->parseTemplate($template['list_item'], true, $sc); + $inner .= $tp->parseTemplate($template['list']['item'], true, $sc); } - $text = $tp->parseTemplate($template['list_start'], true, $sc); + $text = $tp->parseTemplate($template['list']['start'], true, $sc); $text .= $inner; - $text .= $tp->parseTemplate($template['list_end'], true, $sc); + $text .= $tp->parseTemplate($template['list']['end'], true, $sc); if(isset($template['list_caption'])) { - $title = $tp->parseTemplate($template['list_caption'], true, $sc); + $title = $tp->parseTemplate($template['list']['caption'], true, $sc); $this->addTitle($title)->addBody($text); } else { - $this->addTitle($catname) - ->addTitle(LAN_PLUGIN_GALLERY_TITLE) + $this->addTitle(LAN_PLUGIN_GALLERY_TITLE) + ->addTitle($catname) ->addBody($text); } diff --git a/e107_plugins/gallery/gallery.php b/e107_plugins/gallery/gallery.php index 0faa9574d..727222432 100644 --- a/e107_plugins/gallery/gallery.php +++ b/e107_plugins/gallery/gallery.php @@ -54,9 +54,41 @@ class gallery } } - function listCategories() + + /** + * Convert legacy template from ['list_start'] etc. to ['list']['start'] + * @return array|string + */ + private function getTemplate() { $template = e107::getTemplate('gallery'); + + $oldKeys = array( + 'list_start', 'list_item', 'list_caption', 'list_end', + 'cat_start', 'cat_item', 'cat_caption', 'cat_end' + ); + + if(isset($template['list_start'])) + { + foreach($oldKeys as $k) + { + list($main,$sub) = explode("_",$k); + $template[$main][$sub] = $template[$k]; + unset($template[$k]); + + } + + + } + + return $template; + } + + function listCategories() + { + + + $template = $this->getTemplate(); $template = array_change_key_case($template); $sc = e107::getScBatch('gallery', true); @@ -65,17 +97,17 @@ class gallery $template['cat_start'] = str_replace('row', 'row-fluid', $template['cat_start']); } - $text = e107::getParser()->parseTemplate($template['cat_start'], true, $sc); + $text = e107::getParser()->parseTemplate($template['cat']['start'], true, $sc); foreach($this->catList as $val) { $sc->setVars($val); - $text .= e107::getParser()->parseTemplate($template['cat_item'], true, $sc); + $text .= e107::getParser()->parseTemplate($template['cat']['item'], true, $sc); } - $text .= e107::getParser()->parseTemplate($template['cat_end'], true, $sc); + $text .= e107::getParser()->parseTemplate($template['cat']['end'], true, $sc); - $caption = e107::getParser()->parseTemplate($template['cat_caption'], true, $sc); + $caption = e107::getParser()->parseTemplate($template['cat']['caption'], true, $sc); e107::getRender()->tablerender($caption, $text); } @@ -86,7 +118,7 @@ class gallery $plugPrefs = e107::getPlugConfig('gallery')->getPref(); $mes = e107::getMessage(); $tp = e107::getParser(); - $template = e107::getTemplate('gallery'); + $template = $this->getTemplate(); $template = array_change_key_case($template); $sc = e107::getScBatch('gallery', true); @@ -109,14 +141,14 @@ class gallery foreach($list as $row) { $sc->setVars($row); - $inner .= $tp->parseTemplate($template['list_item'], true, $sc); + $inner .= $tp->parseTemplate($template['list']['item'], true, $sc); } - $text = $tp->parseTemplate($template['list_start'], true, $sc); + $text = $tp->parseTemplate($template['list']['start'], true, $sc); $text .= $inner; - $text .= $tp->parseTemplate($template['list_end'], true, $sc); + $text .= $tp->parseTemplate($template['list']['end'], true, $sc); - $caption = $tp->parseTemplate($template['list_caption'], true, $sc); + $caption = $tp->parseTemplate($template['list']['caption'], true, $sc); e107::getRender()->tablerender($caption, $mes->render() . $text); diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php index 7010715f4..ac8c8fd8c 100644 --- a/e107_plugins/gallery/templates/gallery_template.php +++ b/e107_plugins/gallery/templates/gallery_template.php @@ -8,13 +8,13 @@ */ -$GALLERY_TEMPLATE['list_caption'] = LAN_PLUGIN_GALLERY_TITLE; +$GALLERY_TEMPLATE['list']['caption'] = LAN_PLUGIN_GALLERY_TITLE; -$GALLERY_TEMPLATE['list_start'] = '{GALLERY_BREADCRUMB} +$GALLERY_TEMPLATE['list']['start'] = '{GALLERY_BREADCRUMB}
'; -$GALLERY_TEMPLATE['list_item'] = ' +$GALLERY_TEMPLATE['list']['item'] = '
{GALLERY_THUMB=w=300&h=200} @@ -23,7 +23,7 @@ $GALLERY_TEMPLATE['list_item'] = '
'; -$GALLERY_TEMPLATE['list_end'] = ' +$GALLERY_TEMPLATE['list']['end'] = '
{GALLERY_NEXTPREV}
@@ -34,13 +34,13 @@ $GALLERY_TEMPLATE['list_end'] = ' '; // Bootstrap3 Compatible. -$GALLERY_TEMPLATE['cat_caption'] = LAN_PLUGIN_GALLERY_TITLE; +$GALLERY_TEMPLATE['cat']['caption'] = LAN_PLUGIN_GALLERY_TITLE; -$GALLERY_TEMPLATE['cat_start'] = '{GALLERY_BREADCRUMB} +$GALLERY_TEMPLATE['cat']['start'] = '{GALLERY_BREADCRUMB}
'; -$GALLERY_TEMPLATE['cat_item'] = ' +$GALLERY_TEMPLATE['cat']['item'] = '
{GALLERY_CAT_THUMB} @@ -49,7 +49,7 @@ $GALLERY_TEMPLATE['cat_item'] = '
'; -$GALLERY_TEMPLATE['cat_end'] = ' +$GALLERY_TEMPLATE['cat']['end'] = '
'; @@ -180,6 +180,11 @@ $GALLERY_TEMPLATE['prettyphoto']['social_item'] = '
'; + + + + + /* $GALLERY_TEMPLATE['portfolio']['start'] = '<-- start portfolio -->'; diff --git a/e107_web/css/e107.css b/e107_web/css/e107.css index 2806fa6b8..3f9739d56 100644 --- a/e107_web/css/e107.css +++ b/e107_web/css/e107.css @@ -184,7 +184,7 @@ div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */ padding: 10px 0; } -.e-instant-edit { position: absolute; right: 10px; text-align: right; display: inline-block; z-index:1000; margin-right:10px; } +.e-instant-edit { font-size: 10pt; position: absolute; right: 10px; text-align: right; display: inline-block; z-index:1000; margin-right:10px; }