Skip to content

U
Ubertheme Base
Commit d3994dc5 by Krzysztof Kuźniar
Options

Update module v1.0.3

parent ac5980a0
Showing with 241 additions and 264 deletions
Block/Adminhtml/System/Config/Modules.php
...@@ -107,24 +107,16 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset ...@@ -107,24 +107,16 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset
} }
/** /**
* @param $fieldset * @return \Magento\Framework\View\Element\BlockInterface
* @param $moduleKey
* @return string
*/ */
protected function _getFieldHtml($fieldset, $moduleName) protected function _getFieldRenderer()
{ {
$moduleInfo = $this->_getModuleInfo($moduleName); if (empty($this->_fieldRenderer)) {
$layout = $this->_layoutFactory->create();
$moduleDesc = '<h5 class="module-name">' . $moduleInfo['name'] . '</h5>' $this->_fieldRenderer = $layout->createBlock(\Magento\Config\Block\System\Config\Form\Field::class);
. '<span class="module-desc">' . $moduleInfo['description'] . '</span>'; }
$field = $fieldset->addField($moduleName, 'label', [
'name' => 'dummy',
'label' => $moduleDesc,
'value' => "ver.{$moduleInfo['version']}",
])->setRenderer($this->_getFieldRenderer());
return $field->toHtml(); return $this->_fieldRenderer;
} }
/** /**
...@@ -149,18 +141,23 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset ...@@ -149,18 +141,23 @@ class Modules extends \Magento\Config\Block\System\Config\Form\Fieldset
} }
/** /**
* @return \Magento\Framework\View\Element\BlockInterface * @param $fieldset
* @param $moduleKey
* @return string
*/ */
protected function _getFieldRenderer() protected function _getFieldHtml($fieldset, $moduleName)
{ {
if (empty($this->_fieldRenderer)) { $moduleInfo = $this->_getModuleInfo($moduleName);
$layout = $this->_layoutFactory->create();
$this->_fieldRenderer = $layout->createBlock( $moduleDesc = '<h5 class="module-name">' . $moduleInfo['name'] . '</h5>'
\Magento\Config\Block\System\Config\Form\Field::class .'<span class="module-desc">' . $moduleInfo['description'] . '</span>';
);
}
return $this->_fieldRenderer; $field = $fieldset->addField($moduleName, 'label', [
'name' => 'dummy',
'label' => $moduleDesc,
'value' => "ver.{$moduleInfo['version']}",
])->setRenderer($this->_getFieldRenderer());
return $field->toHtml();
} }
} }
Block/Ajax/AddCart.php
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
namespace Ubertheme\Base\Block\Ajax; namespace Ubertheme\Base\Block\Ajax;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
use Ubertheme\Base\Helper\Data as DataHelper; use \Ubertheme\Base\Helper\Data as DataHelper;
/** /**
* Class AddCart * Build options for ajax add cart function
* @package Ubertheme\Base\Block\Ajax
*/ */
class AddCart extends Template class AddCart extends Template
{ {
...@@ -21,15 +20,15 @@ class AddCart extends Template ...@@ -21,15 +20,15 @@ class AddCart extends Template
protected $helper; protected $helper;
/** /**
* Compare constructor. * AddCart constructor.
* @param Context $context * @param Context $context
* @param array $data
* @param DataHelper $helper * @param DataHelper $helper
* @param array $data
*/ */
public function __construct( public function __construct(
Context $context, Context $context,
array $data = [], DataHelper $helper,
DataHelper $helper array $data = []
) { ) {
parent::__construct($context, $data); parent::__construct($context, $data);
$this->helper = $helper; $this->helper = $helper;
......
Block/Ajax/Compare.php
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
namespace Ubertheme\Base\Block\Ajax; namespace Ubertheme\Base\Block\Ajax;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
use Ubertheme\Base\Helper\Data as DataHelper; use \Ubertheme\Base\Helper\Data as DataHelper;
/** /**
* Class Compare * Build options for ajax compare function
* @package Ubertheme\Base\Block\Ajax
*/ */
class Compare extends Template class Compare extends Template
{ {
...@@ -23,13 +22,13 @@ class Compare extends Template ...@@ -23,13 +22,13 @@ class Compare extends Template
/** /**
* Compare constructor. * Compare constructor.
* @param Context $context * @param Context $context
* @param array $data
* @param DataHelper $helper * @param DataHelper $helper
* @param array $data
*/ */
public function __construct( public function __construct(
Context $context, Context $context,
array $data = [], DataHelper $helper,
DataHelper $helper array $data = []
) { ) {
parent::__construct($context, $data); parent::__construct($context, $data);
$this->helper = $helper; $this->helper = $helper;
......
Block/Ajax/Wishlist.php
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
namespace Ubertheme\Base\Block\Ajax; namespace Ubertheme\Base\Block\Ajax;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
use Ubertheme\Base\Helper\Data as DataHelper; use \Ubertheme\Base\Helper\Data as DataHelper;
/** /**
* Class Wishlist * Build options for ajax add wishlist function
* @package Ubertheme\Base\Block\Ajax
*/ */
class Wishlist extends Template class Wishlist extends Template
{ {
...@@ -21,15 +20,15 @@ class Wishlist extends Template ...@@ -21,15 +20,15 @@ class Wishlist extends Template
protected $helper; protected $helper;
/** /**
* Compare constructor. * Wishlist constructor.
* @param Context $context * @param Context $context
* @param array $data
* @param DataHelper $helper * @param DataHelper $helper
* @param array $data
*/ */
public function __construct( public function __construct(
Context $context, Context $context,
array $data = [], DataHelper $helper,
DataHelper $helper array $data = []
) { ) {
parent::__construct($context, $data); parent::__construct($context, $data);
$this->helper = $helper; $this->helper = $helper;
......
Block/InitOwl2.php
...@@ -6,12 +6,11 @@ ...@@ -6,12 +6,11 @@
namespace Ubertheme\Base\Block; namespace Ubertheme\Base\Block;
use Magento\Framework\View\Element\Template; use \Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context; use \Magento\Framework\View\Element\Template\Context;
/** /**
* Class InitOwl2 * Initial OWL2's assets files
* @package Ubertheme\Base\Block
*/ */
class InitOwl2 extends Template class InitOwl2 extends Template
{ {
......
CHANGELOG.md
1.0.3
=====
* Fix bugs and improvements
+ Upgraded Fontawesome library to version 5.14.0
+ Fine tuning and fixed to compatible with Magento CE 2.4.1
1.0.2 1.0.2
===== =====
* Fix bugs and improvements * Fix bugs and improvements
......
Helper/Data.php
<?php <?php
/** /**
* Copyright © 2016 Ubertheme. All rights reserved. * Copyright © 2016 Ubertheme. All rights reserved.
*/ */
namespace Ubertheme\Base\Helper; namespace Ubertheme\Base\Helper;
use \Magento\Framework\App\Helper\Context;
use Magento\Framework\App\Helper\AbstractHelper; use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Framework\App\Helper\Context;
use Magento\Framework\Json\DecoderInterface; use Magento\Framework\Json\DecoderInterface;
use Magento\Framework\Json\EncoderInterface; use Magento\Framework\Json\EncoderInterface;
use Magento\Framework\ObjectManagerInterface; use Magento\Framework\ObjectManagerInterface;
/** /**
* Class Data * Data helper
* @package Ubertheme\Checkout\Helper
*/ */
class Data extends AbstractHelper class Data extends AbstractHelper
{ {
...@@ -72,13 +72,6 @@ class Data extends AbstractHelper ...@@ -72,13 +72,6 @@ class Data extends AbstractHelper
return $this->_jsonEncoder->encode($options); return $this->_jsonEncoder->encode($options);
} }
public function getCustomerId()
{
/** @var \Magento\Customer\Model\Session $customerSession */
$customerSession = $this->_objectManager->create("Magento\Customer\Model\Session");
return $customerSession->getCustomer()->getId();
}
public function getAjaxCartOptions() public function getAjaxCartOptions()
{ {
$options = [ $options = [
...@@ -88,21 +81,10 @@ class Data extends AbstractHelper ...@@ -88,21 +81,10 @@ class Data extends AbstractHelper
return $this->_jsonEncoder->encode($options); return $this->_jsonEncoder->encode($options);
} }
public function getLatestVersion($moduleName) public function getCustomerId()
{
$version = '';
$modules = self::getUBModules();
if (isset($modules[$moduleName])) {
$version = $modules[$moduleName];
}
return $version;
}
public static function getUBModules()
{ {
return [ /** @var \Magento\Customer\Model\Session $customerSession */
//coming soon $customerSession = $this->_objectManager->create("Magento\Customer\Model\Session");
]; return $customerSession->getCustomer()->getId();
} }
} }
Model/Upload.php
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
namespace Ubertheme\Base\Model; namespace Ubertheme\Base\Model;
use Magento\MediaStorage\Model\File\UploaderFactory;
use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\File\Uploader; use Magento\Framework\File\Uploader;
use Magento\MediaStorage\Model\File\UploaderFactory;
class Upload class Upload
{ {
...@@ -41,7 +41,7 @@ class Upload ...@@ -41,7 +41,7 @@ class Upload
{ {
$fileName = ''; $fileName = '';
try { try {
if (isset($data[$fileId]['delete']) and $data[$fileId]['delete']) { if (isset($data[$fileId]['delete']) && $data[$fileId]['delete']) {
//delete file //delete file
$imagePath = $destinationFolder . $data[$fileId]['value']; $imagePath = $destinationFolder . $data[$fileId]['value'];
if (file_exists($imagePath)) { if (file_exists($imagePath)) {
......
Plugin/Controller/Product/Compare/Add.php
<?php <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
...@@ -6,16 +7,15 @@ ...@@ -6,16 +7,15 @@
namespace Ubertheme\Base\Plugin\Controller\Product\Compare; namespace Ubertheme\Base\Plugin\Controller\Product\Compare;
use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
use Magento\Framework\Data\Form\FormKey\Validator; use Magento\Framework\Data\Form\FormKey\Validator;
use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Json\Helper\Data; use Magento\Framework\Json\Helper\Data;
use Magento\Framework\View\Result\PageFactory; use Magento\Framework\View\Result\PageFactory;
use Magento\Store\Model\StoreManagerInterface; use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
/** /**
* Class Add * Ajax add product to compare function
* @package Ubertheme\Base\Plugin\Controller\Product\Compare
*/ */
class Add extends \Magento\Catalog\Controller\Product\Compare\Add implements HttpPostActionInterface class Add extends \Magento\Catalog\Controller\Product\Compare\Add implements HttpPostActionInterface
{ {
......
Plugin/Controller/Wishlist/Index/Add.php
...@@ -5,14 +5,13 @@ ...@@ -5,14 +5,13 @@
namespace Ubertheme\Base\Plugin\Controller\Wishlist\Index; namespace Ubertheme\Base\Plugin\Controller\Wishlist\Index;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\App\Action; use Magento\Framework\App\Action;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\Data\Form\FormKey\Validator; use Magento\Framework\Data\Form\FormKey\Validator;
use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Exception\NoSuchEntityException;
/** /**
* Class Add * Ajax add product to wishlist function
* @package Ubertheme\Base\Plugin\Controller\Wishlist\Index
*/ */
class Add extends \Magento\Wishlist\Controller\Index\Add class Add extends \Magento\Wishlist\Controller\Index\Add
{ {
......
composer.json
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
}, },
"suggest": {}, "suggest": {},
"type": "magento2-module", "type": "magento2-module",
"version": "1.0.2", "version": "1.0.3",
"license": [ "license": [
"Proprietary" "Proprietary"
], ],
......
etc/acl.xml
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
* Copyright © 2016 UberTheme. All rights reserved. * Copyright © 2016 UberTheme. All rights reserved.
*/ */
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
<acl> <acl>
<resources> <resources>
<resource id="Magento_Backend::admin"> <resource id="Magento_Backend::admin">
<resource id="Ubertheme_Base::content" title="UberTheme Extensions" sortOrder="999"/> <resource id="Ubertheme_Base::content" title="UberTheme Extensions" sortOrder="999" />
<resource id="Magento_Backend::stores"> <resource id="Magento_Backend::stores">
<resource id="Magento_Backend::stores_settings"> <resource id="Magento_Backend::stores_settings">
<resource id="Magento_Config::config"> <resource id="Magento_Config::config">
<resource id="Ubertheme_Base::settings" title="UberTheme Extensions" sortOrder="999"/> <resource id="Ubertheme_Base::settings" title="UberTheme Extensions" sortOrder="999" />
</resource> </resource>
</resource> </resource>
</resource> </resource>
......
etc/adminhtml/menu.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
sortOrder="9999" sortOrder="9999"
module="Ubertheme_Base" module="Ubertheme_Base"
title="Ubertheme's Extensions" title="Ubertheme's Extensions"
resource="Ubertheme_Base::settings"/> resource="Ubertheme_Base::settings" />
<add id="Ubertheme_Base::helpcenter" <add id="Ubertheme_Base::helpcenter"
sortOrder="1" sortOrder="1"
...@@ -19,29 +19,29 @@ ...@@ -19,29 +19,29 @@
parent="Ubertheme_Base::menu" parent="Ubertheme_Base::menu"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
/> />
<add id="Ubertheme_Base::docs" <add id="Ubertheme_Base::docs"
sortOrder="1" sortOrder="1"
title="Ubertheme Documentation" module="Ubertheme_Base" title="Ubertheme Documentation" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
<add id="Ubertheme_Base::support" <add id="Ubertheme_Base::support"
sortOrder="2" sortOrder="2"
title="Ubertheme Help Center" module="Ubertheme_Base" title="Ubertheme Help Center" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
<add id="Ubertheme_Base::settings" <add id="Ubertheme_Base::settings"
sortOrder="3" sortOrder="3"
title="Extensions Version" module="Ubertheme_Base" title="Extensions Version" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
<add id="Ubertheme_Base::marketplace" <add id="Ubertheme_Base::marketplace"
sortOrder="4" sortOrder="4"
title="Ubertheme Marketplace" module="Ubertheme_Base" title="Ubertheme Marketplace" module="Ubertheme_Base"
parent="Ubertheme_Base::helpcenter" parent="Ubertheme_Base::helpcenter"
resource="Ubertheme_Base::settings" resource="Ubertheme_Base::settings"
action="adminhtml/system_config/edit/section/ubertheme_base"/> action="adminhtml/system_config/edit/section/ubertheme_base" />
</menu> </menu>
</config> </config>
etc/config.xml
<?xml version="1.0"?> <?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
<default> <default>
<csp> <csp>
<mode> <mode>
......
etc/csp_whitelist.xml
<?xml version="1.0"?> <?xml version="1.0"?>
<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
<policies> <policies>
<policy id="script-src"> <policy id="script-src">
<values> <values>
......
etc/di.xml
<?xml version="1.0"?> <?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Magento\Catalog\Controller\Product\Compare\Add"> <type name="Magento\Catalog\Controller\Product\Compare\Add">
<plugin name="ub_ajax_add_to_compare_plugin" type="Ubertheme\Base\Plugin\Controller\Product\Compare\Add"/> <plugin name="ub_ajax_add_to_compare_plugin" type="Ubertheme\Base\Plugin\Controller\Product\Compare\Add"/>
</type> </type>
......
etc/module.xml
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Copyright © 2016 UberTheme. All rights reserved. * Copyright © 2016 UberTheme. All rights reserved.
*/ */
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> <module name="Ubertheme_Base" setup_version="1.0.3"/>
<module name="Ubertheme_Base" setup_version="1.0.2"/> </config>
</config>
\ No newline at end of file
view/adminhtml/layout/adminhtml_system_config_edit.xml
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
* Copyright © 2016 Ubertheme. All rights reserved. * Copyright © 2016 Ubertheme. All rights reserved.
*/ */
--> -->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head> <head>
<css src="jquery/colorpicker/css/colorpicker.css"/> <css src="jquery/colorpicker/css/colorpicker.css"/>
<css src="Ubertheme_Base::css/select2.min.css"/> <css src="Ubertheme_Base::css/select2.min.css"/>
......
view/adminhtml/layout/default.xml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</head> </head>
<body> <body>
<referenceContainer name="before.body.end"> <referenceContainer name="before.body.end">
<block class="Magento\Backend\Block\Template" template="Ubertheme_Base::init_menu.phtml"/> <block class="Magento\Backend\Block\Template" template="Ubertheme_Base::init_menu.phtml" />
</referenceContainer> </referenceContainer>
</body> </body>
</page> </page>
\ No newline at end of file
view/adminhtml/templates/init_menu.phtml
<?php
?>
<script type="text/javascript"> <script type="text/javascript">
requirejs(['jquery'], function ($) { requirejs([ 'jquery' ], function ($) {
$(document).ready(function () { $(document).ready(function() {
//update URLs for help center menu items //update URLs for help center menu items
$('.item-helpcenter .item-docs a').attr('href', 'https://www.ubertheme.com/docs').attr('target', '_blank'); $('.item-helpcenter .item-docs a').attr('href', 'https://www.ubertheme.com/docs').attr('target', '_blank');
$('.item-helpcenter .item-support a').attr('href', 'https://www.ubertheme.com/ask-question').attr('target', '_blank'); $('.item-helpcenter .item-support a').attr('href', 'https://www.ubertheme.com/ask-question').attr('target', '_blank');
$('.item-helpcenter .item-marketplace a').attr('href', 'https://www.ubertheme.com/magento-extensions-2-x').attr('target', '_blank'); $('.item-helpcenter .item-marketplace a').attr('href', 'https://www.ubertheme.com/magento-extensions-2-x').attr('target', '_blank');
});
}); });
}); </script>
</script>
\ No newline at end of file
view/adminhtml/web/css/style.css
...@@ -6,20 +6,17 @@ ...@@ -6,20 +6,17 @@
margin-right: 0px; margin-right: 0px;
vertical-align: top; vertical-align: top;
background: url(../images/ub_32x32.png) no-repeat; background: url(../images/ub_32x32.png) no-repeat;
opacity: .5; opacity: .5;
} }
.admin__menu #menu-ubertheme-base-menu.level-0._active._show a:before, .admin__menu #menu-ubertheme-base-menu.level-0._active._show a:before,
.admin__menu #menu-ubertheme-base-menu.level-0 > a:hover:before { .admin__menu #menu-ubertheme-base-menu.level-0 > a:hover:before {
opacity: 1; opacity: 1;
} }
.module-name { .module-name {
text-align: left; text-align: left;
font-size: 14px !important; font-size: 14px !important;
margin: 0px 0px 5px 0px; margin: 0px 0px 5px 0px;
} }
.module-desc { .module-desc {
font-weight: normal; font-weight: normal;
font-size: 11px; font-size: 11px;
...@@ -27,8 +24,7 @@ ...@@ -27,8 +24,7 @@
display: block; display: block;
float: left; float: left;
} }
#menu-ubertheme-base-menu .submenu-title{
#menu-ubertheme-base-menu .submenu-title {
color: #ffffff; color: #ffffff;
display: block; display: block;
font-size: 2.2rem; font-size: 2.2rem;
...@@ -46,7 +42,6 @@ ...@@ -46,7 +42,6 @@
margin-top: -2px; margin-top: -2px;
width: 137px; width: 137px;
} }
#menu-ubertheme-base-menu .action-close._close{
#menu-ubertheme-base-menu .action-close._close {
top: 0px; top: 0px;
} }
\ No newline at end of file
view/adminhtml/web/images/ubertheme.svg
<svg width="573" height="101" xmlns="http://www.w3.org/2000/svg"> <svg width="573" height="101" xmlns="http://www.w3.org/2000/svg">
<g> <g>
<title>Ubertheme Logo</title> <title>Ubertheme Logo</title>
<rect fill="none" id="canvas_background" height="103" width="575" y="-1" x="-1"/> <rect fill="none" id="canvas_background" height="103" width="575" y="-1" x="-1"/>
<g display="none" overflow="visible" y="0" x="0" height="100%" width="100%" id="canvasGrid"> <g display="none" overflow="visible" y="0" x="0" height="100%" width="100%" id="canvasGrid">
<rect fill="url(#gridpattern)" stroke-width="0" y="0" x="0" height="100%" width="100%"/> <rect fill="url(#gridpattern)" stroke-width="0" y="0" x="0" height="100%" width="100%"/>
</g> </g>
</g> </g>
<g> <g>
<title>Logo</title> <title>Logo</title>
<text stroke="#000" <text stroke="#000" transform="matrix(3.772156299176288,0,0,3.772156299176288,-368.3187638529288,-238.00526829410703) " font-weight="bold" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="24" id="svg_1" y="84.833993" x="97.648033" stroke-width="0" fill="#fff">UBERTHEME</text>
transform="matrix(3.772156299176288,0,0,3.772156299176288,-368.3187638529288,-238.00526829410703) " </g>
font-weight="bold" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif"
font-size="24" id="svg_1" y="84.833993" x="97.648033" stroke-width="0" fill="#fff">UBERTHEME</text>
</g>
</svg> </svg>
\ No newline at end of file
view/adminhtml/web/js/select2.full.js
This source diff could not be displayed because it is too large. You can view the blob instead.
view/adminhtml/web/js/ub-draggable-fields.js
...@@ -18,7 +18,7 @@ define([ ...@@ -18,7 +18,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var $self = this; var $self = this;
var $rowsContainer = $self.element.find(this.options.rowsContainer); var $rowsContainer = $self.element.find(this.options.rowsContainer);
......
view/base/web/fonts/fa-brands-400.svg 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
view/base/web/fonts/fa-regular-400.svg 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
view/base/web/fonts/fa-solid-900.svg 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
view/frontend/layout/default.xml
...@@ -5,24 +5,24 @@ ...@@ -5,24 +5,24 @@
*/ */
--> -->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head> <head>
<css src="Ubertheme_Base::css/font-awesome.min.css"/> <css rel="preload" src="Ubertheme_Base::css/font-awesome.min.css"/>
</head> </head>
<body> <body>
<referenceContainer name="after.body.start"> <referenceContainer name="after.body.start">
<block class="Magento\Backend\Block\Template" template="Ubertheme_Base::after_body_start.phtml"/> <block class="Magento\Backend\Block\Template" template="Ubertheme_Base::after_body_start.phtml" />
</referenceContainer> </referenceContainer>
<referenceContainer name="before.body.end"> <referenceContainer name="before.body.end">
<block class="Magento\Backend\Block\Template" template="Ubertheme_Base::before_body_end.phtml"/> <block class="Magento\Backend\Block\Template" template="Ubertheme_Base::before_body_end.phtml" />
</referenceContainer> </referenceContainer>
<referenceContainer name="root"> <referenceContainer name="root">
<block class="Ubertheme\Base\Block\Ajax\Compare" name="ub.ajax.compare" <block class="Ubertheme\Base\Block\Ajax\Compare" name="ub.ajax.compare"
as="ub-ajax-compare" template="Ubertheme_Base::ajax/compare.phtml"/> as="ub-ajax-compare" template="Ubertheme_Base::ajax/compare.phtml"/>
<block class="Ubertheme\Base\Block\Ajax\Wishlist" name="ub.ajax.wishlist" <block class="Ubertheme\Base\Block\Ajax\Wishlist" name="ub.ajax.wishlist"
as="ub-ajax-wishlist" template="Ubertheme_Base::ajax/wishlist.phtml"/> as="ub-ajax-wishlist" template="Ubertheme_Base::ajax/wishlist.phtml"/>
<block class="Ubertheme\Base\Block\Ajax\AddCart" name="ub.ajax.cart" <block class="Ubertheme\Base\Block\Ajax\AddCart" name="ub.ajax.cart"
as="ub-ajax-cart" template="Ubertheme_Base::ajax/add_cart.phtml"/> as="ub-ajax-cart" template="Ubertheme_Base::ajax/add_cart.phtml"/>
</referenceContainer> </referenceContainer>
</body> </body>
</page> </page>
view/frontend/templates/after_body_start.phtml
<?php
?>
<!-- Some general js functions--> <!-- Some general js functions-->
<script type="text/javascript"> <script type="text/javascript">
require([ require([
...@@ -10,5 +12,5 @@ ...@@ -10,5 +12,5 @@
$('html').addClass(extraClass); $('html').addClass(extraClass);
}); });
</script> </script>
<!-- After body start content --> <!-- After body start content -->
view/frontend/templates/ajax/add_cart.phtml
<!-- <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
--> ?>
<?php /** @var \Ubertheme\Base\Block\Ajax\AddCart $block */ ?> <?php /** @var \Ubertheme\Base\Block\Ajax\AddCart $block */ ?>
<!-- Initial ajax add cart js function --> <!-- Initial ajax add cart js function -->
<script type="text/javascript"> <script type="text/javascript">
var ubAjaxCartOptions = <?= $block->getAjaxCartOptions() ?>; var ubAjaxCartOptions = <?= $block->getAjaxCartOptions() ?>;
require([ require([
"jquery", "jquery",
"Ubertheme_Base/js/ajaxAddCart", "Ubertheme_Base/js/ajaxAddCart",
"domReady!" "domReady!"
], function ($) { ], function ($) {
'use strict'; 'use strict';
$.ub.AjaxAddCart(ubAjaxCartOptions); $.ub.AjaxAddCart(ubAjaxCartOptions);
}); });
</script> </script>
view/frontend/templates/ajax/compare.phtml
<!-- <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
--> ?>
<?php <?php
/** @var \Ubertheme\Base\Block\Ajax\Compare $block */ /** @var \Ubertheme\Base\Block\Ajax\Compare $block */
?> ?>
<!-- Initial ajax compare js function --> <!-- Initial ajax compare js function -->
<script type="text/javascript"> <script type="text/javascript">
var ubAjaxCompareOptions = <?= $block->getAjaxCompareOptions() ?>; var ubAjaxCompareOptions = <?= $block->getAjaxCompareOptions() ?>;
require([ require([
"jquery", "jquery",
"Ubertheme_Base/js/ajaxCompare", "Ubertheme_Base/js/ajaxCompare",
"domReady!" "domReady!"
], function ($) { ], function ($) {
'use strict'; 'use strict';
$.ub.AjaxCompare(ubAjaxCompareOptions); $.ub.AjaxCompare(ubAjaxCompareOptions);
}); });
</script> </script>
view/frontend/templates/ajax/wishlist.phtml
<!-- <?php
/** /**
* Copyright © 2016 Ubertheme.com All rights reserved. * Copyright © 2016 Ubertheme.com All rights reserved.
*/ */
--> ?>
<?php <?php
/** @var \Ubertheme\Base\Block\Ajax\Wishlist $block */ /** @var \Ubertheme\Base\Block\Ajax\Wishlist $block */
?> ?>
<!-- Initial ajax wistlist js function --> <!-- Initial ajax wistlist js function -->
<script type="text/javascript"> <script type="text/javascript">
var ubAjaxWishlistOptions = <?= $block->getAjaxWishlistOptions() ?>; var ubAjaxWishlistOptions = <?= $block->getAjaxWishlistOptions() ?>;
require([ require([
"jquery", "jquery",
"Ubertheme_Base/js/ajaxWishlist", "Ubertheme_Base/js/ajaxWishlist",
"domReady!" "domReady!"
], function ($) { ], function ($) {
'use strict'; 'use strict';
$.ub.AjaxWishlist(ubAjaxWishlistOptions); $.ub.AjaxWishlist(ubAjaxWishlistOptions);
}); });
</script> </script>
view/frontend/templates/before_body_end.phtml
<!-- Before body end content --> <?php
<div id="ub-bg-overlay" class="ub-bg-overlay"></div> ?>
\ No newline at end of file <!-- Before body end content -->
<div id="ub-bg-overlay" class="ub-bg-overlay"></div>
view/frontend/templates/countdown.sample.phtml
<!-- Start CountDown --> <!-- Start CountDown -->
<?php <?php
$id = rand() . time(); $id = rand().time();
$strEndDate = strtotime("2099-12-31 00:00:00"); $strEndDate = strtotime("2099-12-31 00:00:00");
$check = date('G:i:s', $strEndDate); $check = date('G:i:s', $strEndDate);
if ($check == "0:00:00") { if ($check == "0:00:00") {
...@@ -8,13 +8,15 @@ if ($check == "0:00:00") { ...@@ -8,13 +8,15 @@ if ($check == "0:00:00") {
} else { } else {
$endDate = date('m/d/Y G:i:s', $strEndDate); $endDate = date('m/d/Y G:i:s', $strEndDate);
} }
?> ?>
<div id="countdown-<?php echo $id; ?>" class="ub-countdown">
<div id="countdown-<?= $id; ?>" class="ub-countdown">
<ul> <ul>
<li class="days">%%D%% <span class="text"><?php echo __('Day'); ?></span></li> <li class="days">%%D%% <span class="text"><?= __('Day'); ?></span></li>
<li class="hours">%%H%% <span class="text"><?php echo __('Hours'); ?></span></li> <li class="hours">%%H%% <span class="text"><?= __('Hours'); ?></span></li>
<li class="minutes">%%M%% <span class="text"><?php echo __('Mins'); ?></span></li> <li class="minutes">%%M%% <span class="text"><?= __('Mins'); ?></span></li>
<li class="seconds">%%S%% <span class="text"><?php echo __('Secs'); ?></span></li> <li class="seconds">%%S%% <span class="text"><?= __('Secs'); ?></span></li>
</ul> </ul>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
...@@ -31,4 +33,4 @@ if ($check == "0:00:00") { ...@@ -31,4 +33,4 @@ if ($check == "0:00:00") {
}); });
}); });
</script> </script>
<!-- End CountDown --> <!-- End CountDown -->
\ No newline at end of file
view/frontend/web/css/lazy.load/style.css
video, iframe[data-src] { video, iframe[data-src] {
box-shadow: inset 0 0 0 1px #ccc; box-shadow: inset 0 0 0 1px #ccc;
} }
.container > p, .ui-content > p, #ajax > p { .container > p, .ui-content > p, #ajax > p {
text-align: center; text-align: center;
} }
.lazy-hidden { .lazy-hidden {
background: #eee url('loading.gif') no-repeat 50% 50%; background: #eee url('loading.gif') no-repeat 50% 50%;
} }
\ No newline at end of file
view/frontend/web/js/ajaxAddCart.js
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
define([ define([
'jquery', 'jquery',
'mage/translate', 'mage/translate',
'jquery/ui', 'jquery-ui-modules/core',
'jquery-ui-modules/widget',
'Magento_Catalog/js/catalog-add-to-cart' 'Magento_Catalog/js/catalog-add-to-cart'
], function ($, $t) { ], function ($, $t) {
'use strict'; 'use strict';
...@@ -26,7 +27,7 @@ define([ ...@@ -26,7 +27,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
this.bindAjaxAddCart(); this.bindAjaxAddCart();
}, },
......
view/frontend/web/js/ajaxCompare.js
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
define([ define([
'jquery', 'jquery',
'mage/translate', 'mage/translate',
'jquery/ui' 'jquery-ui-modules/core',
'jquery-ui-modules/widget'
], function ($, $t) { ], function ($, $t) {
'use strict'; 'use strict';
...@@ -23,7 +24,7 @@ define([ ...@@ -23,7 +24,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var self = this; var self = this;
if (self.options.ajaxCompareUrl.length) { if (self.options.ajaxCompareUrl.length) {
$('body').on('click', self.options.compareBtnSelector, function (e) { $('body').on('click', self.options.compareBtnSelector, function (e) {
......
view/frontend/web/js/ajaxWishlist.js
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
define([ define([
'jquery', 'jquery',
'mage/translate', 'mage/translate',
'jquery/ui' 'jquery-ui-modules/core',
'jquery-ui-modules/widget'
], function ($, $t) { ], function ($, $t) {
'use strict'; 'use strict';
...@@ -26,13 +27,13 @@ define([ ...@@ -26,13 +27,13 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var self = this; var self = this;
if (self.options.ajaxWishlistUrl.length) { if (self.options.ajaxWishlistUrl.length) {
$('body').on('click', self.options.wishlistBtnSelector, function (e) { $('body').on('click', self.options.wishlistBtnSelector, function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (self.options.customerId) { //has login if (self.options.customerId ) { //has login
var params = $(this).data('post').data; var params = $(this).data('post').data;
params['isAjaxWishlist'] = true; params['isAjaxWishlist'] = true;
params['form_key'] = $(self.options.formKeySelector).val(); params['form_key'] = $(self.options.formKeySelector).val();
......
view/frontend/web/js/ubCountDown.js
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
define([ define([
'jquery', 'jquery',
'jquery/ui' 'jquery-ui-modules/core',
'jquery-ui-modules/widget'
], function ($) { ], function ($) {
'use strict'; 'use strict';
...@@ -26,7 +27,7 @@ define([ ...@@ -26,7 +27,7 @@ define([
/** /**
* Initialize widget * Initialize widget
*/ */
_create: function () { _create: function() {
var self = this; var self = this;
...@@ -61,7 +62,7 @@ define([ ...@@ -61,7 +62,7 @@ define([
return "<span class='number'>" + str + "</span>"; return "<span class='number'>" + str + "</span>";
} else if (self.options.displayStyle == 2) { } else if (self.options.displayStyle == 2) {
var number = str.split(""); var number = str.split("");
if (typeof (number[2]) == "undefined") { if (typeof(number[2]) == "undefined") {
return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span></span>"; return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span></span>";
} else { } else {
return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span><span>" + number[2] + "</span></span>"; return "<span class=\"number\"><span>" + number[0] + "</span><span>" + number[1] + "</span><span>" + number[2] + "</span></span>";
......
view/frontend/web/js/ubOwlCarousel2.js
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
define([ define([
"jquery", "jquery",
"owlCarousel2" "owlCarousel2"
], function ($) { ], function($) {
'use strict'; 'use strict';
return function ($config) { return function ($config) {
...@@ -19,7 +19,7 @@ define([ ...@@ -19,7 +19,7 @@ define([
navText: ['&larr;', '&rarr;'], navText: ['&larr;', '&rarr;'],
responsiveClass: true, responsiveClass: true,
responsiveBaseElement: $element, responsiveBaseElement: $element,
responsive: { responsive:{
0: { 0: {
items: 1 items: 1
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment