Merge pull request #37 from TheExtensionLab/dev

JamesAnelay · JamesAnelay · commit 90523ab443a4 · 2016-03-08T21:42:11.000+01:00
1.5.3 - Multiple Fixes
diff --git a/app/code/community/TheExtensionLab/MegaMenu/Model/Resource/Setup.php b/app/code/community/TheExtensionLab/MegaMenu/Model/Resource/Setup.php
@@ -106,6 +106,8 @@ private function _getMenuMainAttributes()
                 'sort_order' => 20,
                 'global'     => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE,
                 'group'      => 'MegaMenu Settings',
+                'required'                 => false,
+                'default'                    => 1
             ),
             'menu_dropdown_width' => array(
                 'type'                     => 'text',
diff --git a/app/code/community/TheExtensionLab/MegaMenu/etc/config.xml b/app/code/community/TheExtensionLab/MegaMenu/etc/config.xml
@@ -9,7 +9,7 @@
 <config>
     <modules>
         <TheExtensionLab_MegaMenu>
-            <version>1.5.2</version>
+            <version>1.5.3</version>
         </TheExtensionLab_MegaMenu>
     </modules>
 
diff --git a/app/code/community/TheExtensionLab/MegaMenu/sql/theextensionlab_megamenu_setup/upgrade-1.0.0-1.5.3.php b/app/code/community/TheExtensionLab/MegaMenu/sql/theextensionlab_megamenu_setup/upgrade-1.0.0-1.5.3.php
@@ -0,0 +1,20 @@
+<?php
+
+/** @var TheExtensionLab_MegaMenu_Model_Resource_Setup $this */
+$installer = $this;
+
+$installer->updateAttribute(
+    Mage_Catalog_Model_Category::ENTITY,
+    'menu_dropdown_type',
+    'is_required',
+    false
+);
+
+$installer->updateAttribute(
+    Mage_Catalog_Model_Category::ENTITY,
+    'menu_dropdown_type',
+    'default_value',
+    1
+);
+
+$installer->endSetup();
diff --git a/app/design/frontend/base/default/template/theextensionlab/megamenu/attributes/li-only-list.phtml b/app/design/frontend/base/default/template/theextensionlab/megamenu/attributes/li-only-list.phtml
@@ -21,7 +21,9 @@
 
     <?php foreach($optionIds as $key => $value):?>
         <li>
-            <a href="<?php echo Mage::helper('theextensionlab_megamenu/attribute_url')->getFilterUrl($this->getCategoryId(),$parentAttribute->getAttributeCode(),$key)?>"><?php echo $collection[$key]->getValue();?></a>
+            <a href="<?php echo Mage::helper('theextensionlab_megamenu/attribute_url')->getFilterUrl($this->getCategoryId(),$parentAttribute->getAttributeCode(),$key)?>">
+                <span><?php echo $collection[$key]->getValue();?></span>
+            </a>
         </li>
     <?php endforeach;?>
 
diff --git a/app/design/frontend/base/default/template/theextensionlab/megamenu/attributes/list.phtml b/app/design/frontend/base/default/template/theextensionlab/megamenu/attributes/list.phtml
@@ -24,7 +24,9 @@
             <li class="section-title"><span><?php echo $this->__('Shop By %s',$parentAttribute->getFrontendLabel());?></span></li>
             <?php foreach($optionIds as $key => $value):?>
                 <li>
-                    <a href="<?php echo Mage::helper('theextensionlab_megamenu/attribute_url')->getFilterUrl($this->getCategoryId(),$parentAttribute->getAttributeCode(),$key)?>"><?php echo $collection[$key]->getValue();?></a>
+                    <a href="<?php echo Mage::helper('theextensionlab_megamenu/attribute_url')->getFilterUrl($this->getCategoryId(),$parentAttribute->getAttributeCode(),$key)?>">
+                        <span><?php echo $collection[$key]->getValue();?></span>
+                    </a>
                 </li>
             <?php endforeach;?>
         </ul>
diff --git a/app/design/frontend/base/default/template/theextensionlab/megamenu/categories/li-only-list.phtml b/app/design/frontend/base/default/template/theextensionlab/megamenu/categories/li-only-list.phtml
@@ -26,11 +26,11 @@
     <?php if($categoryNode):?>
 
         <li <?php if(!empty($category->children) && !$this->hasTitle()): echo 'class="section-title"';endif;?>>
-            <span>
+
                 <a href="<?php echo $categoryNode->getUrl(); ?>">
-                    <?php echo $this->_getCustomCategoryMenuName($categoryNode,$category);?>
+                    <span><?php echo $this->_getCustomCategoryMenuName($categoryNode,$category);?></span>
                 </a>
-            </span>
+
         </li>
 
         <?php if(!empty($category->children)):?>
@@ -46,11 +46,11 @@
                 <?php endif;?>
             <?php } ?>
             <li <?php if(!empty($category->children)):echo 'class="view-all small-only-view-all"';endif;?>>
