X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fcatalog.php;h=23a2f177c9645689b3a36195fe4adfd8ffa319d0;hb=ad7daf2de4288cff974e97ec9290533ba732df3b;hp=3285c67a244ea3da3eb66186d8c651446d9e988c;hpb=e47a97763d745e654ab60c17a85d794b46734ddf;p=living-lab-site.git

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 3285c67..23a2f17 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,13 +42,20 @@ 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);
 		
@@ -55,16 +65,14 @@ class Catalog extends CI_Controller {
 	
 	public function test($page = 0)
 	{
-		$this->load->helper('url');
 		
-		$str = '[{"def":"1080p"},{"def":"600p"}]';
-		$a = json_decode($str);
-		
-		echo count($a);
 	}
 	
 	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(
@@ -98,6 +106,10 @@ class Catalog extends CI_Controller {
 							//'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');