Commit 0254a67
Changed files (5)
app
assets
javascripts
views
layouts
config
locales
app/assets/javascripts/application.js
@@ -11,11 +11,18 @@
// about supported directives.
//
//= require jquery
+//= require jquery.turbolinks
//= require jquery_ujs
//= require foundation
-//= require turbolinks
//= require ractive
//= require_self
//= require_tree .
+//= require turbolinks
+$(document).on('page:fetch', function() {
+ $(".loading-indicator").show();
+});
+$(document).on('page:change', function() {
+ $(".loading-indicator").hide();
+});
var Stronglifters = Stronglifters || {};
app/views/layouts/application.html.erb
@@ -24,7 +24,7 @@
<!-- Navigation -->
<div class="row">
<div class="large-12 columns">
- <nav class="top-bar" data-topbar data-no-turbolink role="navigation">
+ <nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<!-- Title Area -->
<li class="name">
@@ -83,6 +83,11 @@
</div>
<!-- End Navigation -->
<!-- START CONTENT -->
+ <div class="row loading-indicator hide">
+ <div class="large-12 columns small-text-center">
+ <p><i class="fa fa-spinner fa-pulse"></i> <%= t('.loading') %></p>
+ </div>
+ </div>
<%= yield %>
<!-- END CONTENT -->
<!-- Footer -->
config/locales/en.yml
@@ -20,6 +20,9 @@
# available at http://guides.rubyonrails.org/i18n.html.
en:
+ layouts:
+ application:
+ loading: "Loading..."
nav:
user:
training_sessions: "Training sessions"
Gemfile
@@ -17,6 +17,7 @@ gem 'therubyracer', platforms: :ruby
# Use jquery as the JavaScript library
gem 'jquery-rails'
+gem 'jquery-turbolinks'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Gemfile.lock
@@ -185,6 +185,9 @@ GEM
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
+ jquery-turbolinks (2.1.0)
+ railties (>= 3.1.0)
+ turbolinks
json (1.8.3)
libv8 (3.16.14.13)
loofah (2.0.3)
@@ -412,6 +415,7 @@ DEPENDENCIES
i18n-tasks
jbuilder (~> 2.0)
jquery-rails
+ jquery-turbolinks
meta_request
pg
poltergeist