From 47f5cd330f8aba42fc9f8e7941a4b1334773c5ea Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Sun, 20 Jan 2019 09:07:28 +0100
Subject: [PATCH 1/2] Fix data-backbutton logic

---
 src/dashboard.html         | 2 +-
 src/edititemmetadata.html  | 4 ++--
 src/scripts/librarymenu.js | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/dashboard.html b/src/dashboard.html
index 6796026d67..37bf7cb865 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -1,4 +1,4 @@
-<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage fullWidthContent">
+<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage fullWidthContent" data-backbutton="false">
 
     <div class="content-primary">
 
diff --git a/src/edititemmetadata.html b/src/edititemmetadata.html
index ab77581ae7..a410ac6d30 100644
--- a/src/edititemmetadata.html
+++ b/src/edititemmetadata.html
@@ -1,4 +1,4 @@
-<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
+<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata" data-backbutton="false">
 
     <style>
         #editItemMetadataPage .editMetadataForm {
@@ -14,4 +14,4 @@
         <div class="editPageInnerContent padded-top padded-bottom-page">
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index b0cd078b7a..ad50604e8e 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -742,14 +742,12 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
     }
 
     function updateBackButton(page) {
-        var isDashboardPage = page.classList.contains("type-interior");
-
         if (!headerBackButton) {
             headerBackButton = document.querySelector(".headerBackButton");
         }
 
         if (headerBackButton) {
-            if (page.getAttribute("data-backbutton") && appRouter.canGoBack()) {
+            if ("false" !== page.getAttribute("data-backbutton") && appRouter.canGoBack()) {
                 headerBackButton.classList.remove("hide");
             } else {
                 headerBackButton.classList.add("hide");

From 933505cb2eeb0086b87423d7f33c3ea09b741c37 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Sun, 20 Jan 2019 15:05:26 +0100
Subject: [PATCH 2/2] Add back button to metadata manager

---
 src/edititemmetadata.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edititemmetadata.html b/src/edititemmetadata.html
index a410ac6d30..e7efed159a 100644
--- a/src/edititemmetadata.html
+++ b/src/edititemmetadata.html
@@ -1,4 +1,4 @@
-<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata" data-backbutton="false">
+<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
 
     <style>
         #editItemMetadataPage .editMetadataForm {