cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-29 10:25:32 +00:00
Code Issues Releases Wiki Activity

Moved jquery and datatables back to asset pipline. Log out now works

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-05-05 12:39:15 +00:00
parent cf7b19838c
commit 89e6a81bd1
12 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/layouts/_cdn.html.erb
View File

@@ -1,17 +1,12 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<!-- Bootstrap CDN -->
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.6/css/jquery.dataTables.min.css">
<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
<script src="https://cdn.datatables.net/1.10.6/js/jquery.dataTables.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.map"></script>
<!-- File saver does more than excel exports but that is currently what we are using it for -->
<script src="https://rawgithub.com/eligrey/FileSaver.js/master/FileSaver.js" type="text/javascript"></script>

2
app/views/layouts/_header.html.erb
View File

@@ -11,7 +11,7 @@
<li><%= link_to "Team Scores" , "/static_pages/team_scores?tournament=#{@tournament.id}" %></li>
<% end %>
<% if user_signed_in? %>
<li><%= link_to "Log Out", destroy_user_session_path, method: :delete %></li>
<li><%=link_to "Log out", destroy_user_session_url ,:method => 'delete' %></li>
<% else %>
<li><%= link_to "Log In" , new_user_session_path %></li>
<% end %>