Permalink
Browse files

Merge github.com:testagain/oc_15131

  • Loading branch information...
2 parents f5e1f34 + 90f3987 commit 0915df465704a07b43d0c642f9ebe4b92edc626d unknown committed Mar 2, 2012
@@ -31,6 +31,10 @@ public function index() {
if (!$layout_id) {
$layout_id = $this->model_design_layout->getLayout($route);
}
+
+ if($route == 'fb/home'){
+ $layout_id = 1;
+ }
if (!$layout_id) {
$layout_id = $this->config->get('config_layout_id');
@@ -11,7 +11,7 @@ public function index() {
} else {
$route = 'common/home';
}
-
+
$layout_id = 0;
if (substr($route, 0, 16) == 'product/category' && isset($this->request->get['path'])) {
@@ -31,7 +31,7 @@ public function index() {
if (!$layout_id) {
$layout_id = $this->model_design_layout->getLayout($route);
}
-
+
if (!$layout_id) {
$layout_id = $this->config->get('config_layout_id');
}
@@ -44,7 +44,7 @@ public function index() {
foreach ($extensions as $extension) {
$modules = $this->config->get($extension['code'] . '_module');
-
+
if ($modules) {
foreach ($modules as $module) {
if ($module['layout_id'] == $layout_id && $module['position'] == 'content_top' && $module['status']) {
@@ -67,7 +67,7 @@ public function index() {
array_multisort($sort_order, SORT_ASC, $module_data);
$this->data['modules'] = array();
-
+
foreach ($module_data as $module) {
$module = $this->getChild('module/' . $module['code'], $module['setting']);
@@ -79,9 +79,7 @@ public function index(){
$this->load->model('tool/seo_url');
$categories = $this->model_catalog_category->getCategories(0);
$this->data['categories'] = array();
-
- $this->id = 'fb_header';
-
+
foreach($categories as $category){
$this->data['categories'][] = array(
'name' => $category['name'],
@@ -4,12 +4,13 @@ class ControllerFbHome extends Controller {
public function index() {
$this->children = array(
+ 'common/content_bottom',
'fb/header',
- 'fb/bestseller',
- 'fb/latest', // TODO get dynamically from the installed modules
- // 'fb/featured',
'fb/footer',
);
+
+
+
$this->document->title = $this->config->get('config_title');
$this->template = 'fb/template/common/home.tpl';
$this->response->setOutput($this->render());
@@ -57,23 +57,6 @@ protected function index($setting) {
}
- $this->load->model('catalog/category');
- $this->load->model('catalog/product');
-
- $this->data['categories'] = array();
-
- $categories = $this->model_catalog_category->getCategories(0);
-
- foreach ($categories as $category) {
- $desc = strlen($category['description']) > 70 ? substr($category['description'],0,70).'...' : $category['description'];
- $this->data['categories'][] = array(
- 'name' => $category['name'],
- 'desc' => html_entity_decode($desc),
- 'image' => $this->model_tool_image->resize($category['image'], $setting['image_width'], $setting['image_height']),
- 'href' => $this->url->link('product/category', 'path=' . $category['category_id'])
- );
- }
-
if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/module/featured.tpl')) {
$this->template = $this->config->get('config_template') . '/template/module/featured.tpl';
} else {
@@ -45,6 +45,12 @@ $(document).ready(function() {
});
});
+ $('#menu > ul > li > div, #menu > ul > li > a').hover(function(){
+ $(this).parents('#menu > ul > li').children('a').css({'color' : '#fff'});
+ },function(){
+ $(this).parents('#menu > ul > li').children('a').css({'color' : '#555'});
+ })
+
/* Mega Menu */
$('#menu ul > li > a + div').each(function(index, element) {
// IE6 & IE7 Fixes
@@ -79,6 +85,7 @@ $(document).ready(function() {
if ($.browser.version <= 7) {
$('#menu > ul > li').bind('mouseover', function() {
$(this).addClass('active');
+
});
$('#menu > ul > li').bind('mouseout', function() {
@@ -78,16 +78,17 @@ label {
#column-left {
float: left;
width: 180px;
+ padding:0px 10px;
}
#column-right {
float: right;
width: 180px;
+ padding:0px 10px;
}
#content {
min-height: 400px;
margin-bottom: 25px;
- padding-right:10px;
- padding-left:10px;
+ padding:0px 10px;
}
#column-left + #column-right + #content, #column-left + #content {
margin-left: 195px;
@@ -375,7 +376,6 @@ label {
border-radius: 0px 0px 5px 5px;
opacity:0.95;
/*background:#0A78D9;*/
- background:#018EEA;
background:#39A7EE;
}
#menu > ul > li:hover > div {
@@ -396,11 +396,10 @@ label {
min-width: 120px;
}
#menu > ul > li ul > li > a:hover {
- background: #0253A5;
background:#0181D5;
}
-#menu > ul > li ul > li > a:hover #menu > ul > li > a {background:url("../image/menu_seprator.gif") no-repeat scroll right center transparent;}
+#menu > ul > li ul > li > a:hover #menu > ul > li > a {color:#fff;}
#menu > ul > li > div > ul > li > a {
color: #FFFFFF;
@@ -1,5 +1,3 @@
-<?php echo $fb_header; ?>
-<?php echo $bestseller; ?>
-<?php echo $latest; ?>
-<?php echo $featured; ?>
-<?php echo $fb_footer; ?>
+<?php echo $header; ?>
+<?php echo $content_bottom; ?>
+<?php echo $footer; ?>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -51,6 +51,7 @@ protected function getChild($child, $args = array()) {
}
protected function render() {
+ //echo "<pre>";print_r($this->children);exit;
foreach ($this->children as $child) {
$this->data[basename($child)] = $this->getChild($child);
}

0 comments on commit 0915df4

Please sign in to comment.