Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated path for including css and js in modules | Moved plugins to core js folder #290

Merged
merged 1 commit into from
Jan 31, 2022
Merged

Updated path for including css and js in modules | Moved plugins to core js folder #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions controllers/front/ProductController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ public function setMedia()
$this->addCSS(_THEME_CSS_DIR_.'product.css');
$this->addCSS(_THEME_CSS_DIR_.'print.css', 'print');
$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll', 'bxslider'));
// for the search block By webkul
$this->addCSS(_PS_MODULE_DIR_.'hotelreservationsystem/views/css/datepickerCustom.css');
$this->addCSS(_THEME_CSS_DIR_.'datepicker.css');
$this->addJS(array(
_THEME_JS_DIR_.'tools.js', // retro compat themes 1.5
_THEME_JS_DIR_.'product.js'
Expand Down
0 ...em/libs/datatable/dataTables.bootstrap.js → js/datatable/dataTables.bootstrap.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...eservationsystem/libs/datatable/index.php → js/datatable/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2010-2020 Webkul.
* 2010-2021 Webkul.
*
* NOTICE OF LICENSE
*
Expand All @@ -14,7 +14,7 @@
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
*
* @author Webkul IN <[email protected]>
* @copyright 2010-2020 Webkul IN
* @copyright 2010-2021 Webkul IN
* @license https://store.webkul.com/license.html
*/

Expand All @@ -25,5 +25,5 @@
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');

header('Location: ../../../');
header('Location: ../../');
exit;
0 ...m/libs/datatable/jquery.dataTables.min.js → js/datatable/jquery.dataTables.min.js
View file
Open in desktop
File renamed without changes.
0 ...servationsystem/libs/owl.carousel/LICENSE → js/owl-carousel/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...rvationsystem/libs/owl.carousel/README.md → js/owl-carousel/README.md
View file
Open in desktop
File renamed without changes.
0 .../libs/owl.carousel/assets/ajax-loader.gif → js/owl-carousel/assets/ajax-loader.gif
View file
Open in desktop
File renamed without changes
0 ...libs/owl.carousel/assets/owl.carousel.css → js/owl-carousel/assets/owl.carousel.css
View file
Open in desktop
File renamed without changes.
0 .../owl.carousel/assets/owl.carousel.min.css → js/owl-carousel/assets/owl.carousel.min.css
View file
Open in desktop
File renamed without changes.
0 ...carousel/assets/owl.theme.default.min.css → ...carousel/assets/owl.theme.default.min.css
View file
Open in desktop
File renamed without changes.
0 ...l.carousel/assets/owl.theme.green.min.css → ...l-carousel/assets/owl.theme.green.min.css
View file
Open in desktop
File renamed without changes.
0 ...bs/owl.carousel/assets/owl.video.play.png → js/owl-carousel/assets/owl.video.play.png
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions ...les/hotelreservationsystem/libs/index.php → js/owl-carousel/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* 2010-2020 Webkul.
* 2010-2021 Webkul.
*
* NOTICE OF LICENSE
*
Expand All @@ -14,7 +14,7 @@
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
*
* @author Webkul IN <[email protected]>
* @copyright 2010-2020 Webkul IN
* @copyright 2010-2021 Webkul IN
* @license https://store.webkul.com/license.html
*/

Expand All @@ -25,5 +25,5 @@
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');

header('Location: ../../../');
header('Location: ../../');
exit;
0 ...nsystem/libs/owl.carousel/owl.carousel.js → js/owl-carousel/owl.carousel.js
View file
Open in desktop
File renamed without changes.
0 ...tem/libs/owl.carousel/owl.carousel.min.js → js/owl-carousel/owl.carousel.min.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions modules/blocknavigationmenu/blocknavigationmenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public function hookDisplayTopSubSecondaryBlock($params)
'currentPage' => Tools::getValue('controller')
)
);
$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/htlnevigationmenu.js');
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/blocknavigation.css');
$this->context->controller->addJS($this->_path.'/views/js/htlnevigationmenu.js');
$this->context->controller->addCSS($this->_path.'/views/css/blocknavigation.css');

$objCustomNavigationLink = new WkCustomNavigationLink();
if ($navigationLinks = $objCustomNavigationLink->getCustomNavigationLinks(1, false, 1)) {
Expand All @@ -78,7 +78,7 @@ public function hookFooter()
$link['link'] = $this->context->link->getPageLink($link['link']);
}
}
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/wkFooterNavigationBlock.css');
$this->context->controller->addCSS($this->_path.'/views/css/wkFooterNavigationBlock.css');
$this->context->smarty->assign('navigation_links', $navigationLinks);
return $this->display(__FILE__, 'wkFooterNavigationBlock.tpl');
}
Expand Down
11 changes: 2 additions & 9 deletions modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,15 +601,8 @@ public function setMedia()
parent::setMedia();