-                <span>
+
                     <a href="<?php echo $categoryNode->getUrl(); ?>">
-                        <?php echo $this->__('View All %s', $this->_getCustomCategoryMenuName($categoryNode,$category));?>
+                        <span><?php echo $this->__('View All %s', $this->_getCustomCategoryMenuName($categoryNode,$category));?></span>
                     </a>
-                </span>
+
             </li>
         <?php endif;?>
     <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/theextensionlab/megamenu/categories/list.phtml b/app/design/frontend/base/default/template/theextensionlab/megamenu/categories/list.phtml
@@ -27,11 +27,9 @@
 
             <?php if($categoryNode):?>
                 <li <?php if(!empty($category->children) && !$this->hasTitle()): echo 'class="section-title"';endif;?>>
-                    <span>
-                        <a href="<?php echo $categoryNode->getUrl(); ?>">
-                            <?php echo $this->_getCustomCategoryMenuName($categoryNode,$category);?>
-                        </a>
-                    </span>
+                    <a href="<?php echo $categoryNode->getUrl(); ?>">
+                        <span><?php echo $this->_getCustomCategoryMenuName($categoryNode,$category);?></span>
+                    </a>
                 </li>
 
                 <?php if(!empty($category->children)):?>
@@ -41,15 +39,15 @@
                             <?php $childCategoryNode = $childNodes[$childCategoryNodeId]; ?>
                             <li>
                                 <a href="<?php echo $childCategoryNode->getUrl();?>">
-                                    <?php echo $this->_getCustomCategoryMenuName($childCategoryNode, $childCategory);?>
+                                    <span><?php echo $this->_getCustomCategoryMenuName($childCategoryNode, $childCategory);?></span>
                                 </a>
                             </li>
                         <?php endif;?>
                     <?php } ?>
                     <li <?php if(!empty($category->children)):echo 'class="view-all small-only-view-all"';endif;?>>
                         <span>
                             <a href="<?php echo $categoryNode->getUrl(); ?>">
-                                <?php echo $this->__('View All %s', $this->_getCustomCategoryMenuName($categoryNode,$category));?>
+                                <span><?php echo $this->__('View All %s', $this->_getCustomCategoryMenuName($categoryNode,$category));?></span>
                             </a>
                         </span>
                     </li>
diff --git a/app/design/frontend/base/default/template/theextensionlab/megamenu/page/html/topmenu/renderer.phtml b/app/design/frontend/base/default/template/theextensionlab/megamenu/page/html/topmenu/renderer.phtml
@@ -19,7 +19,7 @@
         <li <?php echo $this->_getRenderedMenuItemAttributes($child);?>>
             <?php if(!$this->_isCategoryPlaceholder($child)):?>
                 <a href="<?php echo $child->getUrl();?>" class="<?php echo $this->getCategoryLiClass($child)?>">
-                    <?php echo $this->escapeHtml($this->__($child->getName()))?>
+                    <span><?php echo $this->escapeHtml($this->__($child->getName()))?></span>
                 </a>
             <?php else:?>
                 <span class="<?php echo $this->getCategoryLiClass($child)?>"><?php echo $this->escapeHtml($this->__($child->getName()))?></span>
diff --git a/app/design/frontend/base/default/template/theextensionlab/megamenu/products/featured.phtml b/app/design/frontend/base/default/template/theextensionlab/megamenu/products/featured.phtml
@@ -20,11 +20,13 @@
     <?php foreach ($featuredProductsCollection as $featuredProduct): ?>
         <div class="featured-product <?php echo $this->getDisplayClass(); ?>">
             <a href="<?php echo $featuredProduct->getProductUrl(); ?>">
-                <?php if ($featuredProduct->hasMenuImage()): ?>
-                    <?php $imageUrl = $_helper->init($featuredProduct, 'menu_image') ?>
-                    <img src="<?php echo $imageUrl ?>"/>
-                <?php endif; ?>
-                <?php echo $featuredProduct->getName(); ?>
+                <span>
+                    <?php if ($featuredProduct->hasMenuImage()): ?>
+                        <?php $imageUrl = $_helper->init($featuredProduct, 'menu_image') ?>
+                        <img src="<?php echo $imageUrl ?>"/>
+                    <?php endif; ?>
+                    <?php echo $featuredProduct->getName(); ?>
+                </span>
             </a>
             <p><?php echo Mage::helper('core')->currency($featuredProduct->getFinalPrice(),true,true);?></p>
             <a class="button" href="<?php echo $featuredProduct->getProductUrl(); ?>">
