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
087275d
..
0c05388
100644
(file)
--- a/
application/controllers/catalog.php
+++ b/
application/controllers/catalog.php
@@
-43,13
+43,9
@@
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'
- ),
- 'js' => array(
- 'jquery.js',
- 'jquery-ui.js'
+ 'catalog.css'
),
),
+ //'js' => array(),
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
@@
-71,13
+67,8
@@
class Catalog extends CI_Controller {
public function test($page = 0)
{
$params = array( 'title' => 'Test - '. $this->config->item('site_name'),
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'
- ),
+ //'css' => array(),
+ //'js' => array(),
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
@@
-128,13
+119,9
@@
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'
- ),
- 'js' => array(
- 'jquery.js',
- 'jquery-ui.js'
+ 'catalog.css'
),
),
+ //'js' => array(),
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
//'metas' => array('description'=>'','keywords'=>'')
);
$this->load->library('html_head_params', $params);
@@
-146,8
+133,7
@@
class Catalog extends CI_Controller {
$this->load->view('header');
$main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
$this->load->view('header');
$main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
- // TODO: side
- $main_params['side'] = '<h1>Side Box</h1><p>TODO: Put side box content here</p>';
+ $main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
$this->load->view('main', $main_params);
$this->load->view('footer');
$this->load->view('main', $main_params);
$this->load->view('footer');