HotelHelper::assignDataTableVariables();
$this->context->controller->addJS(
_MODULE_DIR_.$this->module->name.'/libs/datatable/jquery.dataTables.min.js'
);
$this->context->controller->addJS(
_MODULE_DIR_.$this->module->name.'/libs/datatable/dataTables.bootstrap.js'
);
$this->context->controller->addCSS(
_MODULE_DIR_.$this->module->name.'/views/css/libs/datatable/datatable_bootstrap.css'
);
$this->context->controller->addJS(_PS_JS_DIR_.'/datatable/jquery.dataTables.min.js');
$this->context->controller->addJS(_PS_JS_DIR_.'/datatable/dataTables.bootstrap.js');

Media::addJsDef(
array(
Expand Down
1 change: 0 additions & 1 deletion modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ public function ajaxProcessSearchProductByName()
public function setMedia()
{
parent::setMedia();
$this->addCSS(_MODULE_DIR_.'hotelreservationsystem/views/css/datepickerCustom.css');
$this->addCSS(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css');
$this->addJs(_MODULE_DIR_.'hotelreservationsystem/views/js/HotelReservationAdmin.js');
}
Expand Down
2 changes: 1 addition & 1 deletion modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,6 @@ public function setMedia()
parent::setMedia();

$this->addCSS(array(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css'));
$this->addJs(_PS_MODULE_DIR_.$this->module->name.'/views/js/HotelReservationAdmin.js');
$this->addJs(_MODULE_DIR_.$this->module->name.'/views/js/HotelReservationAdmin.js');
}
}
4 changes: 2 additions & 2 deletions modules/hotelreservationsystem/hotelreservationsystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public function hookDisplayHeader()
}
}
//End
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/HotelReservationFront.css');
$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/HotelReservationFront.js');
$this->context->controller->addCSS($this->_path.'/views/css/HotelReservationFront.css');
$this->context->controller->addJS($this->_path.'/views/js/HotelReservationFront.js');
}

public function hookDisplayAfterHookTop()
Expand Down
10 changes: 0 additions & 10 deletions modules/hotelreservationsystem/libs/owl.carousel/assets/index.php
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions modules/hotelreservationsystem/libs/owl.carousel/index.php
View file
Open in desktop

This file was deleted.

17 changes: 5 additions & 12 deletions modules/wkabouthotelblock/wkabouthotelblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,11 @@ public function __construct()

public function hookDisplayHome()
{
// owl.carousel Plug-in files
$this->context->controller->addCSS(
_PS_MODULE_DIR_.'hotelreservationsystem/libs/owl.carousel/assets/owl.carousel.min.css'
);
$this->context->controller->addCSS(
_PS_MODULE_DIR_.'hotelreservationsystem/libs/owl.carousel/assets/owl.theme.default.min.css'
);
$this->context->controller->addJS(
_PS_MODULE_DIR_.'hotelreservationsystem/libs/owl.carousel/owl.carousel.min.js'
);
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/WkAboutHotelBlockFront.css');
$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/WkAboutHotelBlockFront.js');
$this->context->controller->addCSS(_PS_JS_DIR_.'owl-carousel/assets/owl.carousel.min.css');
$this->context->controller->addCSS(_PS_JS_DIR_.'owl-carousel/assets/owl.theme.default.min.css');
$this->context->controller->addJS(_PS_JS_DIR_.'owl-carousel/owl.carousel.min.js');
$this->context->controller->addCSS($this->_path.'/views/css/WkAboutHotelBlockFront.css');
$this->context->controller->addJS($this->_path.'/views/js/WkAboutHotelBlockFront.js');

$HOTEL_INTERIOR_HEADING = Configuration::get('HOTEL_INTERIOR_HEADING', $this->context->language->id);
$HOTEL_INTERIOR_DESCRIPTION = Configuration::get('HOTEL_INTERIOR_DESCRIPTION', $this->context->language->id);
Expand Down
2 changes: 1 addition & 1 deletion modules/wkfooteraboutblock/wkfooteraboutblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function hookFooter($params)
array('WK_HTL_SHORT_DESC' => Configuration::get('WK_HTL_SHORT_DESC', $this->context->language->id))
);

$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/wkFooterAboutBlockFront.css');
$this->context->controller->addCSS($this->_path.'/views/css/wkFooterAboutBlockFront.css');
return $this->display(__FILE__, 'wkFooterAboutBlock.tpl');
}

