bunch of stuffs

app/views/layouts/_head.html.erb

@@ -16,7 +16,7 @@
   </div>
   <div id="menu">
     <ul>
-      <li><%= link_to "HOME", root_path, :class => "arrow" %></li>
+      <li><%= link_to "BLOG", root_path, :class => "arrow" %></li>
       <li><%= link_to "FORUM", nil, :class => "arrow" %></li>
       <li><%= link_to "INFO", nil, :class => "arrow" %></li>
       <li><%= link_to "DONATE", nil, :class => "arrow" %></li>

app/views/users/change_password.html.erb

@@ -0,0 +1,13 @@
+ <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>
+<% end %>

app/views/users/edit.html.erb

@@ -1,6 +1,45 @@
-<h1>Editing user</h1>
+<h1>Edit profile</h1>
 
-<%= render 'form' %>
-
-<%= link_to 'Show', @user %> |
-<%= link_to 'Back', users_path %>
+<%= simple_form_for @user do |f| %>
+  <table>
+    <tbody>
+      <tr>
+        <td>Display name</td>
+        <td><%= f.input :name, :label => false %></td>
+       </tr>
+       <%  if admin? %>
+       <tr class="special_edit" >
+         <td>Ingame name</td>
+         <td><%= f.input :ign, :label => false %></td>
+       </tr>
+       <tr class="special_edit" >
+         <td>Rank</td>
+         <td><%= f.input :rank, :label => false, :collection => ranks, :include_blank => false %></td>
+       </tr>
+       <% end %>
+       <tr>
+         <td>
+           Skype username<br>
+           Show to all users
+         </td>
+         <td>
+           <%= f.input :skype, :label => false %>
+           <%= f.input :skype_public, :label => false %>
+         </td>
+       </tr>
+       <tr>
+         <td>YouTube username</td>
+         <td><%= f.input :youtube, :label => false %></td>
+       </tr>
+       <tr>
+         <td>Twitter username</td>
+         <td><%= f.input :twitter, :label => false %></td>
+       </tr>
+       <tr>
+         <td>About you</td>
+         <td><%= f.input :about, :label => false, :input_html => {:class => "vertical"} %></td>
+       </tr>
+     </tbody>
+   </table>
+  <%= f.submit "Save profile" %>
+<% end %>

app/views/users/index.html.erb

@@ -1,14 +1,23 @@
-<h1>All users</h1>
+<% filter = params[:rank] %>
+<% if filter %>
+  <h1>All '<%= filter %>' users</h1>
+  <%= link_to "show all", users_path %>
+<% else %>
+  <h1> All users </h1>
+<% end %>
 <div id="userlist">
   <% @users.each do |u| %>
     <div class="list-user">
-      <%= link_to u do %>
+      <%= link_to u, :class => "avatar_url" do %>
         <%= image_tag(avatar_url(u.id, 64), :class => "avatar", :alt => "avatar") %>
-        <div class="user-info">
+      <% end %>
+      <div class="user-info">
+        <%= link_to u do %>
           <span class="user-name"><%= u.name %></span>
           <span class="user-ign"><%= u.ign %></span>
-        </div>
-      <% end %>
+        <% end %>
+        <span class="user-rank"><%= link_to int_to_rank(u.rank), users_path(:rank => int_to_rank(u.rank)) %></span>
+      </div>
     </div>
   <% end %>
 </div>

app/views/users/show.html.erb

@@ -1,14 +1,44 @@
 <div id="user-info">
-  <div id="edit_profile"><%= link_to "edit profile", edit_user_path(@user), :class => "btn-blue" %></div>
-  <%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %><br/>
+  <h1><%= @user.name %></h1>
+
+  <% if @user == current_user || mod? %>
+    <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 %>
+
+  <%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %><br>
+
   <% if @user.banned %>
     <span class="user-banned">This user is banned!</span>
   <% end %>
-  IGN: <%= @user.ign %><br/>
-  Rank: <%= int_to_rank(@user.rank) %><br/>
-  Joined: <%= @user.created_at.strftime("%e. %b %Y") %><br/>
-  <% if current_user && current_user.rank >= rank_to_int("mod") %>
-    Last IP: <%= @user.last_ip %><br/>
+
+  IGN: <%= @user.ign %><br>
+
+  Rank: <%= link_to int_to_rank(@user.rank), users_path(:rank => int_to_rank(@user.rank))  %><br>
+
+  <% if current_user && @user.skype && (@user.skype_public || current_user == @user || mod?) %>
+    YouTube: <%= link_to @user.youtube_channelname, "https://youtube.com/user/#{CGI::escape(@user.youtube)}", :target => "_blank" if !@user.youtube.blank? %><br>
+    Twitter: <%= link_to @user.twitter, "https://twitter.com/#{CGI::escape(@user.twitter)}", :target => "_blank" if !@user.twitter.blank? %><br>
+    Skype: <a href="skype:<%= @user.skype %>?chat" target="_blank"><%= @user.skype %></a><br>
   <% end %>
-  About: <%= @user.about.blank? ? "<span class=\"no-about\">nothing</span>".html_safe : @user.about %>
+
+  Joined: <%= @user.created_at.strftime("%e. %b %Y") %><br>
+
+  <% if mod? %>
+    <hr>
+    Last IP: <%= @user.last_ip %><br>
+    Email: <a href="mailto:<%= @user.email %>"><%= @user.email %></a><br>
+    Last login: <%= @user.last_login.strftime("%e. %b %Y, %H:%M") %>
+  <% end %>
+
+  <hr>
+
+  <%= @user.about.blank? ? "<span class=\"no-about\">nothing</span>".html_safe : @user.about.gsub("\n", "<br>").html_safe %>
+
 </div>