From 1f7cbbd7d7e89dfbc7a2bbee33e99eb373f6ebb7 Mon Sep 17 00:00:00 2001
From: Nick Charlton <nick@nickcharlton.net>
Date: Fri, 12 Jul 2019 15:32:58 +0100
Subject: [PATCH] Add a "back" link to the navigation

This solves half of #271 by implementing a link to take the user back to
the main application. It's assumed that `root_url` without a namespace
returns the main application's root.
---
 .../stylesheets/administrate/components/_buttons.scss     | 8 ++++++++
 .../stylesheets/administrate/components/_navigation.scss  | 5 ++---
 app/views/administrate/application/_navigation.html.erb   | 2 ++
 spec/features/navigation_spec.rb                          | 7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/administrate/components/_buttons.scss b/app/assets/stylesheets/administrate/components/_buttons.scss
index ff745fa106..6ac025cd88 100644
--- a/app/assets/stylesheets/administrate/components/_buttons.scss
+++ b/app/assets/stylesheets/administrate/components/_buttons.scss
@@ -41,3 +41,11 @@ input[type="submit"],
     }
   }
 }
+
+.button--alt {
+  background-color: transparent;
+  border: $base-border;
+  border-color: $blue;
+  color: $blue;
+  margin-bottom: $base-spacing;
+}
diff --git a/app/assets/stylesheets/administrate/components/_navigation.scss b/app/assets/stylesheets/administrate/components/_navigation.scss
index 8432ccb5ed..2b2de3f138 100644
--- a/app/assets/stylesheets/administrate/components/_navigation.scss
+++ b/app/assets/stylesheets/administrate/components/_navigation.scss
@@ -2,9 +2,8 @@ $_navigation-link-padding: 0.6em;
 
 .navigation {
   flex: 1 0 10rem;
-  padding-bottom: $base-spacing;
-  padding-right: calc(#{$base-spacing} - #{$_navigation-link-padding});
-  padding-top: $base-spacing;
+  padding: $base-spacing;
+  padding-left: 0;
 }
 
 .navigation__link {
diff --git a/app/views/administrate/application/_navigation.html.erb b/app/views/administrate/application/_navigation.html.erb
index 3c8c16d2a3..e4a40a1771 100644
--- a/app/views/administrate/application/_navigation.html.erb
+++ b/app/views/administrate/application/_navigation.html.erb
@@ -8,6 +8,8 @@ as defined by the routes in the `admin/` namespace
 %>
 
 <nav class="navigation" role="navigation">
+  <%= link_to "Back to app", root_url, class: "button button--alt" %> 
+
   <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
     <%= link_to(
       display_resource_name(resource),
diff --git a/spec/features/navigation_spec.rb b/spec/features/navigation_spec.rb
index acac84f6e6..0358778dea 100644
--- a/spec/features/navigation_spec.rb
+++ b/spec/features/navigation_spec.rb
@@ -1,6 +1,13 @@
 require "rails_helper"
 
 describe "navigation" do
+  it "has the link of back to application" do
+    visit admin_customers_path
+
+    navigation = find(".navigation")
+    expect(navigation).to have_link("Back to app")
+  end
+
   it "highlights the link to the current page's resource type" do
     visit admin_customers_path