diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/new.html.erb | 54 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 61 |
2 files changed, 57 insertions, 58 deletions
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 %> |