X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fcatalog.php;h=0c0538839527188a47141666057a90a6dd5b4467;hb=954fc0210d9151cb86ca4dad6a955f59ba135915;hp=f3df836130978e234b083c2a8aa759cd2a3c95a2;hpb=211dc651c32bb8998b3eb2fdd3a3b85fc31921ec;p=living-lab-site.git

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index f3df836..0c05388 100644
--- a/application/controllers/catalog.php
+++ b/application/controllers/catalog.php
@@ -43,9 +43,8 @@ class Catalog extends CI_Controller {
 		
 		$params = array(	'title' => $this->config->item('site_name'),
 							'css' => array(
-								'catalog.css', 
-								'jquery-ui.css'
-								),
+								'catalog.css'
+							),
 							//'js' => array(),
 							//'metas' => array('description'=>'','keywords'=>'')
 							);
@@ -58,8 +57,7 @@ class Catalog extends CI_Controller {
 		$this->load->view('header', array('selected_menu' => 'home'));
 		
 		$main_params['content'] = $this->load->view('catalog/index_view', $data, TRUE);
-		// TODO: side
-		$main_params['side'] = '<h1>Side Box</h1><p>TODO: Put side box content here</p>';
+		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
 		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
@@ -69,9 +67,7 @@ class Catalog extends CI_Controller {
 	public function test($page = 0)
 	{
 		$params = array(	'title' => 'Test - '. $this->config->item('site_name'),
-							'css' => array(
-								'jquery-ui.css'
-								),
+							//'css' => array(),
 							//'js' => array(),
 							//'metas' => array('description'=>'','keywords'=>'')
 			);
@@ -123,9 +119,8 @@ class Catalog extends CI_Controller {
 		
 		$params = array(	'title' => $this->config->item('site_name'),
 							'css' => array(
-								'catalog.css', 
-								'jquery-ui.css'
-								),
+								'catalog.css'
+							),
 							//'js' => array(),
 							//'metas' => array('description'=>'','keywords'=>'')
 							);
@@ -138,8 +133,7 @@ class Catalog extends CI_Controller {
 		$this->load->view('header');
 		
 		$main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
-		// TODO: side
-		$main_params['side'] = '<h1>Side Box</h1><p>TODO: Put side box content here</p>';
+		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
 		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');