Fixes link order in secondary menu.

openxtra · Aug 8, 2018 · b49c199 · b49c199
1 parent 1037166
commit b49c199
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/Blocks/SortLink.php b/Blocks/SortLink.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Block\Account;
+
+/**
+ * Class for sortable links.
+ */
+class SortLink extends \Magento\Framework\View\Element\Html\Link\Current implements SortLinkInterface {
+    /**
+     * {@inheritdoc}
+     */
+    public function getSortOrder() {
+        return $this->getData(self::SORT_ORDER);
+    }
+}
diff --git a/Magento_Theme/layout/default.xml b/Magento_Theme/layout/default.xml
@@ -13,36 +13,36 @@
 
     <!-- Secondary navigation menu configuration -->
     <referenceBlock name="top.links">
-      <block class="Magento\Framework\View\Element\Html\Link"
-             name="faq.link"
-             after="support.link">
+      <block class="Magento\Customer\Block\Account\SortLink"
+             name="aboutus.link">
         <arguments>
-          <argument name="label" xsi:type="string" translate="false">FAQ</argument>
-          <argument name="path" xsi:type="string" translate="false">faq</argument>
+          <argument name="label" xsi:type="string" translate="false">About Us</argument>
+          <argument name="path" xsi:type="string" translate="false">about-us</argument>
+          <argument name="sortOrder" xsi:type="number">150</argument>
         </arguments>
       </block>
-      <block class="Magento\Framework\View\Element\Html\Link"
-             name="support.link"
-             after="contactus.link">
+      <block class="Magento\Customer\Block\Account\SortLink"
+             name="contactus.link">
         <arguments>
-          <argument name="label" xsi:type="string" translate="false">Support</argument>
-          <argument name="path" xsi:type="string" translate="false">support</argument>
+          <argument name="label" xsi:type="string" translate="false">Contact Us</argument>
+          <argument name="path" xsi:type="string" translate="false">contact-us</argument>
+          <argument name="sortOrder" xsi:type="number">150</argument>
         </arguments>
       </block>
-      <block class="Magento\Framework\View\Element\Html\Link"
-             name="contactus.link"
-             after="aboutus.link">
+      <block class="Magento\Customer\Block\Account\SortLink"
+             name="support.link">
         <arguments>
-          <argument name="label" xsi:type="string" translate="false">Contact Us</argument>
-          <argument name="path" xsi:type="string" translate="false">contact-us</argument>
+          <argument name="label" xsi:type="string" translate="false">Support</argument>
+          <argument name="path" xsi:type="string" translate="false">support</argument>
+          <argument name="sortOrder" xsi:type="number">150</argument>
         </arguments>
       </block>
-      <block class="Magento\Framework\View\Element\Html\Link"
-             name="aboutus.link"
-             before="my-account-link">
+      <block class="Magento\Customer\Block\Account\SortLink"
+             name="faq.link">
         <arguments>
-          <argument name="label" xsi:type="string" translate="false">About Us</argument>
-          <argument name="path" xsi:type="string" translate="false">about-us</argument>
+          <argument name="label" xsi:type="string" translate="false">FAQ</argument>
+          <argument name="path" xsi:type="string" translate="false">faq</argument>
+          <argument name="sortOrder" xsi:type="number">150</argument>
         </arguments>
       </block>
     </referenceBlock>

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
 	"magento/theme-frontend-blank": "*"
     },
     "type": "magento2-theme",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "license": [
 	"OSL-3.0",
 	"AFL-3.0"