Commit ada782a

mo khan <mo@mokhan.ca>
2017-02-12 00:30:14
extract footer.
master
1 parent 18ff456
Changed files (5)
app
views
application
_footer.html.erb
_loading.html.erb
layouts
application.html.erb
public.html.erb
config
locales
en.yml
app/views/application/_footer.html.erb
@@ -0,0 +1,12 @@
+<footer class="footer">
+  <div class="container">
+    <div class="content has-text-centered">
+      <p><%= t("footer.copyright") %></p>
+      <p>
+      <a class="icon" href="https://github.com/stronglifters">
+        <i class="fa fa-github"></i>
+      </a>
+      </p>
+    </div>
+  </div>
+</footer>
app/views/application/_loading.html.erb
@@ -0,0 +1,9 @@
+<div class="container">
+  <div class="columns">
+    <div class="column is-2 is-offset-5">
+      <div class="align-middle loading-indicator" style="display:none;">
+        <p><i class="fa fa-spinner fa-pulse"></i> <%= t('.loading') %></p>
+      </div>
+    </div>
+  </div>
+</div>
app/views/layouts/application.html.erb
@@ -16,27 +16,8 @@
     <%= render partial: "navigation" %>
     <%= render partial: 'layouts/flash' %>
 
-    <div class="container">
-      <div class="columns">
-        <div class="column is-2 is-offset-5">
-          <div class="align-middle loading-indicator hide">
-            <p><i class="fa fa-spinner fa-pulse"></i> <%= t('.loading') %></p>
-          </div>
-        </div>
-      </div>
-    </div>
     <%= yield %>
-    <footer class="footer">
-      <div class="container">
-        <div class="content has-text-centered">
-          <p><%= t("footer.copyright") %></p>
-          <p>
-            <a class="icon" href="https://github.com/stronglifters">
-              <i class="fa fa-github"></i>
-            </a>
-          </p>
-        </div>
-      </div>
-    </footer>
+    <%= render partial: 'loading' %>
+    <%= render partial: 'footer' %>
   </body>
 </html>
app/views/layouts/public.html.erb
@@ -5,9 +5,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%= content_for?(:title) ? yield(:title) : "Strong Lifters" %></title>
-
-    <%= stylesheet_link_tag :application %>
     <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag :application %>
+    <%= javascript_include_tag :application %>
+    <script type="text/javascript" charset="utf-8">
+      <%= content_for :javascript %>
+    </script>
   </head>
   <body class="<%= controller_name %> <%= action_name %>">
     <header>
@@ -19,9 +22,5 @@
     </header>
     <%= render partial: 'layouts/flash' %>
     <%= yield %>
-    <%= javascript_include_tag :application %>
-    <script type="text/javascript" charset="utf-8">
-      <%= content_for :javascript %>
-    </script>
   </body>
 </html>
config/locales/en.yml
@@ -45,6 +45,8 @@ en:
     navigation:
       home: Home
       profile: Profile
+    footer:
+      copyright: "© Copyright www.stronglifters.com. All rights reserved."
   time:
     formats:
       short: "%a, %d %b %Y"
@@ -117,8 +119,6 @@ en:
       lead: Your custom email address.
       title: Send-to-Stronglifters.
       warning: To ensure your workouts are imported correctly we suggest that you update your timezone.
-  footer:
-    copyright: "© Copyright www.stronglifters.com. All rights reserved."
   views:
     pagination:
       first: "&laquo; First"