projects
/
living-lab-site.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fixes; views is incrementing; started to create help page -- imagemap widget...
[living-lab-site.git]
/
application
/
controllers
/
catalog.php
diff --git
a/application/controllers/catalog.php
b/application/controllers/catalog.php
index
7dee3e9
..
0c05388
100644
(file)
--- a/
application/controllers/catalog.php
+++ b/
application/controllers/catalog.php
@@
-1,7
+1,7
@@
<?php
/**
<?php
/**
- * Class Catalog control
l
s video hierarchy and searching
+ * Class Catalog controls video hierarchy and searching
*
* @category Controller
* @author Călin-Andrei Burloiu
*
* @category Controller
* @author Călin-Andrei Burloiu
@@
-43,9
+43,8
@@
class Catalog extends CI_Controller {
$params = array( 'title' => $this->config->item('site_name'),
'css' => array(
$params = array( 'title' => $this->config->item('site_name'),
'css' => array(
- 'catalog.css',
- 'jquery-ui.css'
- ),
+ 'catalog.css'
+ ),
//'js' => array(),
//'metas' => array('description'=>'','keywords'=>'')
);
//'js' => array(),
//'metas' => array('description'=>'','keywords'=>'')
);
@@
-55,9
+54,11
@@
class Catalog extends CI_Controller {
// ** LOADING VIEWS
// **
$this->load->view('html_begin', $this->html_head_params);
// ** LOADING VIEWS
// **
$this->load->view('html_begin', $this->html_head_params);
- $this->load->view('header', array('selected_menu' => '
H
ome'));
+ $this->load->view('header', array('selected_menu' => '
h
ome'));
- $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');
$this->load->view('footer');
$this->load->view('html_end');
@@
-65,11
+66,23
@@
class Catalog extends CI_Controller {
public function test($page = 0)
{
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_id, $offset = 0)
@@
-105,7
+118,9
@@
class Catalog extends CI_Controller {
$vs_data, TRUE);
$params = array( 'title' => $this->config->item('site_name'),
$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'=>'')
);
//'js' => array(),
//'metas' => array('description'=>'','keywords'=>'')
);
@@
-117,7
+132,9
@@
class Catalog extends CI_Controller {
$this->load->view('html_begin', $this->html_head_params);
$this->load->view('header');
$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');
$this->load->view('footer');
$this->load->view('html_end');