From acacd7a7f8edf10803389d5c381465fc7db50bd7 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Wed, 17 Jan 2018 20:28:33 +0100
Subject: [PATCH] [UX] Move "Go back to previous location" up one menu level
 (#3615)

---
 frontend/apps/reader/modules/readerlink.lua | 11 +++++------
 frontend/ui/elements/reader_menu_order.lua  |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/apps/reader/modules/readerlink.lua b/frontend/apps/reader/modules/readerlink.lua
index 1c97e485e..cfd841d3c 100644
--- a/frontend/apps/reader/modules/readerlink.lua
+++ b/frontend/apps/reader/modules/readerlink.lua
@@ -84,12 +84,6 @@ function ReaderLink:addToMainMenu(menu_items)
     menu_items.follow_links = {
         text = _("Links"),
         sub_item_table = {
-            {
-                text = _("Go back to previous location"),
-                enabled_func = function() return #self.location_stack > 0 end,
-                callback = function() self:onGoBackLink() end,
-                separator = true,
-            },
             {
                 text = _("Tap to follow links"),
                 checked_func = isTapToFollowLinksOn,
@@ -141,6 +135,11 @@ function ReaderLink:addToMainMenu(menu_items)
             },
         }
     }
+    menu_items.go_to_previous_location = {
+        text = _("Go back to previous location"),
+        enabled_func = function() return #self.location_stack > 0 end,
+        callback = function() self:onGoBackLink() end,
+    }
 end
 
 --- Gets link from gesture.
diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua
index 7a1d97549..c35e487b3 100644
--- a/frontend/ui/elements/reader_menu_order.lua
+++ b/frontend/ui/elements/reader_menu_order.lua
@@ -16,6 +16,7 @@ local order = {
         "go_to",
         "skim_to",
         "----------------------------",
+        "go_to_previous_location",
         "follow_links",
     },
     typeset = {