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

style

Browse Source
This commit is contained in:
jomo
2013-10-14 02:40:44 +02:00
parent acd4c5198f
commit 7c578874c9
17 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/users/edit.html.erb
+1 -1
View File
@@ -63,6 +63,6 @@
</table>
<%= f.submit "Save profile", disabled: @user.unconfirmed? %>
<% if @user.unconfirmed? %>
<span class='red'>Please confirm your email adress first.</span>
<span class='red-alert'>Please confirm your email adress first.</span>
<% end %>
<% end %>
app/views/users/show.html.erb
+3 -3
View File
@@ -2,13 +2,13 @@
<h1><%= @user.name %></h1>
<% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %>
<div class="profile-action" ><%= link_to "edit profile", edit_user_path(@user), :class => "btn-blue" %></div>
<div class="profile-action" ><%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %></div>
<% end %>
<div class="profile-action" >
<% if !session[:original_user_id] && admin? %>
<%= link_to "become this user", become_user_path(@user), :class => "btn-blue" %>
<%= link_to "become this user", become_user_path(@user), :class => "btn blue" %>
<% elsif session[:original_user_id] %>
<%= link_to "revert", unbecome_users_path, :class => "btn-blue" %>
<%= link_to "revert", unbecome_users_path, :class => "btn blue" %>
<% end %>
</div>