diff --git a/skin/frontend/base/default/css/theextensionlab/megamenu/responsive.css b/skin/frontend/base/default/css/theextensionlab/megamenu/responsive.css
@@ -1,4 +1,4 @@
-@media only screen and (max-width: 769px) {
+@media only screen and (max-width: 770px) {
   /*------------- Widget Blocks --------------*/
   .list-block {
     margin-left: 0px;
@@ -11,7 +11,7 @@
     padding-bottom: 15px;
   }
 }
-@media only screen and (max-width: 769px) {
+@media only screen and (max-width: 770px) {
   .megamenu-nav-primary li.level0 {
     display: block;
   }
@@ -223,12 +223,12 @@
     width: 100%;
   }
 }
-@media only screen and (min-width: 770px) and (max-width: 979px) {
+@media only screen and (min-width: 771px) and (max-width: 979px) {
   .hide-on-medium {
     display: none !important;
   }
 }
-@media only screen and (min-width: 979px) {
+@media only screen and (min-width: 980px) {
   .hide-on-large {
     display: none !important;
   }
diff --git a/skin/frontend/base/default/css/theextensionlab/megamenu/theme-specific.css b/skin/frontend/base/default/css/theextensionlab/megamenu/theme-specific.css
@@ -0,0 +1,4 @@
+/*
+    This file is used to add theme specific styles for themes such as default or rwd
+    you can either override this file or put your custom styles in your theme's main css file
+*/
diff --git a/skin/frontend/base/default/js/theextensionlab/megamenu/menu.js b/skin/frontend/base/default/js/theextensionlab/megamenu/menu.js
@@ -44,8 +44,8 @@ var mainNav = function() {
             main.initDelayedResizingEvent();
             obj.lists = obj.childElements();
             obj.lists.each(function(el,ind){
-                newchildren = el.select('div,ul,section');
-                newchildren.each(function(childel,ind){
+                var newChildren = el.select('div,ul,section');
+                newChildren.each(function(childel,ind){
                     main.handlNavElementBubbling(childel);
                 });
                 main.handlNavElement(el);
@@ -160,4 +160,4 @@ document.observe("dom:loaded", function() {
             'margin-left': requiredRightMargin + 'px'
         });
     });
-});
+});
diff --git a/skin/frontend/base/default/scss/theextensionlab/megamenu/_settings.scss b/skin/frontend/base/default/scss/theextensionlab/megamenu/_settings.scss
@@ -5,14 +5,14 @@
 //$bp-large: 979px;
 //$bp-xlarge: 1199px;
 
-$medium-up: "only screen and (min-width: 770px)";
-$small-only: "only screen and (max-width: 769px)";
-$medium-only: "only screen and (min-width:770px) and (max-width: 979px)";
-$large-only: "only screen and (min-width:979px)";
-$large-up: "only screen and (min-width:979px)";
+$medium-up: "only screen and (min-width: 771px)";
+$small-only: "only screen and (max-width: 770px)";
+$medium-only: "only screen and (min-width:771px) and (max-width: 979px)";
+$large-only: "only screen and (min-width:980px)";
+$large-up: "only screen and (min-width:980px)";
 
-$medium-down: "only screen and (max-width: 769px)";
-$small-down:"only screen and (max-width: 769px)";
+$medium-down: "only screen and (max-width: 770px)";
+$small-down:"only screen and (max-width: 770px)";
 
 $class-prefix: 'xlab_';
 $grid-columns: 24;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@media only screen and (max-width: 769px) {`
	`1`	`+@media only screen and (max-width: 770px) {`
`2`	`2`	`/------------- Widget Blocks --------------/`
`3`	`3`	`.list-block {`
`4`	`4`	`margin-left: 0px;`
`@@ -11,7 +11,7 @@`
`11`	`11`	`padding-bottom: 15px;`
`12`	`12`	`}`
`13`	`13`	`}`
`14`		`-@media only screen and (max-width: 769px) {`
	`14`	`+@media only screen and (max-width: 770px) {`
`15`	`15`	`.megamenu-nav-primary li.level0 {`
`16`	`16`	`display: block;`
`17`	`17`	`}`
`@@ -223,12 +223,12 @@`
`223`	`223`	`width: 100%;`
`224`	`224`	`}`
`225`	`225`	`}`
`226`		`-@media only screen and (min-width: 770px) and (max-width: 979px) {`
	`226`	`+@media only screen and (min-width: 771px) and (max-width: 979px) {`
`227`	`227`	`.hide-on-medium {`
`228`	`228`	`display: none !important;`
`229`	`229`	`}`
`230`	`230`	`}`
`231`		`-@media only screen and (min-width: 979px) {`
	`231`	`+@media only screen and (min-width: 980px) {`
`232`	`232`	`.hide-on-large {`
`233`	`233`	`display: none !important;`
`234`	`234`	`}`