fix html issues for turbolinks navigation

francistm · Oct 9, 2016 · 351034a · 351034a
1 parent b62407e
commit 351034a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 27 deletions.
diff --git a/app/views/admins/posts/_post.html.erb b/app/views/admins/posts/_post.html.erb
@@ -1,17 +1,17 @@
 <%= content_tag_for :tr, post do %>
-  <td class="hidden-xs"><%= post.id %></td>
-  <td class="hidden-xs"><%= post.slug %></td>
-  <td><%= post.title %></td>
-  <td class="hidden-xs"><%= l post.published_at, format: :short %></td>
-  <td>
-    <div class="hidden-xs">
-      <%= link_to '查看', guests_post_path(post.slug), class: 'btn btn-primary' %>
-      <%= link_to '编辑', edit_admins_post_path(post), class: 'btn btn-default' %>
-      <%= link_to '删除', admins_post_path(post), method: :delete, class: 'btn btn-danger' %>
-    </div>
+    <td class="hidden-xs"><%= post.id %></td>
+    <td class="hidden-xs"><%= post.slug %></td>
+    <td><%= post.title %></td>
+    <td class="hidden-xs"><%= l post.published_at, format: :short %></td>
+    <td>
+      <div class="hidden-xs">
+        <%= link_to '查看', guests_post_path(post.slug), class: 'btn btn-primary', data: { turbolinks: false } %>
+        <%= link_to '编辑', edit_admins_post_path(post), class: 'btn btn-default' %>
+        <%= link_to '删除', admins_post_path(post), method: :delete, class: 'btn btn-danger' %>
+      </div>
 
-    <div class="visible-xs-block">
-      <%= link_to '编辑', [:edit, :admins, post] %>
-    </div>
-  </td>
+      <div class="visible-xs-block">
+        <%= link_to '编辑', [:edit, :admins, post] %>
+      </div>
+    </td>
 <% end %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -8,8 +8,8 @@
 
     <%= SiteSetting.site_name %>
   </title>
-  <%= stylesheet_link_tag 'admins', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'admins', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag 'admins', media: 'all', 'data-turbolinks-track' => 'reload' %>
+  <%= javascript_include_tag 'admins', 'data-turbolinks-track' => 'reload' %>
   <%= csrf_meta_tags %>
   <meta name="robots" content="noindex, nofollow" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/app/views/layouts/admin_sessions.html.erb b/app/views/layouts/admin_sessions.html.erb
@@ -8,8 +8,8 @@
 
     <%= SiteSetting.site_name %>
   </title>
-  <%= stylesheet_link_tag 'admins', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'admins', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag 'admins', media: 'all', 'data-turbolinks-track' => 'reload' %>
+  <%= javascript_include_tag 'admins', 'data-turbolinks-track' => 'reload' %>
   <%= csrf_meta_tags %>
   <meta name="robots" content="noindex, nofollow" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/app/views/layouts/guest.html.erb b/app/views/layouts/guest.html.erb
@@ -4,23 +4,24 @@
   <meta charset="UTF-8">
   <title>
     <% if content_for?(:page_title) %>
-      <%= yield :page_title %> &laquo;
+        <%= yield :page_title %> &laquo;
     <% end %>
 
     <%= SiteSetting.site_name %>
   </title>
   <%= csrf_meta_tags %>
-  <%= stylesheet_link_tag 'guests', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'guests', 'data-turbolinks-track' => true %>
-  <%= auto_discovery_link_tag :rss, guests_feed_url, title: SiteSetting.site_name %>
   <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <%= stylesheet_link_tag 'guests', media: 'all', 'data-turbolinks-track' => 'reload' %>
+  <%= javascript_include_tag 'guests', 'data-turbolinks-track' => 'reload' %>
+  <%= auto_discovery_link_tag :rss, guests_feed_url, title: SiteSetting.site_name %>
 </head>
 <body>
-  <div class="container">
-    <div class="clearfix">
-      <nav class="pull-left"><%= render partial: 'navigator/guest_navbar' %></nav>
-      <main class="pull-right"><%= yield %></main>
-    </div>
+<div class="container">
+  <div class="clearfix">
+    <nav class="pull-left"><%= render partial: 'navigator/guest_navbar' %></nav>
+    <main class="pull-right"><%= yield %></main>
   </div>
+</div>
 </body>
 </html>