From 8bf5164301761775c8ff47467b4f6f30f324d632 Mon Sep 17 00:00:00 2001 From: MrYummy Date: Sat, 17 Jun 2017 17:22:58 +0200 Subject: just making this so I don't lose work when I switch branches --- app/views/messages/index.html.erb | 4 ++-- app/views/messages/new.html.erb | 2 +- app/views/users/show.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb index 2cc3df8..644d4ad 100644 --- a/app/views/messages/index.html.erb +++ b/app/views/messages/index.html.erb @@ -1,7 +1,7 @@ <% if @messages.any? %> - <%= link_to "Delete all messages", destroy_all_messages_path, method: "post", class: "btn blue right", data: {confirm: "Delete all of your messages forever?"} %> + <%= link_to "delete all messages", destroy_all_messages_path, method: "post", class: "btn blue right", data: {confirm: "Delete all of your messages forever?"} %> <% end %> -<%= link_to "Create new message", new_message_path, class: "btn blue right" %> +<%= link_to "create new message", new_message_path, class: "btn blue right" %>

<% if Message.where("(user_target_id = ? OR user_sender_id = ?) AND user_hidden_id != ?", current_user.id, current_user.id, current_user.id).any? %> diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb index 1184cad..0780c2c 100644 --- a/app/views/messages/new.html.erb +++ b/app/views/messages/new.html.erb @@ -1,4 +1,4 @@ -

Example Text

+

New Message

<%= form_for @message do |f| %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 6ca1acd..6edcc6e 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -11,7 +11,7 @@ <%= link_to "edit profile", edit_user_path(@user), :class => "btn blue" %> <% end %> <% if @user.is?(current_user) %> - <%= link_to "Private Messages (#{Message.where.not(user_unread: current_user).count})", messages_path, :class => "btn blue" %> + <%= link_to "private messages (#{Message.where.not(user_unread: current_user).count})", messages_path, :class => "btn blue" %> <% elsif current_user %> <%= link_to "Send this user a message", new_message_path(user_target: @user.ign), :class => "btn blue" %> <% end %> -- cgit v1.2.3