diff --git a/app/assets/stylesheets/events.css.scss b/app/assets/stylesheets/events.css.scss index b85616af..17f33753 100644 --- a/app/assets/stylesheets/events.css.scss +++ b/app/assets/stylesheets/events.css.scss @@ -341,8 +341,23 @@ table.eventslist .ticless { } #event-comments form textarea { + max-width: 100%; width: 100%; - height: 5em; + height: 3.5em; + box-sizing: border-box; + resize: vertical; +} + +#event-comments fieldset { + border: 2px solid crimson; + + p { + margin: 5px 0; + } + + .comment-member { + font-weight: bold; + } } #event-comments form input[type=submit] { diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index bdfe3b88..69388eea 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -72,6 +72,30 @@ <% end %> + +
+

Comments

+ + <% @event.comments.each do |comment| %> +
+ + <%= comment.created_at.strftime("%m/%d/%y, %I:%M%p") %> - + <%= comment.member %> + <% if can? :destroy, comment %> + (<%= link_to "delete", comment_url(comment), :method => :delete, data: {confirm: "Are you sure you would like to delete this comment?"} %>) + <% end %> + + <%= auto_link simple_format comment.content %> +
+ <% end %> + + <%= form_for @event.comments.build do |f| %> + <%= f.hidden_field :event_id %> + <%= f.text_area :content %> +
+ <%= f.submit "New Comment" %> + <% end %> +
<% if can? :create, Invoice.new(event: @event) or not @event.invoices.accessible_by(current_ability).empty? %>
@@ -166,29 +190,6 @@
<% end %> - -
-

Comments

- - <% @event.comments.each do |comment| %> -
- - <%= comment.member %> said on <%= comment.created_at.strftime("%m/%d/%y at %I:%M%p") %> - <% if can? :destroy, comment %> - (<%= link_to "delete", comment_url(comment), :method => :delete, data: {confirm: "Are you sure you would like to delete this comment?"} %>) - <% end %> - - <%= auto_link simple_format comment.content %> -
- <% end %> - - <%= form_for @event.comments.build do |f| %> - <%= f.hidden_field :event_id %> - <%= f.text_area :content %> -
- <%= f.submit "New Comment" %> - <% end %> -
<% if can? :update, @event or can? :destroy, @event or can? :read, Timecard or not @event.emails.empty? %>