summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-11-22 20:42:40 -0700
committermo khan <mo@mokhan.ca>2014-11-22 20:44:31 -0700
commitdc04e0ff44cd2758d81da0929d6cf181f64facb9 (patch)
tree2d9813ba553de6cbc0dd5959c229f881c978062d
parent102b823bccaa31c3c64ddf0c22dc6e4f23f8b3a0 (diff)
disable turbolinks in the my# section.
-rw-r--r--app/views/layouts/_header.html.erb2
-rw-r--r--app/views/my/shared/_my_nav.html.erb8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ee19e5f5..5e31d54c 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -42,7 +42,7 @@
</li>
</ul>
</li>
- <li>
+ <li data-no-turbolink>
<%= link_to my_dashboard_path do %>
<i class="fa fa-inbox"></i>
<% end %>
diff --git a/app/views/my/shared/_my_nav.html.erb b/app/views/my/shared/_my_nav.html.erb
index d4a3569b..7de5b49b 100644
--- a/app/views/my/shared/_my_nav.html.erb
+++ b/app/views/my/shared/_my_nav.html.erb
@@ -2,20 +2,20 @@
<%= link_to new_my_avatar_path, title: 'Change your avatar', data: { toggle: 'tooltip', placement: 'bottom', animation: 'true' }, class: 'tooltip-item' do %>
<%= avatar_for(current_user) %>
<% end %>
- <ul class="nav nav-list">
+ <ul class="nav nav-list" data-no-turbolink>
<li class="nav-header"><%= current_user.name %></li>
<li class="<%= "active" if controller?("dashboard") %>"><%= link_to "<i class='fa fa-tachometer'></i> Dashboard".html_safe, my_dashboard_path %></li>
- <li id='profile-tab' data-no-turbolink><%= link_to "<i class='fa fa-cog'></i> Profile".html_safe, my_root_path(anchor: 'profile/me') %></li>
+ <li id='profile-tab'><%= link_to "<i class='fa fa-cog'></i> Profile".html_safe, my_root_path(anchor: 'profile/me') %></li>
<li class="<%= 'active' if controller?('passwords') %>"><%= link_to "<i class='fa fa-eye'></i> Account".html_safe, my_passwords_path %></li>
<li class="<%= "active" if controller?("favorites") %>"><%= link_to "<i class='fa fa-star'></i> Favorites".html_safe, my_favorites_path %></li>
<li class="<%= 'active' if controller?('avatars') %>"><%= link_to "<i class='fa fa-picture-o'></i> Picture".html_safe, new_my_avatar_path %></li>
<li class="nav-header">Actions</li>
- <li data-no-turbolink>
+ <li>
<%= link_to my_root_path(anchor: 'cakes/new') do %>
<i class="fa fa-upload"></i> New Cake
<% end %>
</li>
- <li data-no-turbolink>
+ <li>
<%= link_to my_root_path(anchor: 'tutorials/new') do %>
<i class="fa fa-pencil-square"></i> New Tutorial
<% end %>