diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/common/_show_tournament.html.erb | 10 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 74 | ||||
| -rw-r--r-- | app/views/main/homepage.html.erb | 31 | ||||
| -rw-r--r-- | app/views/pms/show.html.erb | 76 | ||||
| -rw-r--r-- | app/views/servers/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/sessions/new.html.erb | 14 | ||||
| -rw-r--r-- | app/views/tournaments/_form.html.erb | 43 | ||||
| -rw-r--r-- | app/views/tournaments/show.html.erb | 27 | ||||
| -rw-r--r-- | app/views/users/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/new.html.erb | 54 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 61 |
11 files changed, 198 insertions, 196 deletions
diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index c0237b1..87a4f5b 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -24,22 +24,20 @@ <div class="col-md-2 col-sm-2 col-xs-2"> <% if signed_in? %> <% if !target.players.include?(current_user) && target.status == 0 %> - <%= form_tag(tournament_path(target), method: "put") do %> - <p> + <%= form_tag(tournament_path(target), method: "put", role: :button) do %> <input type="hidden" name="update_action" value="join"> <%= submit_tag("Join")%> - <% end %> - </p> + <% end %> <% elsif target.players.include?(current_user)%> <p class="message">You've signed up for this tournament!</p> <% end %> <% @user_bracket = target.brackets.find_by(user: current_user) %> <% if target.status == 1 && target.stages.order(:id).first.scheduling_method == "elimination" && target.stages.order(:id).first.matches.order(:id).first.status < 2 && !@user_bracket %> - <%= form_tag(tournament_brackets_path(target), method: "post") do %> + <%= form_tag(tournament_brackets_path(target), method: "post", role: :button) do %> <%= submit_tag("Make Bracket") %> <% end %> <% elsif @user_bracket && target.status == 4 %> - <%= form_tag(tournament_bracket_path(@tournament, @bracket), method: 'put') do %> + <%= form_tag(tournament_bracket_path(@tournament, @bracket), method: 'put', role: :button) do %> <input type="hidden" name="update_action" value="results"> <%= submit_tag("Bracket Results") %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index af26e29..92ca6ad 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,10 +1,9 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <title>Leaguer</title> <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= stylesheet_link_tag "#{params[:controller]}", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> <%= javascript_include_tag "#{params[:controller]}", "data-turbolinks-track" => true %> @@ -16,42 +15,51 @@ <body> <header> <nav> - <%# This is the logo %> - <div class="navbar-brand"><%= link_to('Leaguer', root_path) %></div> - - <%# This is the search bar #%> - <div> - <%= form_tag("/search", method: "get", :class => "search") do %> - <%= text_field_tag(:query, params[:query], type: "search") %> - <%= submit_tag("Search", :name=>nil) %> - <% end %> - </div> - - <%# these are the log in buttons #%> - <div id="log-buttons"> - <% if signed_in? %> - <%= link_to current_user.user_name, current_user, :class => "user" %> - <%= link_to "Messages", pms_path, :class => "signup" %> - <% if current_user.can? :edit_server %> - <%= link_to "Server settings", edit_server_path, :class => "server" %> - <% end %> - <% if current_user.can? :create_alert %> - <%= link_to "Create Alert", new_alert_path, :class => "create-alert" %> - <% end %> - <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> - <%# if there is an unread alert then I wanna be able to show the notification icon by saying :style => display:inline. This will be Done by Guntas once he figures out how to get unread alerts. Psuedo if alerts.unread > 0 then display else don't.%> - <%= link_to "", alerts_path, :class => "alerts", :id => "alerts-ajax"%> - <% else %> - <%= link_to "Log in", new_session_path, :class => "signin" %> - <%= link_to "Sign up", new_user_path, :class => "signup" %> - <% end %> - </div> + <div class="container-fluid"> + <div class="navbar-header"> + <%= link_to('Leaguer', root_path, class: "navbar-brand") %> + </div> + <div class="navbar-collapse"> + <div id="user-actions"> + <span> + <% if signed_in? %> + <%= link_to current_user.user_name, current_user, :class => "user", :role => :button %> + <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout", :role => :button %> + <% else %> + <%= link_to "Log in", new_session_path, :class => "signin", :role => :button %> + <%= link_to "Sign up", new_user_path, :class => "signup", :role => :button %> + <% end %> + </span> + <% if current_user.can? :create_alert %> + <span><%= link_to "Create Alert", new_alert_path, :class => "create-alert", :role => :button %></span> + <% end %> + </div> + <% if signed_in? %> + <ul> + <li><%= link_to "Messages", pms_path %></li> + <% if current_user.can? :edit_server %> + <li><%= link_to "Server settings", edit_server_path, :class => "server" %></li> + <% end %> + </ul> + <%# If there is an unread alert then I want to be able + to show the notification icon by saying :style => + display:inline. This will be Done by Guntas once + he figures out how to get unread alerts. Psuedo if + alerts.unread > 0 then display else don't.%> + <%= link_to "", alerts_path, :class => "alerts", :id => "alerts-ajax"%> + <% end %> + <%= form_tag("/search", method: :get, :id => "search") do %><div> + <%= text_field_tag(:query, params[:query], type: :search) %> + <%= submit_tag "Search" %> + </div><% end %> + </div> + </div> </nav> </header> <% if notice %><div id="notice"><p><%= notice %></p></div><% end %> -<div class="wrapper"> +<div class="container"> <%= yield %> </div> diff --git a/app/views/main/homepage.html.erb b/app/views/main/homepage.html.erb index 3ca8176..5acd4ae 100644 --- a/app/views/main/homepage.html.erb +++ b/app/views/main/homepage.html.erb @@ -1,18 +1,13 @@ -<div role="main" class="container theme-showcase"> - - <div class="jumbotron"> - <h1>Welcome to Leaguer</h1> - <p>This is a tournment management system designed to be used for any team sport. Our peer review system ensures that the best players move on to the next round! Try creating a new tournament and having people sign up for it. </p> - <p id="jumbo-buttons"> - <% if !signed_in? %> - <%= link_to 'Log In', new_session_path, :class => "btn btn-warning btn-lg", :role => "button" %> - <%= link_to 'Sign Up', new_user_path, :class => "btn btn-warning btn-lg", :role => "button" %> - <% else %> - <%= link_to 'Start a Tournament', new_tournament_path, :class => "btn btn-warning btn-lg", :role => "button" %> - <% end %> - <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %> - - </p> - </div> - - </div> +<div class="jumbotron"> + <h1>Welcome to Leaguer</h1> + <p>This is a tournment management system designed to be used for any team sport. Our peer review system ensures that the best players move on to the next round! Try creating a new tournament and having people sign up for it. </p> + <p id="jumbo-buttons"> + <% if !signed_in? %> + <%= link_to 'Log In', new_session_path, :class => "signin", :role => "button" %> + <%= link_to 'Sign Up', new_user_path, :class => "signup", :role => "button" %> + <% else %> + <%= link_to 'Start a Tournament', new_tournament_path, :role => "button" %> + <% end %> + <%= link_to 'See Ongoing Tournaments', tournaments_path, :role => "button" %> + </p> +</div> diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb index 2c93102..35deaa9 100644 --- a/app/views/pms/show.html.erb +++ b/app/views/pms/show.html.erb @@ -1,48 +1,46 @@ -<p> - <strong>Participants:</strong> - <% receps = @pm.conversation.participants %> - <% receps.each do |recep| %> - <% #unless recep == @pm.conversation.last_sender %> - <%= recep.user_name %> - <%= "," %> - <% #end %> - <% end %> - <%= "and the NSA" %> -</p> - -<p> - <strong>Subject:</strong> - <%= @pm.conversation.subject %> -</p> +<%= link_to '« Back to all private messages', pms_path, class: :breadcrumb %> + +<div> + <p> + <strong>Participants:</strong> + <% receps = @pm.conversation.participants %> + <% receps.each do |recep| %> + <% #unless recep == @pm.conversation.last_sender %> + <%= recep.user_name %>, + <% #end %> + <% end %> + <%= "and the NSA" %> + </p> + + <p> + <strong>Subject:</strong> + <%= @pm.conversation.subject %> + </p> +</div> <% receipts = @pm.conversation.receipts_for current_user %> <% receipts.each do |receipt| %> - <% message = receipt.message %> - - <p> ________________________________________________ </p> - - <p> - <b><%= message.sender.user_name %></b> - <%= ":" %> - <%= message.body %> - </p> - + <% message = receipt.message %> + <hr> + <p> + <strong><%= message.sender.user_name %>:</strong> + <%= message.body %> + </p> <% end %> -<p> ________________________________________________ </p> -<p> - <% @pm.message = "" %> - <%= form_for(@pm) do |f| %> - <div class="field"> - <%= f.text_area :message %> - </div> +<hr> - <div class="actions"> - <%= submit_tag("Reply", :class => "signup") %> - </div> +<div> + <% @pm.message = "" %> + <%= form_for(@pm) do |f| %> + <div class="field"> + <%= f.text_area :message %> + </div> - <% end %> -</p> + <div class="actions"> + <%= submit_tag("Reply", :class => "signup") %> + </div> + <% end %> +</div> <% @pm.conversation.mark_as_read(current_user) %> -<%= link_to 'Back', pms_path %> diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index fd887f3..22e3e82 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -6,7 +6,7 @@ <legend>Default permissions for new users</legend> <ul> <% @server.default_user_abilities.keys.each do |ability| %> - <li><label><%= a.check_box(ability) %> <%= ability.to_s.humanize %></label></li> + <li><%= a.check_box(ability) %> <%= a.label(ability) %></li> <% end %> </ul> </fieldset> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 97f09b6..1b60ca7 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -3,23 +3,23 @@ <div> <%= form_tag(sessions_path, method: :post, id: :new_session) do %> <% if params[:action] == "create" %> - <div id="error_explanation"> + <div class="alert-danger"> <p>The username/password pair you entered did not match our records. Check your typing and try again.</p> </div> <% end %> - <p> + <div class="field"> <%= label_tag(:username_or_email, "Username/Email") %><br/> <%= text_field_tag(:username_or_email) %> - </p> - <p> + </div> + <div class="field"> <%= label_tag(:password) %><br/> <%= password_field_tag(:password) %> - </p> - <p> + </div> + <div class="field"> <%= submit_tag("Log in", class: :signin) %> - </p> + </div> <% end %> <p>New user? <%= link_to("Sign up now!", new_user_path) %></p> diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index f53927d..72e0886 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -1,12 +1,20 @@ <%= render "common/error_messages", :target => @tournament %> <fieldset> - <legend>Game Type</legend> + <legend>Basic information</legend> <%= form_for(@tournament, url: new_tournament_path, method: "get") do |f| %> - <p> + <div class="field"> <%= f.label :game_id, "Select a Game Type" %> <%= f.select(:game_id, Game.all.map{|game| [game.name, game.id]}) %> - <%= f.submit("Select") %> - </p> + </div> + <div class="field"> + <label for="num_stages">Number of Tournament Stages</label> + <input type="number" id="num_stages" name="num_stages" min="1" value="<%= params[:num_stages].to_i %>"> + </div> + <% if @tournament.game %> + <%= f.submit("Update (Will reset the rest of the form)", class: "btn-danger") %> + <% else %> + <%= f.submit("Submit") %> + <% end %> <% end %> </fieldset> @@ -16,10 +24,10 @@ <legend>Attributes</legend> <%= f.hidden_field(:game_id) %> - <p> + <div class="field"> <%= f.label :name %> <%= f.text_field :name %> - </p> + </div> <table> <tbody> @@ -41,17 +49,17 @@ </tbody> </table> - <p> + <div class="field"> <%= f.label :scoring_method, :scoring_method.to_s.titleize %> <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize.titleize, method]}) %> - </p> + </div> </fieldset> <fieldset> <legend>Settings</legend> <%= f.fields_for :settings do |setting_fields| %> <% @tournament.tournament_settings.each do |setting| %> - <p> + <div class="field"> <%= setting_fields.label setting.name, setting.name.to_s.titleize %> <br> <% case setting.vartype %> @@ -77,7 +85,7 @@ <% when 5 %> <%= setting_fields.select( setting.name, setting.type_opt.split(',').collect {|opt| opt.humanize.titleize} ) %> <% end %> - </p> + </div> <% end %> <% end %> </fieldset> @@ -85,17 +93,18 @@ <%= f.fields_for :stages do |stages_fields| %> <fieldset> <legend>Stages</legend> - <label for="num_stages">Number of Tournament Stages</label> - <input type="number" name="num_stages" min="1" value="<%= params[:num_stages].to_i %>"> - <%# stage_fields.submit("Set Stages") %> <% for i in 1..(params[:num_stages].to_i) do %> <%= stages_fields.fields_for i.to_s do |stage_fields| %> <fieldset> <legend>Stage <%= i %></legend> - <%= stage_fields.label :scheduling_method, :scheduling_method.to_s.titleize %> - <%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize.titleize, method]}) %> - <%= stage_fields.label :seeding_method, :seeding_method.to_s.titleize %> - <%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize.titleize, method]}) %> + <div class="field"> + <%= stage_fields.label :scheduling_method, :scheduling_method.to_s.titleize %> + <%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize.titleize, method]}) %> + </div> + <div class="field"> + <%= stage_fields.label :seeding_method, :seeding_method.to_s.titleize %> + <%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize.titleize, method]}) %> + </div> </fieldset> <% end %> <% end %> diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 7e3fbae..07c1c6b 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -1,3 +1,5 @@ +<%= link_to '« Back to all tournaments', tournaments_path, class: :breadcrumb %> + <h2 id="tournament-name"> <%= @tournament.name %> </h2> @@ -72,33 +74,26 @@ <% end %> </div> -<div class="leave-buttons"> - <%# If user can join, and user hasn't joined already, show the join tournment tag %> +<div class="actions"> + <%# If user can join, and user hasn't joined already, show a join tournment button %> <% if @tournament.joinable_by?(current_user) && !@tournament.players.include?(current_user) %> - <%= form_tag(tournament_path(@tournament), method: "put") do %> + <%= form_tag(tournament_path(@tournament), method: "put", role: :button) do %> <input type="hidden" name="update_action" value="join"> <%= submit_tag("Join Tournament") %> <% end %> <% elsif @tournament.players.include?(current_user) %> - <%= form_tag(tournament_path(@tournament), method: "put") do %> + <%= form_tag(tournament_path(@tournament), method: "put", role: :button) do %> <input type="hidden" name="update_action" value="leave"> <%= submit_tag("Leave Tournament") %> <% end %> <% end %> - <%# If user is the host, let them start the tournment %> - <% if @tournament.hosts.include?(current_user) %> - <%= form_tag(tournament_path(@tournament), method: "put") do %> + <% if @tournament.check_permission(current_user, :edit) %> + <%= form_tag(tournament_path(@tournament), method: "put", role: :button) do %> <input type="hidden" name="update_action" value="start"> - <% if @tournament.players.count >= @tournament.min_players_per_team * @tournament.min_teams_per_match %> - <%= submit_tag("Start Tournament") %> - <% else %> - <%= submit_tag("Start Tournament", disabled: true) %> - <% end %> + <%= submit_tag("Start Tournament", disabled: (@tournament.players.count < @tournament.min_players_per_team * @tournament.min_teams_per_match)) %> <% end %> - <%= link_to 'Edit', edit_tournament_path(@tournament) %> | - <%= link_to 'Cancel Tournament', @tournament, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Edit Tournament', edit_tournament_path(@tournament), role: :button %> + <%= link_to 'Cancel Tournament', @tournament, method: :delete, data: { confirm: 'Are you sure?' }, role: :button %> <% end %> </div> - -<%= link_to 'Back', tournaments_path %> diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 1feebf8..23f8977 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -31,7 +31,7 @@ <ul> <%= fields_for "user[abilities]", @user.abilities do |abilities_fields| %> <% @user.abilities.keys.each do |ability| %> - <li><label><%= abilities_fields.check_box(ability) %> <%= ability.to_s.humanize %></label></li> + <li><%= abilities_fields.check_box(ability) %> <%= abilities_fields.label(ability) %></li> <% end %> <% end %> </ul> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 5c88945..95b56a9 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,34 +1,34 @@ <h1> Sign Up </h1> <%= form_for @user do |f| %> - <%= render "common/error_messages", :target => @user %> - <p> - <%= f.label :name %><br> - <%= f.text_field :name %> - </p> - <p> - <%= f.label :email %><br> - <%= f.text_field(:email, type: "email") %> - </p> - <p> - <%= f.label :user_name %><br> - <%= f.text_field :user_name %> - </p> - <p> - <%= f.label :password %><br> - <%= f.password_field :password %> - </p> - <p> - <%= f.label(:password_confirmation, "Confirm Password") %><br> - <%= f.password_field :password_confirmation %> - </p> - <p> - <%= show_simple_captcha %> - - <%= f.submit("Be a Leaguer", :class => "signup") %> - </p> + <%= render "common/error_messages", :target => @user %> + <div class="field"> + <%= f.label :name %><br> + <%= f.text_field :name %> + </div> + <div class="field"> + <%= f.label :email %><br> + <%= f.text_field(:email, type: "email") %> + </div> + <div class="field"> + <%= f.label :user_name %><br> + <%= f.text_field :user_name %> + </div> + <div class="field"> + <%= f.label :password %><br> + <%= f.password_field :password %> + </div> + <div class="field"> + <%= f.label(:password_confirmation, "Confirm Password") %><br> + <%= f.password_field :password_confirmation %> + </div> + <div class="field"> + <%= show_simple_captcha %> + </div> + <div class="actions"> + <%= f.submit("Be a Leaguer", :class => "signup") %> + </div> <% end %> - <%= link_to 'Already Have an Account? Log in', new_session_path, :class => "signin" %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b247b7d..cd232a3 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -2,56 +2,55 @@ <h1> <%= @user.user_name %>'s Profile </h1> <p> - <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=identicon' %> + <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=identicon' %> </p> <p> - <strong>Email:</strong> - <%= @user.email %> -</p> - + <strong>Name:</strong> + <%= @user.name %> <p> - <strong>Preferred name:</strong> - <%= @user.user_name %> -</p> <p> - <strong>Relationship Status:</strong> - too single + <strong>Alias:</strong> + <%= @user.user_name %> +<p> + <strong>Email:</strong> + <%= @user.email %> </p> - -<p> -<% if @user.remote_usernames[0].nil? %> +<% if @user.remote_usernames.empty? and @user.check_permission(current_user, :edit) %> <%= form_for @user do |f| %> - <label>Have a League of Legends Account? - <input type=text name="user[remote_usernames][League of Legends]"> - </label> - <%= f.submit "Add Username", :class => 'signup' %> + <div class="field"> + <label for="summoner_name">Have a League of Legends Account?</label> + <div class="simple-input-group"> + <input type="text" id="summoner_name" name="user[remote_usernames][League of Legends]"> + <%= f.submit "Add Username", :class => 'signup' %> + </div> + </div> <% end %> <% end %> -</p> - <div class="row"> <div class="col-md-6"> - <h3> Recent Tournaments Played </h3> + <h3>Recent Tournaments Played</h3> <ul> <% @user.tournaments_played.each do |t| %> <li><%= t.name %></li> <% end %> </ul> - </div> - <div class="col-md-6"> - <h3> Recent Tournaments Hosted </h3> - <% if @user.tournaments_hosted.count == 0 %> <p> <%= @user.user_name %> has never hosted a tournament </p> <%end %> - <ul> - <% @user.tournaments_hosted.each do |t| %> - <li><%= t.name %></li> - <% end %> - </ul> + </div> + <div class="col-md-6"> + <h3>Recent Tournaments Hosted</h3> + <% if @user.tournaments_hosted.empty? %> + <p><%= @user.user_name %> has never hosted a tournament.</p> + <% else %> + <ul> + <% @user.tournaments_hosted.each do |t| %> + <li><%= t.name %></li> + <% end %> + </ul> + <% end %> </div> </div> -<%= link_to 'Edit', edit_user_path(@user) %> | -<%= link_to 'All Users', users_path %> +<%= link_to 'Edit', edit_user_path(@user), role: :button %> |