updated fixing bugs while merging the files css and js

php-cuong · Dec 5, 2017 · 563472d · 563472d
1 parent 7460197
commit 563472d
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "magento/framework": "100.0.*|100.1.*|101.0.*"
     },
     "type": "magento2-module",
-    "version": "2.1.7",
+    "version": "2.1.7.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/etc/module.xml b/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="PHPCuong_Faq" setup_version="2.1.0"/>
+    <module name="PHPCuong_Faq" setup_version="2.1.7.1"/>
 </config>
diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml
diff --git a/view/adminhtml/templates/footer/version.phtml b/view/adminhtml/templates/footer/version.phtml
@@ -1,4 +1,4 @@
 <p class="magento-version">
     <strong><?= /* @escapeNotVerified */ base64_decode('RkFRcyBFeHRlbnNpb24=') ?></strong>
-    <?= /* @escapeNotVerified */ base64_decode('Mi4xLjc='); ?>
+    <?= /* @escapeNotVerified */ base64_decode('Mi4xLjcuMQ=='); ?>
 </p>
diff --git a/view/adminhtml/web/css/adminhtml.less → view/adminhtml/web/css/source/_module.less b/view/adminhtml/web/css/adminhtml.less → view/adminhtml/web/css/source/_module.less
@@ -1,4 +1,4 @@
-@import 'faq-extension/style.css';
+@import '../faq-extension/style.css';
 
 .admin__menu .item-faqs.level-0>a:before {
     content: "\e900";

diff --git a/view/frontend/layout/faq_category_view.xml b/view/frontend/layout/faq_category_view.xml
@@ -7,7 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="PHPCuong_Faq::css/common.css"/>
         <script src="PHPCuong_Faq::js/js-category.js" />
     </head>
     <referenceContainer name="content">

diff --git a/view/frontend/layout/faq_faq_view.xml b/view/frontend/layout/faq_faq_view.xml
@@ -7,7 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="PHPCuong_Faq::css/common.css"/>
         <script src="PHPCuong_Faq::js/js-category.js" />
     </head>
     <referenceContainer name="content">

diff --git a/view/frontend/layout/faq_question_view.xml b/view/frontend/layout/faq_question_view.xml
@@ -7,12 +7,11 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="PHPCuong_Faq::css/common.css"/>
         <script src="PHPCuong_Faq::js/js-question.js" />
     </head>
     <referenceContainer name="content">
         <referenceBlock name="page.main.title" remove="true"/>
-        <block class="PHPCuong\Faq\Block\Question\Question" name="faq.question.view" template="PHPCuong_Faq::question/view.phtml" />
+        <block class="PHPCuong\Faq\Block\Question\Question" name="faq.question.view" template="PHPCuong_Faq::question/view.phtml" cacheable="false"/>
     </referenceContainer>
     <referenceContainer name="sidebar.main">
         <block class="PHPCuong\Faq\Block\Category\CategorySidebar" name="faq.category.sidebar.view" template="PHPCuong_Faq::category/categorySidebar.phtml" />

diff --git a/view/frontend/layout/faq_search_index.xml b/view/frontend/layout/faq_search_index.xml
@@ -7,7 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="PHPCuong_Faq::css/common.css"/>
         <script src="PHPCuong_Faq::js/js-category.js" />
     </head>
     <referenceContainer name="content">

diff --git a/view/frontend/web/css/common.less → view/frontend/web/css/source/_module.less b/view/frontend/web/css/common.less → view/frontend/web/css/source/_module.less
@@ -1,5 +1,5 @@
-@import 'faq-extension/style.css';
-@import 'bootstrap.css';
+@import '../faq-extension/style.css';
+@import '../bootstrap.css';
 
 /* faq content */
 [class^="faq-"] h1 {