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

Merge pull request #41.

Browse Source
This commit is contained in:
Logan Fick
2017-10-31 22:19:34 -04:00
parent 0646747780 7ed1c2ac57
commit 52e32808b5
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,11 +15,13 @@
<h1><%= @user.name %></h1>
<div class="clear"></div>
<% if @user.banned? %>
<span class="user-banned">This user is banned!</span>
<% if @ban_json %>
<span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
<% end %>
<% if @user.banned? %>
<span class="user-banned">This user is banned on the website!</span>
<% end %>
<br>
<% if !@user.confirmed? %>
<% if @user.is?(current_user) || mod? %>
<span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>