From b7c870081c3dcd2751277c3b77084e9cb7e804fc Mon Sep 17 00:00:00 2001
From: Hieromon Ikasamo <Hieromon@users.noreply.github.com>
Date: Sun, 10 Feb 2019 22:25:25 +0900
Subject: [PATCH] Changed the order of the custom menu item

---
 src/AutoConnectPage.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/AutoConnectPage.cpp b/src/AutoConnectPage.cpp
index 3340e53..38060ac 100644
--- a/src/AutoConnectPage.cpp
+++ b/src/AutoConnectPage.cpp
@@ -526,7 +526,6 @@ const char  AutoConnect::_ELM_MENU_PRE[] PROGMEM = {
         "<li class=\"luxbar-item\"><a href=\"" AUTOCONNECT_URI_OPEN "\">Open SSIDs</a></li>"
         "<li class=\"luxbar-item\"><a href=\"" AUTOCONNECT_URI_DISCON "\">Disconnect</a></li>"
         "<li class=\"luxbar-item\" id=\"reset\"><a href=\"#rdlg\">Reset...</a></li>"
-        "<li class=\"luxbar-item\"><a href=\"HOME_URI\">HOME</a></li>"
 };
 
 const char  AutoConnect::_ELM_MENU_AUX[] PROGMEM = {
@@ -534,6 +533,7 @@ const char  AutoConnect::_ELM_MENU_AUX[] PROGMEM = {
 };
 
 const char  AutoConnect::_ELM_MENU_POST[] PROGMEM = {
+        "<li class=\"luxbar-item\"><a href=\"HOME_URI\">HOME</a></li>"
       "</ul>"
     "</div>"
     "<div class=\"lap\" id=\"rdlg\"><a href=\"#reset\" class=\"overlap\"></a>"
@@ -906,7 +906,7 @@ String AutoConnect::_token_MENU_PRE(PageArgument& args) {
   AC_UNUSED(args);
   String  currentMenu = FPSTR(_ELM_MENU_PRE);
   currentMenu.replace(String(F("MENU_TITLE")), _menuTitle);
-  currentMenu.replace(String(F("HOME_URI")), _apConfig.homeUri);
+  // currentMenu.replace(String(F("HOME_URI")), _apConfig.homeUri);
   return currentMenu;
 }
 
@@ -919,7 +919,9 @@ String AutoConnect::_token_MENU_AUX(PageArgument& args) {
 
 String AutoConnect::_token_MENU_POST(PageArgument& args) {
   AC_UNUSED(args);
-  return String(FPSTR(_ELM_MENU_POST));
+  String  postMenu = FPSTR(_ELM_MENU_POST);
+  postMenu.replace(String(F("HOME_URI")), _apConfig.homeUri);
+  return postMenu;
 }
 
 String AutoConnect::_token_CSS_LUXBAR(PageArgument& args) {