small bug with side box fixed

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

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 23a2f17..4318325 100644 (file)
--- 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);
@@ -57,7 +60,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,7 +70,28 @@ class Catalog extends CI_Controller {
        
        public function test($page = 0)
        {
+               $params = array(        'title' => 'Test - '. $this->config->item('site_name'),
+                                                       'css' => array(
+                                                               'jquery-ui.css'
+                                                               ),
+                                                       'js' => array(
+                                                               'jquery.js',
+                                                               'jquery-ui.js'
+                                                       ),
+                                                       //'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)
@@ -101,8 +127,14 @@ class Catalog extends CI_Controller {
                        $vs_data, TRUE);
                
                $params = array(        'title' => $this->config->item('site_name'),
-                                                       'css' => array('catalog.css'),
-                                                       //'js' => array(),
+                                                       'css' => array(
+                                                               'catalog.css', 
+                                                               'jquery-ui.css'
+                                                       ),
+                                                       'js' => array(
+                                                               'jquery.js',
+                                                               'jquery-ui.js'
+                                                       ),
                                                        //'metas' => array('description'=>'','keywords'=>'')
                                                        );
                $this->load->library('html_head_params', $params);
@@ -113,7 +145,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');