Expand Down
2 changes: 1 addition & 1 deletion modules/wkfooterpaymentblock/wkfooterpaymentblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function hookFooter($params)
$objPaymentBlockInfo = new WkFooterPaymentBlockInfo();
if ($allPaymentBlocks = $objPaymentBlockInfo->getAllPaymentBlocks(1, 'position')) {
$this->context->smarty->assign('allPaymentBlocks', $allPaymentBlocks);
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/wkFooterPaymentBlockFront.css');
$this->context->controller->addCSS($this->_path.'/views/css/wkFooterPaymentBlockFront.css');
return $this->display(__FILE__, 'wkFooterPaymentBlock.tpl');
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public function __construct()

public function hookDisplayHome()
{
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/wkHotelFeaturesBlockFront.css');
$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/wkHotelFeaturesBlockFront.js');
$this->context->controller->addCSS($this->_path.'/views/css/wkHotelFeaturesBlockFront.css');
$this->context->controller->addJS($this->_path.'/views/js/wkHotelFeaturesBlockFront.js');

$objFeaturesData = new WkHotelFeaturesData();
$hotelAmenities = $objFeaturesData->getHotelAmenities(1);
Expand Down
4 changes: 2 additions & 2 deletions modules/wkhotelfilterblock/wkhotelfilterblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ public function hookDisplayLeftColumn()
if ($this->context->controller->php_self == 'category') {
Media::addJsDef(array('noRoomAvailTxt' => $this->l('No room available')));

$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/wkhotelfilterblock.js');
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/wkhotelfilterblock.css');
$this->context->controller->addJS($this->_path.'/views/js/wkhotelfilterblock.js');
$this->context->controller->addCSS($this->_path.'/views/css/wkhotelfilterblock.css');
$id_lang = $this->context->language->id;
$all_feat = FeatureCore::getFeatures($id_lang);

Expand Down
2 changes: 1 addition & 1 deletion modules/wkhotelroom/wkhotelroom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function hookDisplayHome()
)
);

$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/WkHotelRoomBlockFront.css');
$this->context->controller->addCSS($this->_path.'/views/css/WkHotelRoomBlockFront.css');

return $this->display(__FILE__, 'hotelRoomDisplayBlock.tpl');
}
Expand Down
6 changes: 3 additions & 3 deletions modules/wkroomsearchblock/wkroomsearchblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ public function hookActionFrontControllerSetMedia()
|| 'index' == $controller
|| 'product' == $controller
) {
$this->context->controller->addCSS(_PS_MODULE_DIR_.'hotelreservationsystem/views/css/datepickerCustom.css');
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/wk-global-search.css');
$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/wk-room-search-block.js');
$this->context->controller->addCSS($this->_path.'/views/css/wk-global-search.css');
$this->context->controller->addJS($this->_path.'/views/js/wk-room-search-block.js');
$this->context->controller->addCSS(_THEME_CSS_DIR_.'datepicker.css');

Media::addJsDef(
array (
Expand Down
22 changes: 6 additions & 16 deletions modules/wktestimonialblock/wktestimonialblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,12 @@ public function hookDisplayAddModuleSettingLink()

public function hookDisplayHome()
{
// These files are already included in "wkabouthotelblock" module
if (!(Module::isInstalled('wkabouthotelblock') && Module::isEnabled('wkabouthotelblock'))) {
// owl.carousel Plug-in files
$this->context->controller->addCSS(
_PS_MODULE_DIR_.'hotelreservationsystem/libs/owl.carousel/assets/owl.carousel.min.css'
);
$this->context->controller->addCSS(
_PS_MODULE_DIR_.'hotelreservationsystem/libs/owl.carousel/assets/owl.theme.default.min.css'
);
$this->context->controller->addJS(
_PS_MODULE_DIR_.'hotelreservationsystem/libs/owl.carousel/owl.carousel.min.js'
);
}
/*---- Module Files ----*/
$this->context->controller->addCSS(_PS_MODULE_DIR_.$this->name.'/views/css/WkTestimonialBlockFront.css');
$this->context->controller->addJS(_PS_MODULE_DIR_.$this->name.'/views/js/WkTestimonialBlockFront.js');
$this->context->controller->addCSS(_PS_JS_DIR_.'/owl-carousel/assets/owl.carousel.min.css');
$this->context->controller->addCSS(_PS_JS_DIR_.'/owl-carousel/assets/owl.theme.default.min.css');
$this->context->controller->addJS(_PS_JS_DIR_.'/owl-carousel/owl.carousel.min');

$this->context->controller->addCSS($this->_path.'/views/css/WkTestimonialBlockFront.css');
$this->context->controller->addJS($this->_path.'/views/js/WkTestimonialBlockFront.js');

$HOTEL_TESIMONIAL_BLOCK_HEADING = Configuration::get(
'HOTEL_TESIMONIAL_BLOCK_HEADING',
Expand Down
4 changes: 2 additions & 2 deletions ...tionsystem/views/css/datepickerCustom.css → ...otel-reservation-theme/css/datepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* 2010-2020 Webkul.
* 2010-2021 Webkul.
*
* NOTICE OF LICENSE
*
Expand All @@ -13,7 +13,7 @@
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
*
* @author Webkul IN <[email protected]>
* @copyright 2010-2020 Webkul IN
* @copyright 2010-2021 Webkul IN
* @license https://store.webkul.com/license.html
*/

Expand Down