make common layouts overridable (issue jemproject#630)

Hoffi1 · Apr 2, 2014 · b3c2752 · b3c2752
1 parent da6315d
commit b3c2752
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 14 deletions.
diff --git a/site/classes/view.class.php b/site/classes/view.class.php
@@ -34,6 +34,15 @@ public function getRows($rowname = "rows")
 		return $this->$rowname;
 	}
 
+	/**
+	 * Add path for common templates.
+	 */
+	protected function addCommonTemplatePath() {
+		// additional path for list part + corresponding override path
+		$this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl');
+		$this->addTemplatePath(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/com_jem/common');
+	}
+
 	/**
 	 * Prepares the document.
 	 */

diff --git a/site/views/category/view.html.php b/site/views/category/view.html.php
@@ -15,6 +15,13 @@
  */
 class JemViewCategory extends JEMView
 {
+	function __construct($config = array()) {
+		parent::__construct($config);
+
+		// additional path for common templates + corresponding override path
+		$this->addCommonTemplatePath();
+	}
+
 	/**
 	 * Creates the Category View
 	 */
@@ -108,8 +115,6 @@ function display($tpl=null)
 
 		} else {
 
-			$this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl');
-
 			//initialize variables
 			$app 			= JFactory::getApplication();
 			$document 		= JFactory::getDocument();

diff --git a/site/views/day/view.html.php b/site/views/day/view.html.php
@@ -16,6 +16,13 @@
  */
 class JemViewDay extends JEMView
 {
+	function __construct($config = array()) {
+		parent::__construct($config);
+
+		// additional path for common templates + corresponding override path
+		$this->addCommonTemplatePath();
+	}
+
 	/**
 	 * Creates the Day View
 	 */

diff --git a/site/views/event/view.html.php b/site/views/event/view.html.php
@@ -8,24 +8,31 @@
  */
 defined('_JEXEC') or die;
 
+require JPATH_COMPONENT_SITE.'/classes/view.class.php';
+
 /**
  * Event-View
  */
-class JemViewEvent extends JViewLegacy
+class JemViewEvent extends JEMView
 {
 	protected $item;
 	protected $params;
 	protected $print;
 	protected $state;
 	protected $user;
 
+	function __construct($config = array()) {
+		parent::__construct($config);
+
+		// additional path for common templates + corresponding override path
+		$this->addCommonTemplatePath();
+	}
+
 	/**
 	 * Creates the output for the Event view
 	 */
 	function display($tpl = null)
 	{
-		$this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl');
-
 		$jemsettings		= JemHelper::config();
 		$settings			= JemHelper::globalattribs();
 		$app				= JFactory::getApplication();
@@ -64,8 +71,8 @@ function display($tpl = null)
 
 		// Decide which parameters should take priority
 		$useMenuItemParams = ($menuitem && $menuitem->query['option'] == 'com_jem'
-				&& $menuitem->query['view']   == 'event'
-				&& $menuitem->query['id']     == $item->id);
+		                                && $menuitem->query['view']   == 'event'
+		                                && $menuitem->query['id']     == $item->id);
 
 		// Add router helpers.
 		$item->slug			= $item->alias ? ($item->id.':'.$item->alias) : $item->id;
@@ -146,7 +153,6 @@ function display($tpl = null)
 
 		// Increment the hit counter of the event.
 		if (!$this->params->get('intro_only') && $offset == 0) {
-			$model = $this->getModel();
 			$model->hit();
 		}
 
@@ -270,7 +276,7 @@ function display($tpl = null)
 		$this->_prepareDocument();
 
 		parent::display($tpl);
-		}
+	}
 
 	/**
 	 * structures the keywords

diff --git a/site/views/eventslist/view.html.php b/site/views/eventslist/view.html.php
@@ -15,13 +15,18 @@
 */
 class JemViewEventslist extends JEMView
 {
+	function __construct($config = array()) {
+		parent::__construct($config);
+
+		// additional path for common templates + corresponding override path
+		$this->addCommonTemplatePath();
+	}
+
 	/**
 	 * Creates the Simple List View
 	 */
 	function display( $tpl = null )
 	{
-		$this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl');
-
 		// initialize variables
 		$document 		= JFactory::getDocument();
 		$app 			= JFactory::getApplication();

diff --git a/site/views/venue/view.html.php b/site/views/venue/view.html.php
@@ -15,6 +15,13 @@
  */
 class JemViewVenue extends JEMView {
 
+	function __construct($config = array()) {
+		parent::__construct($config);
+
+		// additional path for common templates + corresponding override path
+		$this->addCommonTemplatePath();
+	}
+
 	/**
 	 * Creates the Venue View
 	 */
@@ -108,9 +115,6 @@ function display($tpl = null) {
 
 		} else {
 
-			// add templatepath
-			$this->addTemplatePath(JPATH_COMPONENT.'/common/views/tmpl' );
-
 			// initialize variables
 			$app 			= JFactory::getApplication();
 			$document 		= JFactory::getDocument();