diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
index 2682f91..9f8947a 100644
--- a/app/assets/stylesheets/style.css.scss
+++ b/app/assets/stylesheets/style.css.scss
@@ -650,6 +650,7 @@ tr.spacer {
}
.profile-action {
+ font-size: 0;
float: right;
}
diff --git a/app/views/blogposts/index.html.erb b/app/views/blogposts/index.html.erb
index e838de4..c622d29 100644
--- a/app/views/blogposts/index.html.erb
+++ b/app/views/blogposts/index.html.erb
@@ -1,7 +1,4 @@
<% title "News" %>
-<% if current_user %>
- <%= link_to "Private Messages (#{Message.where(user_target: current_user).count})", messages_path, class: "btn right blue" %>
-<% end %>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index e40eb35..656f3c6 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -3,13 +3,13 @@
|
- <%= render partial: "md_editor_user", locals: {name: "message[user_target]", content: @message.user_target} %>
+ <%= render partial: "md_editor_user", locals: {name: "message[user_target]", content: params[:user_target]} %>
|
|
- <%= render partial: "md_editor", locals: {name: "message[text]", content: @message.text} %>
+ <%= render partial: "md_editor", locals: {name: "message[text]", content: params[:text]} %>
|
diff --git a/app/views/statics/home.html.erb b/app/views/statics/home.html.erb
index a5f3242..6a51abd 100644
--- a/app/views/statics/home.html.erb
+++ b/app/views/statics/home.html.erb
@@ -30,4 +30,4 @@
for those who just want to mine some ore
and we have a freebuild world for large projects.
-
Join us now!
\ No newline at end of file
+
Join us now!
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e371a09..d9eb123 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,14 +1,19 @@
<% title @user.name %>
- <% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %>
-
<%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %>
- <% end %>
-
- <% if !session[:original_user_id] && admin? %>
- <%= link_to "become this user", become_path(user: @user), :class => "btn blue" %>
- <% elsif session[:original_user_id] %>
+
+ <% if session[:original_user_id] %>
<%= link_to "revert", revert_path, :class => "btn blue" %>
+ <% elsif admin? %>
+ <%= link_to "become this user", become_path(user: @user), :class => "btn blue" %>
+ <% end %>
+ <% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %>
+ <%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %>
+ <% end %>
+ <% if @user.is?(current_user) %>
+ <%= link_to "Private Messages (#{Message.where(user_target: current_user).count})", messages_path, :class => "btn blue" %>
+ <% else %>
+ <%= link_to "Send this user a message", new_message_path(user_target: @user.ign), :class => "btn blue" %>
<% end %>