1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-08 07:22:38 +00:00

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

This commit is contained in:
2015-05-05 12:39:15 +00:00
parent cf7b19838c
commit 89e6a81bd1
12 changed files with 35 additions and 23 deletions

View File

@@ -11,4 +11,7 @@
// about supported directives.
//
//= require_tree .
//= require jquery
//= require jquery_ujs
//= require dataTables/jquery.dataTables

View File

@@ -1,6 +1,4 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
jQuery ->
$('#matches').dataTable()
dJQueryUI: true

View File

@@ -1,6 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
jQuery ->
$('#tournaments').dataTable()
dJQueryUI: true

View File

@@ -12,4 +12,5 @@
*
*= require_tree .
*= require_self
*= require dataTables/jquery.dataTables
*/

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>

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 %>

View File

@@ -1,10 +1,15 @@
<h1>Pick A Tournament</h1>
<script>
$(document).ready(function() {
$('#tournamentList').dataTable();
} );
</script>
<% if user_signed_in? %>
<%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-default" %>
<% end %>
</br>
</br>
<table class="display compact cell-border" id="tournaments">
<table class="display compact cell-border" id="tournamentList">
<thead>
<tr>
<th>Name</th>

View File

@@ -1,10 +1,15 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %>
<script>
$(document).ready(function() {
$('#matchList').dataTable();
} );
</script>
<br>
<br>
<h3>Upcoming Matches</h3>
<br>
<br>
<table class="display compact cell-border" id="matches">
<table class="display compact cell-border" id="matchList">
<thead>
<tr>
<th>Round</th>