projects
/
living-lab-site.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a27f593
)
small bug with side box fixed
author
Calin Burloiu
<calin.burloiu@gmail.com>
Fri, 26 Aug 2011 15:40:22 +0000
(18:40 +0300)
committer
Calin Burloiu
<calin.burloiu@gmail.com>
Fri, 26 Aug 2011 15:40:22 +0000
(18:40 +0300)
application/controllers/catalog.php
patch
|
blob
|
history
diff --git
a/application/controllers/catalog.php
b/application/controllers/catalog.php
index
087275d
..
4318325
100644
(file)
--- a/
application/controllers/catalog.php
+++ b/
application/controllers/catalog.php
@@
-146,8
+146,7
@@
class Catalog extends CI_Controller {
$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');