Commit 7d5da75

mo khan <mo@mokhan.ca>
2015-05-31 15:20:37
ensure chartkick is loaded for public and private pages.
master
1 parent 81e4c3a
Changed files (2)
app
views
layouts
application.html.erb
profiles
show.html.erb
app/views/layouts/application.html.erb
@@ -7,6 +7,7 @@
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= javascript_include_tag "application" %>
+    <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
     <script type="text/javascript" charset="utf-8">
       $(function(){ $(document).foundation(); });
     </script>
@@ -67,6 +68,7 @@
                     <a href="#"><%= gravatar_for(@current_user, size: 16) %> <%= @current_user.username %></a>
                     <ul class="dropdown">
                       <li><%= link_to "Training Sessions", training_sessions_path %></li>
+                      <li><%= link_to "My Public Profile", profile_path(@current_user) %></li>
                       <li class="divider"></li>
                       <li><%= link_to "Log Out", session_path('me'), method: :delete %></li>
                     </ul>
app/views/profiles/show.html.erb
@@ -29,8 +29,8 @@
 
     <h2>Training History</h2>
     <% @program.exercises.uniq.each do |exercise| %>
-      <p><%= exercise.name %></p>
       <%= line_chart @user.history_for(exercise) %>
+      <p><%= exercise.name %></p>
     <% end %>
   </div>
   <div class="small-2 columns">