From cc2a26aeed7e1c1191569689c4f642acb23f785c Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Thu, 15 Dec 2016 17:34:42 -0500
Subject: [PATCH] add maps links to nav locations

---
 app/assets/stylesheets/apps.css.erb                  |  7 ++-----
 .../authorized_applications/index.html.erb           |  1 -
 app/views/layouts/doorkeeper.html.erb                |  3 +++
 app/views/notifications/_header.html.erb             |  3 +++
 app/views/notifications/index.html.erb               |  4 +---
 app/views/notifications/show.html.erb                |  9 +++------
 app/views/shared/_go_to_maps.html.erb                |  3 ---
 frontend/src/components/Maps/Header.js               | 12 ++++++------
 8 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 app/views/shared/_go_to_maps.html.erb

diff --git a/app/assets/stylesheets/apps.css.erb b/app/assets/stylesheets/apps.css.erb
index 46fa64b7..5771e366 100644
--- a/app/assets/stylesheets/apps.css.erb
+++ b/app/assets/stylesheets/apps.css.erb
@@ -2,16 +2,13 @@
   position: relative;
   margin: 0 auto;
   width: auto;
-  max-width: 960px;
+  max-width: 800px;
   overflow: hidden;
   box-shadow: 0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);
   background: #fff;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  border: 1px solid #dcdcdc;
   box-sizing: border-box;
   padding: 15px;
+  font-family: 'din-regular', sans-serif;
 }
 
 .centerContent .page-header {
diff --git a/app/views/doorkeeper/authorized_applications/index.html.erb b/app/views/doorkeeper/authorized_applications/index.html.erb
index d6391215..42c3127d 100644
--- a/app/views/doorkeeper/authorized_applications/index.html.erb
+++ b/app/views/doorkeeper/authorized_applications/index.html.erb
@@ -33,6 +33,5 @@
   <% end %>
 </main>
 </div>
-<%= render partial: 'shared/go_to_maps' %>
 </div>
 <%= render 'script' %>
diff --git a/app/views/layouts/doorkeeper.html.erb b/app/views/layouts/doorkeeper.html.erb
index 960502d9..f4696a37 100644
--- a/app/views/layouts/doorkeeper.html.erb
+++ b/app/views/layouts/doorkeeper.html.erb
@@ -38,6 +38,9 @@
                             <a href="<%= oauth_authorized_applications_path %>" class="authedApps exploreMapsButton <%= params[:controller] == 'doorkeeper/authorized_applications' ? 'active' : nil %>">
                                 <div class="exploreMapsIcon"></div>Authorized Apps
                             </a>
+                            <a href="/" class="myMaps exploreMapsButton">
+                                <div class="exploreMapsIcon"></div>Maps
+                            </a>
                         </div>
                     </div>
                 </div>
diff --git a/app/views/notifications/_header.html.erb b/app/views/notifications/_header.html.erb
index 794bfdf7..2507b2ef 100644
--- a/app/views/notifications/_header.html.erb
+++ b/app/views/notifications/_header.html.erb
@@ -5,6 +5,9 @@
         <a href="<%= notifications_path %>" class="notificationsLink exploreMapsButton active">
           <div class="exploreMapsIcon"></div>Notifications
         </a>
+        <a href="/" class="exploreMapsButton myMaps">
+          <div class="exploreMapsIcon"></div>Maps
+        </a>
       </div>
     </div>
   </div>
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 9e37c220..ee075410 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -30,7 +30,7 @@
       <% end %>
       <% if @notifications.count == 0 %>
         <div class="emptyInbox">
-          You have ZERO unread notifications. Huzzah!
+          You have no notifications. More time for dancing.
         </div>
       <% end %>
     </ul>
@@ -41,8 +41,6 @@
       <%= paginate @notifications %>
     </div>
   <% end %>
-
-  <%= render partial: 'shared/go_to_maps' %>
 </div>
 
 <%= render partial: 'notifications/header' %>
diff --git a/app/views/notifications/show.html.erb b/app/views/notifications/show.html.erb
index a003a0e1..b56fb177 100644
--- a/app/views/notifications/show.html.erb
+++ b/app/views/notifications/show.html.erb
@@ -2,18 +2,15 @@
 <% content_for :mobile_title, 'Notifications' %>
 
 <div id="yield">
+  <div class="centerContent withPadding back">
+    <%= link_to 'Back to notifications', notifications_path %>
+  </div>
   <div class="centerContent notificationPage">
     <h2 class="notification-title"><%= @notification.subject %></h4>
     <div class="notification-body">
       <%= raw @notification.body %>
     </div>
   </div>
-
-  <div class="centerContent withPadding back">
-    <%= link_to 'Back to notifications', notifications_path %>
-  </div>
-
-  <%= render partial: 'shared/go_to_maps' %>
 </div>
 
 <%= render partial: 'notifications/header' %>
diff --git a/app/views/shared/_go_to_maps.html.erb b/app/views/shared/_go_to_maps.html.erb
deleted file mode 100644
index 04c88574..00000000
--- a/app/views/shared/_go_to_maps.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="centerContent withPadding">
-  <a href="/">Go to maps</a>
-</div>
diff --git a/frontend/src/components/Maps/Header.js b/frontend/src/components/Maps/Header.js
index c0a7e1cd..f360e7a5 100644
--- a/frontend/src/components/Maps/Header.js
+++ b/frontend/src/components/Maps/Header.js
@@ -36,6 +36,12 @@ class Header extends Component {
         <div className="exploreMapsBar exploreElement">
           <div className="exploreMapsMenu">
             <div className="exploreMapsCenter">
+              <MapLink show={explore}
+                href={signedIn ? '/' : '/explore/active'}
+                linkClass={activeClass('active')}
+                data-router="true"
+                text="All Maps"
+              /> 
               <MapLink show={signedIn && explore}
                 href="/explore/mine"
                 linkClass={activeClass('my')}
@@ -54,12 +60,6 @@ class Header extends Component {
                 data-router="true"
                 text="Starred By Me"
               />
-              <MapLink show={explore}
-                href={signedIn ? '/' : '/explore/active'}
-                linkClass={activeClass('active')}
-                data-router="true"
-                text="All Maps"
-              />
               <MapLink show={!signedIn && explore}
                 href="/explore/featured"
                 linkClass={activeClass('featured')}