Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

a TON of bugfixes and new features

Browse Source
This commit is contained in:
jomo
2014-04-28 03:01:33 +02:00
parent a6ba503e73
commit 65f5adf65d
59 changed files with 1023 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/users/change_password.html.erb
View File

@@ -1,13 +1,8 @@
<h1>Change password</h1>
<%= simple_form_for @user do |f| %>
<div id="form_labels">
</div>
<div id="form_inputs">
<%= f.input :current_password, :label => false %>
<%= f.input :email, :label => false %>
<%= f.input :password, :label => false %>
<%= f.input :password_confirmation, :label => false %>
</div>
<%= form_for @user do |f| %>
<%= f.text_field :current_password %>
<%= f.text_field :email %>
<%= f.text_field :password %>
<%= f.text_field :password_confirmation %>
<% end %>

41
app/views/users/edit.html.erb
View File

@@ -1,34 +1,27 @@
<% def can_edit?; (@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role); end %>
<%
def can_edit?
(@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)
end
%>
<%= link_to (@user.is?(current_user) ? "Your profile" : @user.name), current_user %> → Edit
<h1>Edit profile</h1>
<%= simple_form_for @user do |f| %>
<%= form_for @user do |f| %>
<table>
<tbody>
<tr>
<td></td>
<td><%= image_tag @user.avatar_url(128), :class => "user-avatar avatar", :alt => "avatar" %></td>
</tr>
<tr>
<td>Display name</td>
<td>
<%= f.input :name, :label => false, disabled: !can_edit? %>
<%= f.text_field :name, disabled: !can_edit? %>
</td>
</tr>
<% if mod? %>
<tr>
<td>In-game name</td>
<td>
<%= f.input :ign, :label => false, disabled: !(mod? && current_user.role >= @user.role) %>
</td>
</tr>
<tr>
<td>Role</td>
<td>
<% if mod? && current_user.role >= @user.role %>
<%= f.association :role, :label => false, :collection => Role.all_to(current_user.role), :include_blank => false %>
<% else %>
<%= f.input :role, label: false, disabled: true %>
<%= f.select :role, Role.all_to(current_user.role) %>
<% end %>
</td>
</tr>
@@ -36,36 +29,39 @@
<tr>
<td>Skype username</td>
<td>
<%= f.input :skype, label: false, placeholder: "Skype username", disabled: !can_edit? %>
<%= f.text_field :skype, placeholder: "Skype username", disabled: !can_edit? %>
</td>
</tr>
<tr>
<td>Show Skype to</td>
<td>
<%= f.input :skype_public, label: false, as: :select, collection: [["Staff only", false], ["All users", true]], include_blank: false, input_html: { disabled: !can_edit? } %>
<%= f.select :skype_public, [["Staff only", false], ["All users", true]], {}, { disabled: !can_edit? } %>
</td>
</tr>
<tr>
<td>YouTube username</td>
<td>
<%= f.input :youtube, :label => false, placeholder: "YouTube username", disabled: !can_edit? %>
<%= f.text_field :youtube, placeholder: "YouTube username", disabled: !can_edit? %>
</td>
</tr>
<tr>
<td>Twitter username</td>
<td>
<%= f.input :twitter, :label => false, placeholder: "Twitter username", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)) %>
<%= f.text_field :twitter, placeholder: "Twitter username", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)) %>
</td>
</tr>
<tr>
<td>About you</td>
<td>
<%= f.input :about, :label => false, :input_html => {:class => "vertical"}, placeholder: "Tell us something about you...", disabled: !can_edit? %>
<%= render partial: "mdhelp" %>
<%= f.text_area :about, class: "vertical", placeholder: "Tell us something about you...", disabled: !can_edit? %>
</td>
</tr>
</tbody>
</table>
<%= f.submit "Save profile", class: "btn blue", disabled: (!@user.confirmed? && @user.is?(current_user)) %>
<p><%= f.submit "Save profile", class: "btn blue", disabled: (!@user.confirmed? && @user.is?(current_user)) %></p>
<% if !@user.confirmed? %>
<% if @user.is?(current_user) %>
<span class='red-alert'>Please confirm your email adress first!</span>
@@ -73,5 +69,4 @@
<span class='red-alert'>This user has not confirmed his email!</span>
<% end %>
<% end %>
<%= link_to "Cancel", @user, class: "btn red right" %>
<% end %>

3
app/views/users/show.html.erb
View File

@@ -11,6 +11,7 @@
<%= link_to "revert", unbecome_users_path, :class => "btn blue" %>
<% end %>
</div>
<div class="clear"></div>
<% if @user.banned? %>
<span class="user-banned">This user is banned!</span>
@@ -63,7 +64,7 @@
<% end %>
<tr>
<td>Joined</td>
<td><%= @user.created_at.strftime("%e. %b %Y, %H:%m") %></td>
<td><%= @user.created_at.strftime("%e. %b %Y, %H:%M") %></td>
</tr>
<% if mod? || @user.is?(current_user) %>
<tr>