summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-05-01 17:02:37 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-05-01 17:02:37 -0400
commit10c6417874129f03f3d2125c5df460865bad2797 (patch)
treee854d003119aaa00b19a78132e6cc137855a86cd
parent8c5772072066eb57cda4b0b8953aebe3af33ca2d (diff)
clean up grep-able issues in forms (mostly using <p> instead of <div>)
-rw-r--r--app/views/common/_show_tournament.html.erb10
-rw-r--r--app/views/pms/show.html.erb76
-rw-r--r--app/views/sessions/new.html.erb12
-rw-r--r--app/views/tournaments/_form.html.erb12
-rw-r--r--app/views/tournaments/show.html.erb2
-rw-r--r--app/views/users/new.html.erb54
-rw-r--r--app/views/users/show.html.erb61
7 files changed, 111 insertions, 116 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/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/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 97f09b6..10adced 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -9,17 +9,17 @@
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 93badeb..72e0886 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -7,8 +7,8 @@
<%= f.select(:game_id, Game.all.map{|game| [game.name, game.id]}) %>
</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 %>">
+ <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") %>
@@ -98,12 +98,12 @@
<fieldset>
<legend>Stage <%= i %></legend>
<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]}) %>
+ <%= 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]}) %>
+ <%= 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 %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 6cb9783..07c1c6b 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -74,7 +74,7 @@
<% end %>
</div>
-<div class="tournament_actions">
+<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", role: :button) do %>
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 %>