Merge pull request #3 from Magenerds/feature/opengraph

Fixed Systemconfig for OpenGraph
Magenerds · Jun 26, 2018 · dbd09af · dbd09af
2 parents b713699 + 4478cd6
commit dbd09af
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -40,15 +40,6 @@
                     <label>Transfer Shop Logo</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="facebook_enable" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
-                       showInStore="1">
-                    <label>Enable Facebook OpenGraph</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-                <field id="facebook_app_id" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1"
-                       showInStore="1">
-                    <label>Facebook App ID</label>
-                </field>
             </group>
             <group id="product_properties" translate="label" type="text" sortOrder="20" showInDefault="1"
                    showInWebsite="1" showInStore="1">
@@ -85,6 +76,12 @@
             </group>
             <group id="open_graph" translate="label" type="text" sortOrder="20" showInDefault="1"
                    showInWebsite="1" showInStore="1">
+                <label>Facebook Open Graph</label>
+                <field id="facebook_enable" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
+                       showInStore="1">
+                    <label>Enable Facebook OpenGraph</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
                 <field id="facebook_app_id" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1"
                        showInStore="1">
                     <label>Facebook App ID</label>

diff --git a/view/frontend/layout/catalog_category_view.xml b/view/frontend/layout/catalog_category_view.xml
@@ -20,7 +20,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.additional">
-            <block ifconfig="richsnippet/general/facebook_enable" class="Magenerds\RichSnippet\Block\Facebookopengraph" name="magenerds.facebookopengraph" template="Magenerds_RichSnippet::facebookopengraph_head.phtml" />
+            <block ifconfig="richsnippet/open_graph/facebook_enable" class="Magenerds\RichSnippet\Block\Facebookopengraph" name="magenerds.facebookopengraph" template="Magenerds_RichSnippet::facebookopengraph_head.phtml" />
         </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
@@ -20,7 +20,7 @@
     <body>
         <referenceBlock name="head.additional">
             <block ifconfig="richsnippet/general/enable" class="Magenerds\RichSnippet\Block\Schemaorg" name="magenerds.schemaorg" template="Magenerds_RichSnippet::meta_head.phtml" />
-            <block ifconfig="richsnippet/general/facebook_enable" class="Magenerds\RichSnippet\Block\Facebookopengraph" name="magenerds.facebookopengraph" template="Magenerds_RichSnippet::facebookopengraph_head.phtml" />
+            <block ifconfig="richsnippet/open_graph/facebook_enable" class="Magenerds\RichSnippet\Block\Facebookopengraph" name="magenerds.facebookopengraph" template="Magenerds_RichSnippet::facebookopengraph_head.phtml" />
         </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/layout/cms_page_view.xml b/view/frontend/layout/cms_page_view.xml
@@ -20,7 +20,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.additional">
-            <block ifconfig="richsnippet/general/facebook_enable" class="Magenerds\RichSnippet\Block\Facebookopengraph" name="magenerds.facebookopengraph" template="Magenerds_RichSnippet::facebookopengraph_head.phtml" />
+            <block ifconfig="richsnippet/open_graph/facebook_enable" class="Magenerds\RichSnippet\Block\Facebookopengraph" name="magenerds.facebookopengraph" template="Magenerds_RichSnippet::facebookopengraph_head.phtml" />
         </referenceBlock>
     </body>
 </page>