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

Moved messages index link to users/show.html.erb, added 'message this user' button

Browse Source
This commit is contained in:
MrYummy
2017-06-13 02:06:58 +02:00
parent dd63941657
commit 4d42fdfeb4
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/style.css.scss
View File

@@ -650,6 +650,7 @@ tr.spacer {
} }
.profile-action { .profile-action {
font-size: 0;
float: right; float: right;
} }

3
app/views/blogposts/index.html.erb
View File

@@ -1,7 +1,4 @@
<% title "News" %> <% title "News" %>
<% if current_user %>
<%= link_to "Private Messages (#{Message.where(user_target: current_user).count})", messages_path, class: "btn right blue" %>
<% end %>
<h1>News</h1> <h1>News</h1>
<%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %> <%= link_to 'Make new Post', new_blogpost_path, class: "btn blue" if mod? %>
<div id="posts"> <div id="posts">

4
app/views/messages/new.html.erb
View File

@@ -3,13 +3,13 @@
</table> </table>
<tr> <tr>
<td> <td>
<%= 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]} %>
</td> </td>
</tr> </tr>
<br> <br>
<tr> <tr>
<td> <td>
<%= render partial: "md_editor", locals: {name: "message[text]", content: @message.text} %> <%= render partial: "md_editor", locals: {name: "message[text]", content: params[:text]} %>
</td> </td>
</tr> </tr>
</table> </table>

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

@@ -1,14 +1,19 @@
<% title @user.name %> <% title @user.name %>
<div id="user-info"> <div id="user-info">
<% if @user.is?(current_user) || (mod? && current_user.role >= @user.role) %> <div class="profile-action">
<div class="profile-action" ><%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %></div> <% if session[:original_user_id] %>
<% end %>
<div class="profile-action" >
<% if !session[:original_user_id] && admin? %>
<%= link_to "become this user", become_path(user: @user), :class => "btn blue" %>
<% elsif session[:original_user_id] %>
<%= link_to "revert", revert_path, :class => "btn blue" %> <%= 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 %> <% end %>
</div> </div>