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

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index f3df836..087275d 100644
--- a/application/controllers/catalog.php
+++ b/application/controllers/catalog.php
@@ -45,8 +45,11 @@ class Catalog extends CI_Controller {
 							'css' => array(
 								'catalog.css', 
 								'jquery-ui.css'
-								),
-							//'js' => array(),
+							),
+							'js' => array(
+								'jquery.js',
+								'jquery-ui.js'
+							),
 							//'metas' => array('description'=>'','keywords'=>'')
 							);
 		$this->load->library('html_head_params', $params);
@@ -58,8 +61,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');
@@ -72,7 +74,10 @@ class Catalog extends CI_Controller {
 							'css' => array(
 								'jquery-ui.css'
 								),
-							//'js' => array(),
+							'js' => array(
+								'jquery.js',
+								'jquery-ui.js'
+							),
 							//'metas' => array('description'=>'','keywords'=>'')
 			);
 		$this->load->library('html_head_params', $params);
@@ -125,8 +130,11 @@ class Catalog extends CI_Controller {
 							'css' => array(
 								'catalog.css', 
 								'jquery-ui.css'
-								),
-							//'js' => array(),
+							),
+							'js' => array(
+								'jquery.js',
+								'jquery-ui.js'
+							),
 							//'metas' => array('description'=>'','keywords'=>'')
 							);
 		$this->load->library('html_head_params', $params);