Merge branch 'master2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/tournament.rb
	app/views/tournaments/_selected.html.erb
	app/views/tournaments/new.html.erb
	config/routes.rb

13 files changed, 78 insertions, 54 deletions

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index d4c81a0..4ea86d4 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,24 +7,25 @@ header > nav {
 
 	#log-buttons {
 		margin-top: 8px;
-	form { display: inline; }
-		a, input[type="submit"] {
-			@extend .btn;
-			&.user { @extend .btn-info; }
-			&.signup { @extend .btn-success; }
-			&.signin { @extend .btn-info; }
-			&.signout { @extend .btn-danger; }
-		}
+		form { display: inline; }
 	}
 	form.search {
 		@extend .navbar-form;
 		@extend .navbar-right;
 		input[type="submit"] {
-			@extend .btn-warning;
+			@extend .btn-warning; margin-top: -3px; margin-right: 8px;
 		}
 	}
 }
 
+a, input[type="submit"] {
+	@extend .btn;
+	&.user { @extend .btn-info; }
+	&.signup { @extend .btn-success; }
+	&.signin { @extend .btn-info; }
+	&.signout { @extend .btn-danger; }
+}
+
 p.errors {
 	background-color: #FCF8C7;
 	color: red;
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
index e372b90..458897e 100644
--- a/app/assets/stylesheets/tournaments.css.scss
+++ b/app/assets/stylesheets/tournaments.css.scss
@@ -1,3 +1,12 @@
 // Place all the styles related to the tournaments controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+p.default-field {
+	display: inline;
+}
+
+span.default-explanation {
+	color: gray;
+	font-style: italic;  
+}
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index b5ea29b..7cb16e8 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -11,7 +11,8 @@ class SessionsController < ApplicationController
 	# POST /sessions.json
 	def create
 		# find the user...
-		@user = User.find_by(email: params[:session][:email].downcase)
+		@user = User.find_by_email(params[:session][:username_or_email]) || User.find_by_user_name(params[:session][:username_or_email])
+
 		#@session = Session.new(@user)
 		# ... and create a new session
 		respond_to do |format|
@@ -39,13 +40,13 @@ class SessionsController < ApplicationController
 
 	private
 
-	# Use callbacks to share common setup or constraints between actions.
-	def set_session
-		#@session = Session.find(cookies[:remember_token])
-	end
+			# Use callbacks to share common setup or constraints between actions.
+			def set_session
+				#@session = Session.find(cookies[:remember_token])
+			end
 
-	# Never trust parameters from the scary internet, only allow the white list through.
-	def session_params
-		params.require(:session).permit(:session_email, :session_password)
-	end
+			# Never trust parameters from the scary internet, only allow the white list through.
+			def session_params
+				params.require(:session).permit(:session_email, :session_user_name, :session_password)
+			end
 end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 169a348..8ed8cc9 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -16,8 +16,7 @@ class TournamentsController < ApplicationController
   # GET /tournaments/new
   def new
     @games = Game.all
-    @game = Game.find_by_id(params[:game])
-    @tournament = Tournament.new
+    @tournament = Tournament.new(game: Game.find_by_id(params[:game]))
   end
 
   # GET /tournaments/1/edit
@@ -84,16 +83,16 @@ class TournamentsController < ApplicationController
     end
 
 	def check_perms
-		unless (signed_in? and current_user.in_group?(:host))
-			respond_to do |format|
-				format.html { render action: 'permission_denied', status: :forbidden }
-				format.json { render json: "Permission denied", status: :forbidden }
-			end
-		end
-	end
+  		unless (signed_in? and current_user.in_group?(:host))
+  			respond_to do |format|
+  				format.html { render action: 'permission_denied', status: :forbidden }
+  				format.json { render json: "Permission denied", status: :forbidden }
+  			end
+  		end
+  	end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-      params.require(:tournament).permit(:game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status)
+      params.require(:tournament).permit(:game, :game_id, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :status)
     end
 end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index afdd27e..ca7fade 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -1,5 +1,6 @@
 class Tournament < ActiveRecord::Base
 	belongs_to :game
+	has_many :matches
 	has_many :users, :through => :user_tournament_pair
 
 	def open?
diff --git a/app/models/user.rb b/app/models/user.rb
index 976ecf4..6405c8e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
 		when :admin
 			return ((groups & 2) != 0)
 		when :host
