another big commit :D

app/views/users/edit.html.erb

@@ -1,3 +1,4 @@
+<%= link_to "Your profile", current_user %> → Edit
 <h1>Edit profile</h1>
 
 <%= simple_form_for @user do |f| %>
@@ -9,41 +10,59 @@
       </tr>
       <tr>
         <td>Display name</td>
-        <td><%= f.input :name, :label => false %></td>
+        <td>
+           <%= f.input :name, :label => false, disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+         </td>
        </tr>
-       <%  if admin? %>
-       <tr class="special_edit" >
-         <td>Ingame name</td>
-         <td><%= f.input :ign, :label => false %></td>
+         <td>In-game name</td>
+         <td>
+           <%= f.input :ign, :label => false, disabled: !(mod? && current_user.role >= @user.role) %>
+         </td>
        </tr>
-       <tr class="special_edit" >
-         <td>Rank</td>
-         <td><%= f.input :rank, :label => false, :collection => ranks, :include_blank => false %></td>
+       <tr>
+         <td>Role</td>
+         <td>
+           <% if mod? && current_user.role >= @user.role %>
+             <%= f.association :role, :label => false, :collection => Role.all_until(current_user.role), :include_blank => false %>
+           <% else %>
+             <%= f.input :role, label: false, disabled: true %>
+           <% end %>
+         </td>
+         </td>
        </tr>
-       <% end %>
        <tr>
          <td>
            Skype username<br>
-           Show to all users
+           Show to...
          </td>
          <td>
-           <%= f.input :skype, :label => false %>
-           <%= f.input :skype_public, :label => false %>
+             <%= f.input :skype, label: false, placeholder: "Skype username", disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+             <%= f.input :skype_public, label: false, as: :radio_buttons, collection: [['all users', false], ['only staff', true]], input_html: { disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) } %>
+         </td>
          </td>
        </tr>
        <tr>
          <td>YouTube username</td>
-         <td><%= f.input :youtube, :label => false %></td>
+         <td>
+           <%= f.input :youtube, :label => false, placeholder: "YouTube username", disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+         </td>
        </tr>
        <tr>
          <td>Twitter username</td>
-         <td><%= f.input :twitter, :label => false %></td>
+         <td>
+           <%= f.input :twitter, :label => false, placeholder: "Twitter username", disabled: !(confirmed? || (mod? && current_user.role >= @user.role)) %>
+         </td>
        </tr>
        <tr>
          <td>About you</td>
-         <td><%= f.input :about, :label => false, :input_html => {:class => "vertical"} %></td>
+         <td>
+           <%= f.input :about, :label => false, :input_html => {:class => "vertical"}, placeholder: "Tell us something about you...", disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+         </td>
        </tr>
      </tbody>
    </table>
-  <%= f.submit "Save profile" %>
+  <%= f.submit "Save profile", disabled: @user.unconfirmed? %>
+  <% if @user.unconfirmed? %>
+    <span class='red'>Please confirm your email adress first.</span>
+  <% end %>
 <% end %>

app/views/users/index.html.erb

@@ -1,4 +1,4 @@
-<% filter = params[:rank] %>
+<% filter = params[:role] %>
 <% if filter %>
   <h1>All '<%= filter %>' users</h1>
   <%= link_to "show all", users_path %>
@@ -16,7 +16,7 @@
           <span class="user-name"><%= u.name %></span>
           <span class="user-ign"><%= u.ign %></span>
         <% end %>
-        <span class="user-rank"><%= link_to int_to_rank(u.rank), users_path(:rank => int_to_rank(u.rank)) %></span>
+        <span class="user-role"><%= link_to u.role, users_path(:role => u.role.name) %></span>
       </div>
     </div>
   <% end %>

app/views/users/new.html.erb

@@ -1,8 +1,8 @@
 <h1>Register</h1>
 
 <%= simple_form_for @user do |f| %>
-  <%= f.input :name %>
-  <%= f.input :ign, label: "Exact ingame name" %>
+  <%= f.input :name, label: "Display Name" %>
+  <%= f.input :ign, label: "Case sensitive Minecraft name" %>
   <%= f.input :email %>
   <%= f.input :password %>
   <%= f.input :password_confirmation %>

app/views/users/show.html.erb

@@ -1,22 +1,32 @@
 <div id="user-info">
   <h1><%= @user.name %></h1>
 
-  <% if @user == current_user || mod? %>
+  <% 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" >
-      <% if session[:original_user_id] %>
-        <%= link_to "revert", unbecome_users_path, :class => "btn-blue" %>
-      <% else %>
-        <%= link_to "become this user", become_user_path(@user), :class => "btn-blue" %>
-      <% end %>
-    </div>
   <% end %>
+  <div class="profile-action" >
+    <% if !session[:original_user_id] && admin? %>
+      <%= 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" %>
+    <% end %>
+  </div>
 
-  <% if @user.rank.to_i == rank_to_int("banned") %>
+  <% if @user.banned? %>
     <span class="user-banned">This user is banned!</span>
   <% end %>
-  <% if @user.rank.to_i == rank_to_int("unconfirmed") %>
-    <span class="user-unconfirmed">This user hasn't confirmed his email yet!</span>
+  <% if @user.unconfirmed? %>
+    <% if @user.is?(current_user) %>
+      <span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
+    <% else %>
+      <span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
+    <% end %>
+  <% elsif @user.disabled? %>
+    <% if @user.is?(current_user) %>
+      <span class="user-unconfirmed">Your account has been disabled.</span>
+    <% else %>
+      <span class="user-unconfirmed">This user is disabled or does no longer exist.</span>
+    <% end %>
   <% end %>
 
 
@@ -28,25 +38,25 @@
             <td><%= @user.ign %></td>
           </tr>
           <tr>
-            <td>Rank</td>
-            <td><%= link_to int_to_rank(@user.rank), users_path(:rank => int_to_rank(@user.rank))  %></td>
+            <td>Role</td>
+            <td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
           </tr>
           <% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
           <tr>
             <td>Skype</td>
-            <td><a href="skype:<%= @user.skype %>?chat" target="_blank"><%= @user.skype %></a></td>
+            <td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>
           </tr>
           <% end %>
-          <% if !@user.youtube.blank? && @user.youtube_channelname.blank? %>
+          <% if !@user.youtube.blank? && !@user.youtube_channelname.blank? %>
           <tr>
             <td>YouTube</td>
-            <td><%= link_to @user.youtube_channelname, "https://youtube.com/user/#{CGI::escape(@user.youtube)}", :target => "_blank" %></td>
+            <td><%= link_to @user.youtube_channelname, "https://youtube.com/user/#{CGI.escape(@user.youtube)}", :target => "_blank" %></td>
           </tr>
           <% end %>
           <% if !@user.twitter.blank? %>
           <tr>
             <td>Twitter</td>
-            <td><%= link_to @user.twitter, "https://twitter.com/#{CGI::escape(@user.twitter)}", :target => "_blank" %></td>
+            <td><%= link_to @user.twitter, "https://twitter.com/#{CGI.escape(@user.twitter)}", :target => "_blank" %></td>
           </tr>
           <% end %>
           <tr>
@@ -54,10 +64,12 @@
             <td><%= @user.created_at.strftime("%e. %b %Y") %></td>
           </tr>
           <% if mod? || current_user == @user %>
+          <% if mod? %>
           <tr>
             <td>Last IP</td>
             <td><%= @user.last_ip %></td>
           </tr>
+          <% end %>
           <tr>
             <td>Email</td>
             <td><%= mail_to @user.email, @user.email, :subject => "Redstoner" %></td>