Commit 55e16a1e

mo khan <mo@mokhan.ca>
2014-09-07 16:24:26
bring back turbolinks.
1 parent 2e4be55
app/assets/javascripts/application.js
@@ -13,6 +13,7 @@
 //= require jquery
 //= require jquery-migrate
 //= require jquery_ujs
+//= require turbolinks
 //= require jquery.ui.all
 //= require jquery.validate
 //= require jquery.embedly
@@ -28,4 +29,6 @@
 //= require backbone-model-file-upload
 //= require_tree .
 
-$('.tooltip-item').tooltip();
+$(document).on("page:load", function() {
+  $('.tooltip-item').tooltip();
+});
app/views/layouts/_header.html.erb
@@ -29,7 +29,7 @@
               <%= avatar_for(current_user, size: 24) %> <%= current_user.name %>
             <% end %>
           </li>
-          <li class="dropdown">
+          <li class="dropdown" data-no-turbolink>
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
               <i class="fa fa-plus"></i> <b class="caret"></b>
             </a>
app/views/layouts/application.html.erb
@@ -7,7 +7,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 <meta name="google-site-verification" content="X9sZ3dovM2s1pJg68Bb0q1oRqqiJYdzAwGeaGlOy6PM" />
 <meta name="description" content="<%= yield(:description) %>" />
-<%= stylesheet_link_tag "application", media: "all" %>
+<%= stylesheet_link_tag "application", media: "all", 'data-turbolinks-track' => true %>
 <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
 <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 <%= favicon_link_tag 'favicon.ico' %>
@@ -24,7 +24,7 @@
   <%= yield %>
 </div> <!-- /container -->
 <%= render "layouts/footer" %>
-<%= javascript_include_tag "application" %>
+<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
 <!--[if lt IE 9]>
   <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
app/views/my/dashboard/_comment.html.erb
@@ -1,5 +1,5 @@
 <div>
-  <i class="icon-comment icon-large"></i>
+  <i class="fa fa-comment fa-large"></i>
   <%= avatar_for(subject.user, size: 24) %> 
   <%= link_to subject.user.name, profile_path(subject.user) %> commented on <%= link_to subject.creation.name, my_root_path(anchor: "cakes/#{subject.creation.id}") %>
   <small><%= time_ago_in_words(subject.created_at) %> ago.</small>
app/views/my/dashboard/_creation.html.erb
@@ -7,10 +7,10 @@
     <%= item.story %>
     <p>
     <%= link_to my_root_path(anchor: "cakes/#{item.id}/edit") do %>
-      <i class="icon-edit"> edit</i>
+      <i class="fa fa-pencil-square-o"></i> edit
     <% end %>
     <%= link_to creation_favorites_path(:creation_id => item.id) do %>
-      <i class="icon-heart"> fanclub </i>
+      <i class="fa fa-heart"></i> fanclub
     <% end %>
     </p>
   </div>
app/views/my/dashboard/_favorite.html.erb
@@ -1,6 +1,6 @@
 <div>
   <p>
-  <i class="icon-heart icon-large"></i>
+  <i class="fa fa-heart fa-large"></i>
   <%= avatar_for(subject.user, size: 24) %> 
   <%= link_to subject.user.name, profile_path(subject.user) %> added 
   <%= link_to subject.creation.name, my_root_path(anchor: "cakes/#{subject.creation.id}") %> to their favorites
app/views/my/shared/_my_nav.html.erb
@@ -2,7 +2,7 @@
   <%= link_to edit_my_avatar_path(current_user), 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_root_path %></li>
     <!--
Gemfile
@@ -5,6 +5,7 @@ gem 'sass-rails', '~> 4.0.3'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
+gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
Gemfile.lock
@@ -300,6 +300,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    turbolinks (2.3.0)
+      coffee-rails
     twitter (5.9.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -387,6 +389,7 @@ DEPENDENCIES
   spring
   sqlite3
   teaspoon
+  turbolinks
   twitter (~> 5.9.0)
   uglifier (>= 1.3.0)
   unf