From cd54af413c57581f35026f60dc24e4bc21bb0bd1 Mon Sep 17 00:00:00 2001
From: tkimia
Date: Tue, 22 Apr 2014 18:25:02 -0400
Subject: footer is ok?
---
app/assets/stylesheets/application.css | 7 -------
app/assets/stylesheets/scaffolds.css.scss | 13 +++++++------
app/assets/stylesheets/static.css.scss | 3 ++-
app/views/search/go.html.erb | 5 +++--
4 files changed, 12 insertions(+), 16 deletions(-)
(limited to 'app')
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index ebb963c..677791c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -22,10 +22,3 @@
padding: 0px 5px;
}
-footer {
- clear: both;
- margin: 0 auto;
- margin-top: 10px;
- color: white;
- width: 90%;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 509cb19..e8fe9c5 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -19,7 +19,7 @@ body {
height: 100%;
}
-h1, h2, h3, h4, h5, p{
+h1, h2, h3, h4, h5, p, li{
color: $orange;
}
@@ -96,20 +96,21 @@ div {
.wrapper {
width: 80%;
- margin: 0 auto;
margin-top: 10px;
+ min-height: 80%;
+ height: auto !important;
+ height: 99%;
+ margin: 0 auto;
}
button, input[type="submit"] {
@extend .btn;
}
-
-
footer {
clear: both;
border-top: solid 1px $orange;
- padding-top: 10px;
text-align: center;
- bottom: 0;
+ margin: 0 auto;
+ width: 90%;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
index 14443f3..6732370 100644
--- a/app/assets/stylesheets/static.css.scss
+++ b/app/assets/stylesheets/static.css.scss
@@ -5,7 +5,8 @@
.jumbotron {
background-color: #FFF;
box-shadow: 1px 1px 20px black;
-
+ width: 93%;
+
p {
line-height: 1.5em;
}
diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb
index 6d5826f..324fa48 100644
--- a/app/views/search/go.html.erb
+++ b/app/views/search/go.html.erb
@@ -1,10 +1,11 @@
<%# Show search results if a query was not nill %>
<% if !@query.empty? %>
- Showing results for: <%= @query %>
+
<% if @tournaments.empty? and @players.empty? %>
- No results found for "<%= @query %>"
+ No results found for "<%= @query %>"
<% else %>
+ Showing results for: <%= @query %>
<% if @tournaments.length > 0 %>
Tournaments
<% end %>
--
cgit v1.2.3-54-g00ecf
From b7cbf3df615575fe1d24a9ea1ddfded094ae529f Mon Sep 17 00:00:00 2001
From: AndrewMurrell
Date: Tue, 22 Apr 2014 18:27:30 -0400
Subject: Added images for League and chess, need copyright notice for league
and copyleft notice for chess.
---
app/assets/images/ChessBlackKnightIcon.png | Bin 0 -> 893 bytes
app/assets/images/LOLG_icon_large.gif | Bin 0 -> 8207 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 app/assets/images/ChessBlackKnightIcon.png
create mode 100644 app/assets/images/LOLG_icon_large.gif
(limited to 'app')
diff --git a/app/assets/images/ChessBlackKnightIcon.png b/app/assets/images/ChessBlackKnightIcon.png
new file mode 100644
index 0000000..6bcffe6
Binary files /dev/null and b/app/assets/images/ChessBlackKnightIcon.png differ
diff --git a/app/assets/images/LOLG_icon_large.gif b/app/assets/images/LOLG_icon_large.gif
new file mode 100644
index 0000000..1f0fa43
Binary files /dev/null and b/app/assets/images/LOLG_icon_large.gif differ
--
cgit v1.2.3-54-g00ecf
From b4bc055585dee532653a8c64e45385e085ec22a8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Tue, 22 Apr 2014 18:29:17 -0400
Subject: I hate code
---
app/controllers/matches_controller.rb | 11 +++--------
app/controllers/tournaments_controller.rb | 25 ++++++++++++++++---------
app/models/tournament_stage.rb | 4 ++--
app/views/matches/index.html.erb | 2 +-
app/views/matches/show.html.erb | 4 ----
lib/scheduling/elimination.rb | 14 ++++++++------
6 files changed, 30 insertions(+), 30 deletions(-)
(limited to 'app')
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 59f376a..b50aca5 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -1,6 +1,4 @@
class MatchesController < ApplicationController
- before_action :set_tournament, only: [:index, :update]
-
require 'httparty'
require 'json'
require 'delayed_job'
@@ -118,7 +116,7 @@ class MatchesController < ApplicationController
# GET /tournaments/1/matches/1
# GET /tournaments/1/matches/1.json
def show
- if Tournament.find_by_id(@match.tournament_id).game_id == 1
+ if @match.tournament_stage.tournament.game_id == 1
file_blue = "blue.yaml"
file_purple = "purple.yaml"
@blue2 = YAML.load_file(file_blue)
@@ -235,11 +233,8 @@ class MatchesController < ApplicationController
private
# Use callbacks to share common setup or constraints between actions.
def set_match
- set_tournament
- @match = @tournament.matches.find(params[:id])
- end
- def set_tournament
- @tournament = Tournament.find(params[:tournament_id])
+ @match = Match.find(params[:id])
+ @tournament = @match.tournament_stage.tournament
end
# Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 4b0e1af..03dc5b8 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -95,17 +95,24 @@ class TournamentsController < ApplicationController
end
when "start"
check_permission(:edit, @tournament)
- @tournament.status = 1
- ok =
- @tournament.save &&
- @tournament.tournament_stages.create(scheduling: "elimination") &&
- @tournament.tournament_stages.first.create_matches
respond_to do |format|
- if ok
- format.html { redirect_to @tournament, notice: 'You have started this tournament.' }
- format.json { head :no_content }
+ if @tournament.status == 0
+ @tournament.status = 1
+ success = true
+ ActiveRecord::Base.transaction do
+ success &= @tournament.save &&
+ success &= @tournament.tournament_stages.create(scheduling: "elimination")
+ success &= @tournament.tournament_stages.first.create_matches
+ end
+ if success
+ format.html { redirect_to @tournament, notice: 'You have started this tournament.' }
+ format.json { head :no_content }
+ else
+ format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." }
+ format.json { render json: "Permission denied", status: :forbidden }
+ end
else
- format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." }
+ format.html { redirect_to @tournament, notice: "This tournament is not in a state that it can be started." }
format.json { render json: "Permission denied", status: :forbidden }
end
end
diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb
index 9fa6dcd..762f6a7 100644
--- a/app/models/tournament_stage.rb
+++ b/app/models/tournament_stage.rb
@@ -17,9 +17,9 @@ class TournamentStage < ActiveRecord::Base
@scheduling.create_matches
end
- def to_svg
+ def to_svg(current_user)
set_scheduling
- return @scheduling.graph
+ return @scheduling.graph(current_user)
end
private
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 058477a..fda8582 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -37,5 +37,5 @@
<% @tournament.stages_ordered.keys.sort.each do |stage_key| %>
- <%= raw @tournament.stages_ordered[stage_key].to_svg %>
+ <%= raw @tournament.stages_ordered[stage_key].to_svg(current_user) %>
<% end %>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index e7fe791..a1d82a3 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -7,10 +7,6 @@
<%= @match.tournament_stage %>
-
- Name:
- <%= @match.name %>
-