some unimplemented features removed from the interface

[living-lab-site.git] / application / controllers / catalog.php

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 23a2f17..580f113 100644 (file)
--- 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'=>'')
                                                        );
@@ -57,7 +56,9 @@ class Catalog extends CI_Controller {
                $this->load->view('html_begin', $this->html_head_params);
                $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');
@@ -65,27 +66,44 @@ class Catalog extends CI_Controller {
        
        public function test($page = 0)
        {
+               $params = array(        'title' => 'Test - '. $this->config->item('site_name'),
+                                                       //'css' => array(),
+                                                       //'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', 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)
+       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/");
@@ -101,7 +119,9 @@ 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'=>'')
                                                        );
@@ -113,7 +133,9 @@ class Catalog extends CI_Controller {
                $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');
@@ -121,7 +143,7 @@ class Catalog extends CI_Controller {
        
        public function search($query_str)
        {
-               echo $query_str;
+               echo '<h1>Search not yet implemented</h1>';
        }
 }