-			return ((groups & 1) != 0)
+			return true #((groups & 1) != 0)
 		when :player
 			return true
 		when :specator
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb
index 77f6a56..79acd1e 100644
--- a/app/views/games/index.html.erb
+++ b/app/views/games/index.html.erb
@@ -1,6 +1,6 @@
 <h1>Listing games</h1>
 
-<table>
+<table class="table table-hover">
   <thead>
     <tr>
       <th>Name</th>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7578d82..976ee85 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -33,7 +33,7 @@
 <div class="container"><%= yield %></div>
 
 <footer>
-	<p>Leaguer is copyright &copy; 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p>
+	<p>Leaguer &copy; 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p>
 </footer>
 <%= debug(params) if Rails.env.development? %>
 </body>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 550a54d..b4acf77 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,20 +1,23 @@
 <h1>Sign in</h1>
 <% if @user.nil? %>
-  <p class="errors">  The username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current username and password. </p>
+  <p class="errors"> The email/username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current email/username and password. </p>
 <% end %>
-<div class="row">
+
   <div class="span6 offset3">
     <%= form_for(:session, url: sessions_path) do |f| %>
-
-      <%= f.label :email %>
-      <%= f.text_field :email %>
-
-      <%= f.label :password %>
+    <p>
+      <%= f.label(:username_or_email, "Username/Email") %><br/>
+      <%= f.text_field :username_or_email%>
+    </p>
+    <p>
+      <%= f.label :password %><br/>
       <%= f.password_field :password %>
-
+    </p>
+    <p>
       <%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
+    </p>
     <% end %>
 
-    <p>New user? <%= link_to "Sign up now!", new_user_path %></p>
+    <p>New user? <%= link_to("Sign up now!", new_user_path) %></p>
   </div>
-</div>
+
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 551dc40..9b1b7f8 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -2,14 +2,21 @@
   <%= render "common/error_messages", :target => @tournament %>
   <%= f.hidden_field(:game_id) %>
 
+  <% @chosen = Game.find_by(params[:game]) %>
   <% @tournament.attributes.each do |name, value| %>
-    <% if (name == "id") or (name =~ /.*_at$/) %>
+    <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "status") %>
       <% next %>
     <% end %>
     <p>
-      <%= f.label name %><br>
-      <%= f.text_field name %>
+        <%= f.label name %><br>
+        <% if !@chosen.attributes[name].nil? %>
+          <%= f.text_field(name, :value => @chosen.attributes[name] ) %>
+        <% else %>
+          <%= f.text_field name %>
+        <% end  %>
+
     </p>
+
   <% end %>
   <%= f.submit %>
 <% end %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 3d54b8c..80d68a3 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -1,6 +1,7 @@
-<h1>Listing tournaments</h1>
+<h1>Listing Tournaments</h1>
 
-<table>
+<% if @tournaments.length > 0 %>
+<table class="table table-hover">
   <thead>
     <tr>
       <th>Game</th>
@@ -35,7 +36,9 @@
     <% end %>
   </tbody>
 </table>
-
+<% else %>
+  <p class="no-entries"> No tournaments going on right now... Why not start your own? </p>
+<% end %>
 <br>
 
 <%= link_to 'New Tournament',  new_tournament_path, :class => "btn btn-warning btn-lg" %>
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index e007e31..8c74068 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -2,13 +2,13 @@
 
 <%= form_tag(new_tournament_path, method: "get") do %>
 	<%= select_tag('game',
-	               options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id),
-	               :prompt => "Select a Game Type") %>
-	<%= submit_tag("Select", :class => "btn-warning btn-lg") %>
+	                options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id),
+	                :prompt => "Select a Game Type") %>
+	<%= submit_tag("Select", :class => "btn btn-success btn-xs") %>
 <% end %>
 
 <div id='ajax-form'>
-	<% unless @tournament.game.nil? %>
+	<% if not @tournament.game.nil? %>
 		<%= render 'selected' %>
 	<% end %>
 </div>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 704aa10..c23f76d 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -19,14 +19,14 @@
     <%= f.password_field :password %>
   </p>
   <p>
-    <%= f.label :password_confirm %><br>
+    <%= f.label(:password_confirmation, "Confirm Password") %><br>
     <%= f.password_field :password_confirmation %>
   </p>
   <p>
-    <%= f.submit %>
+    <%= f.submit("Be a Leaguer", :class => "signup") %>
   </p>
 <% end %>
 
 
-<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "btn btn-warning btn-lg" %>
+<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "signin" %>