add maps links to nav locations

This commit is contained in:
Connor Turland 2016-12-15 17:34:42 -05:00
parent 60b8a2237c
commit cc2a26aeed
8 changed files with 18 additions and 24 deletions

View file

@ -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 {

View file

@ -33,6 +33,5 @@
<% end %>
</main>
</div>
<%= render partial: 'shared/go_to_maps' %>
</div>
<%= render 'script' %>

View file

@ -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>

View file

@ -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>

View file

@ -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' %>

View file

@ -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' %>

View file

@ -1,3 +0,0 @@
<div class="centerContent withPadding">
<a href="/">Go to maps</a>
</div>

View file

@ -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')}