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

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 8a325e7..f3df836 100644
--- a/application/controllers/catalog.php
+++ b/application/controllers/catalog.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Class Catalog controlls video hierarchy and searching
+ * Class Catalog controls video hierarchy and searching
  *
  * @category	Controller
  * @author		Călin-Andrei Burloiu
@@ -17,6 +17,9 @@ class Catalog extends CI_Controller {
 	
 	public function index()
 	{
+		// **
+		// ** LOADING MODEL
+		// **
 		// Retrieve videos summary.
 		$this->load->model('videos_model');
 		foreach ($this->config->item('categories') as $id => $name)
@@ -39,15 +42,25 @@ class Catalog extends CI_Controller {
 		}
 		
 		$params = array(	'title' => $this->config->item('site_name'),
-							'css' => array('catalog.css'),
+							'css' => array(
+								'catalog.css', 
+								'jquery-ui.css'
+								),
 							//'js' => array(),
 							//'metas' => array('description'=>'','keywords'=>'')
 							);
 		$this->load->library('html_head_params', $params);
+		
+		// **
+		// ** LOADING VIEWS
+		// **
 		$this->load->view('html_begin', $this->html_head_params);
-		$this->load->view('header');
+		$this->load->view('header', array('selected_menu' => 'home'));
 		
-		$this->load->view('catalog/index_view', $data);
+		$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>';
+		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
 		$this->load->view('html_end');
@@ -55,17 +68,32 @@ class Catalog extends CI_Controller {
 	
 	public function test($page = 0)
 	{
-		$this->load->helper('url');
-		$this->load->library('pagination');
+		$params = array(	'title' => 'Test - '. $this->config->item('site_name'),
+							'css' => array(
+								'jquery-ui.css'
+								),
+							//'js' => array(),
+							//'metas' => array('description'=>'','keywords'=>'')
+			);
+		$this->load->library('html_head_params', $params);
 		
-		$config['base_url'] = site_url('catalog/test/');
-		$config['total_rows'] = '160';
-		$this->pagination->initialize($config);
-		echo $this->pagination->create_links();
+		// **
+		// ** LOADING VIEWS
+		// **
+		$this->load->view('html_begin', $this->html_head_params);
+		$this->load->view('header', array('selected_menu' => 'home'));
+		
+		$this->load->view('echo', array('output'=>'Test Page', 'clear'=>TRUE));
+		
+		$this->load->view('footer');
+		$this->load->view('html_end');
 	}
 	
 	public function category($category_id, $offset = 0)
 	{
+		// **
+		// ** LOADING MODEL
+		// **
 		// Retrieve videos summary.
 		$this->load->model('videos_model');
 		$vs_data['videos'] = $this->videos_model->get_videos_summary(
@@ -94,15 +122,25 @@ class Catalog extends CI_Controller {
 			$vs_data, TRUE);
 		
 		$params = array(	'title' => $this->config->item('site_name'),
-							'css' => array('catalog.css'),
+							'css' => array(
+								'catalog.css', 
+								'jquery-ui.css'
+								),
 							//'js' => array(),
 							//'metas' => array('description'=>'','keywords'=>'')
 							);
 		$this->load->library('html_head_params', $params);
+		
+		// **
+		// ** LOADING VIEWS
+		// **
 		$this->load->view('html_begin', $this->html_head_params);
 		$this->load->view('header');
 		
-		$this->load->view('catalog/category_view', $data);
+		$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>';
+		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
 		$this->load->view('html_end');