X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fcatalog.php;h=3ed020f44580a1f7cd5c9105c4d06f4f3595d47a;hb=ac366a43f0cda63c2506321104b6760c153ac993;hp=fec8d642854418842fbd53dee49b35928d9f0f98;hpb=74d7b5848a42e30e669cc05db22e83396b3cc107;p=living-lab-site.git

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index fec8d64..3ed020f 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,23 @@ class Catalog extends CI_Controller {
 		}
 		
 		$params = array(	'title' => $this->config->item('site_name'),
-							'css' => array('catalog.css'),
+							'css' => array(
+								'catalog.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);
+		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
+		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
 		$this->load->view('html_end');
@@ -55,28 +66,44 @@ class Catalog extends CI_Controller {
 	
 	public function test($page = 0)
 	{
-		$this->load->helper('url');
+		$params = array(	'title' => 'Test - '. $this->config->item('site_name'),
+							//'css' => array(),
+							//'js' => array(),
+							//'metas' => array('description'=>'','keywords'=>'')
+			);
+		$this->load->library('html_head_params', $params);
 		
-		$str = '800x600';
+		// **
+		// ** 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));
 		
-		echo substr($str, strpos($str, 'x') + 1);
+		$this->load->view('footer');
+		$this->load->view('html_end');
 	}
 	
-	public function category($category_id, $offset = 0)
+	public function category($category_name, $offset = 0)
 	{
+		// **
+		// ** LOADING MODEL
+		// **
+		// Video Category
+		$categories = $this->config->item('categories');
+		$category_id = array_search($category_name, $categories);
+		$vs_data['category_name'] = $category_name;
+		$vs_data['category_id'] = $category_id;
+		$vs_data['category_title'] = $category_name ?
+		$this->lang->line("ui_categ_$category_name") : $category_name;		
+		
 		// Retrieve videos summary.
 		$this->load->model('videos_model');
 		$vs_data['videos'] = $this->videos_model->get_videos_summary(
-			$category_id, intval($offset),
+			$vs_data['category_id'], intval($offset),
 			$this->config->item('videos_per_page'));
 		
-		// Video Category
-		$categories = $this->config->item('categories');
-		$category_name = $categories[$category_id];
-		$vs_data['category_title'] = $category_name ?
-			$this->lang->line("ui_categ_$category_name") : $category_name;
-		$vs_data['category_id'] = $category_id;
-		
 		// Pagination
 		$this->load->library('pagination');
 		$pg_config['base_url'] = site_url("catalog/category/$category_id/");
@@ -92,15 +119,23 @@ class Catalog extends CI_Controller {
 			$vs_data, TRUE);
 		
 		$params = array(	'title' => $this->config->item('site_name'),
-							'css' => array('catalog.css'),
+							'css' => array(
+								'catalog.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);
+		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
+		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
 		$this->load->view('html_end');