From c77298d9941b154719c7f952669f64cc95c435bc Mon Sep 17 00:00:00 2001 From: Nao Date: Mon, 27 Jul 2020 13:03:25 -0700 Subject: [PATCH 1/4] styling: updated views --- .../help_center/support_posts/_form.html.erb | 63 ++++++++++++------- .../support_posts/_support_post.html.erb | 18 ++---- .../help_center/support_posts/edit.html.erb | 9 +-- .../support_threads/_article.html.erb | 33 ++++++++++ .../support_threads/_form.html.erb | 21 ++----- .../support_threads/_support_thread.html.erb | 15 ++--- .../support_threads/index.html.erb | 10 +-- .../help_center/support_threads/show.html.erb | 40 +----------- .../help_center/user_mailer/new_post.html.erb | 3 - .../user_mailer/new_thread.html.erb | 3 - app/views/layouts/help_center.html.erb | 57 ++++++----------- 11 files changed, 114 insertions(+), 158 deletions(-) create mode 100644 app/views/help_center/support_threads/_article.html.erb diff --git a/app/views/help_center/support_posts/_form.html.erb b/app/views/help_center/support_posts/_form.html.erb index 098a8f9..7d21b11 100644 --- a/app/views/help_center/support_posts/_form.html.erb +++ b/app/views/help_center/support_posts/_form.html.erb @@ -1,32 +1,47 @@ -<%= form_for [@support_thread, @support_post], - url: (@support_post.persisted? ? help_center.support_thread_support_post_path(@support_thread, @support_post) : help_center.support_thread_support_posts_path(@support_thread)), - html: { data: { behavior: "comment-form" } } do |f| %> - - <% if @support_post.errors.any? %> +<%= form_for @support_thread, + url: (@support_thread.persisted? ? help_center.support_thread_path(@support_thread) : help_center.support_threads_path), + html: { data: {behavior: "comment-form"} } do |f| %> + <% if @support_thread.errors.any? %>
-

<%= pluralize(@support_post.errors.count, "error") %> prohibited this support_post from being saved:

- +

<%= pluralize(@support_thread.errors.count, "error") %> prohibited this support_thread from being saved:

<% end %> - -
- <%= f.text_area :body, placeholder: t('add_a_comment'), rows: 8, class: "form-control simplemde", data: { behavior: "comment-body" } %> +
+ <%= f.label :support_category_id, t('choose_a_category') %> + <%= f.collection_select :support_category_id, SupportCategory.sorted, :id, :name, {include_blank: t('pick_a_category')}, {autofocus: true, class: "form-control"} %>
- -
-
- - <%# Describe text formatting options here with a link %> - <%#= link_to "Parsed with Markdown", "https://guides.github.com/features/mastering-markdown/", target: "_blank" %> - -
- - <%= f.button "#{f.object.new_record? ? t('comment') : t('update_comment') }", class: "btn btn-primary", data: {disable_with: " #{t('saving_comment')}"} %> +
+ <%= f.label t('title') %> + <%= f.text_field :title, placeholder: t('how_do_i'), class: "form-control" %> +
+
+ <%= f.label t('position') %> + <%= f.text_field :position, class: "form-control" %> +
+
+ <%= f.label t('content') %> + <%= f.rich_text_area :content %> +
+ <% if local_assigns.fetch(:posts, true) %> + <% if !f.object.new_record? %> + <%= f.fields_for :support_posts do |p| %> +
+ <%= p.label :body, t('what_help_needed') %> + <%= p.text_area :body, placeholder: t('add_a_comment'), rows: 10, class: "form-control simplemde", data: { behavior: "comment-body" } %> +
+ <% end %> + <% end %> + <% end %> +
+ <% if f.object.new_record? %> + <%= f.button t('add'), class: "btn btn-primary", data: {disable_with: " #{t('saving')}"} %> + <% else %> + <%= f.button t('update'), class: "btn btn-primary", data: {disable_with: " #{t('saving')}"} %> + <% end %>
- <% end %> diff --git a/app/views/help_center/support_posts/_support_post.html.erb b/app/views/help_center/support_posts/_support_post.html.erb index 942bde0..9ea1b1b 100644 --- a/app/views/help_center/support_posts/_support_post.html.erb +++ b/app/views/help_center/support_posts/_support_post.html.erb @@ -1,8 +1,6 @@ <%# We don't currently cache the support posts because they have permissions to deal with %> - <%= content_tag :div, id: dom_id(support_post), class: support_post_classes(support_post) do %> -
- +
<% if is_moderator_or_owner?(support_post) %>
<%= link_to icon("fas","edit"), simple_discussion.edit_support_thread_support_post_path(@support_thread, support_post), @@ -19,10 +17,8 @@ %>
<% end %> -
<%= avatar_tag(support_post.user.email) %> - <%= support_post.user.name %> <%= support_user_badge(support_post.user) %> @@ -32,16 +28,13 @@
- -
+
<%= formatted_content support_post.body %>
- <% if @support_thread.solved? && support_post.solved? %> -
+
- <%= icon("fas","check") %> <%= t('solved') %> - + <%= icon("fas","check") %> <%= t('solved') %> <% if is_moderator_or_owner?(@support_thread) %> <%= link_to t('undo'), simple_discussion.unsolved_support_thread_support_post_path(@support_thread, support_post), method: :put %> @@ -49,9 +42,8 @@ <% end %>
- <% elsif is_moderator_or_owner?(@support_thread) %> -
+
<%= link_to simple_discussion.solved_support_thread_support_post_path(@support_thread, support_post), method: :put do %> diff --git a/app/views/help_center/support_posts/edit.html.erb b/app/views/help_center/support_posts/edit.html.erb index f4207e8..87ed263 100644 --- a/app/views/help_center/support_posts/edit.html.erb +++ b/app/views/help_center/support_posts/edit.html.erb @@ -1,17 +1,13 @@

<%= link_to "← Back to the thread", help_center.support_thread_path(@support_thread) %>

-

<%= content_tag :span, "Pinned", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %>

-

<%= category_link(@support_thread.support_category) %> • <%= t('asked_time_ago', time: time_ago_in_words(@support_thread.created_at), author: @support_thread.user.name) %>

-
- <%= content_tag :div, id: dom_id(@support_post), class: support_post_classes(@support_post) do %> -
+
<%= avatar_tag(@support_post.user.email) %> <%= @support_post.user.name %> @@ -21,8 +17,7 @@
- -
+
<%= render "form" %>
<% end %> diff --git a/app/views/help_center/support_threads/_article.html.erb b/app/views/help_center/support_threads/_article.html.erb new file mode 100644 index 0000000..9a746bc --- /dev/null +++ b/app/views/help_center/support_threads/_article.html.erb @@ -0,0 +1,33 @@ +
+
+
+ <%= support_category_link(@support_thread.support_category) %> > <%= @support_thread.title %> +

<%= icon "fas", "thumb-tack", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %>

+
+ <% if is_moderator_or_owner?(@support_thread) %> +
+ <%= link_to icon("fas","pencil"), help_center.edit_support_thread_path(@support_thread), + class: "text-muted", + data: { toggle: "tooltip", placement: "left" }, + title: t('edit_this_thread') %> +
+ <% end %> +
+

+ <%= t('written_by_author', author: @support_thread.user.name) %> + <%= t('content_updated_at', update_time: time_ago_in_words(@support_thread.updated_at)) %> +

+<%= @support_thread.content %> +
+

Did this answer your question?

+

+ 😞 + 😃 +

+
+<% if HelpCenter.enable_comments %> +
+ <%= render partial: "help_center/support_posts/support_post", collection: @support_thread.support_posts.includes(:user).sorted %> + <%= render partial: "help_center/support_posts/form" if user_signed_in? %> +<% end %> +
\ No newline at end of file diff --git a/app/views/help_center/support_threads/_form.html.erb b/app/views/help_center/support_threads/_form.html.erb index 5aac7fc..7d21b11 100644 --- a/app/views/help_center/support_threads/_form.html.erb +++ b/app/views/help_center/support_threads/_form.html.erb @@ -1,11 +1,9 @@ <%= form_for @support_thread, url: (@support_thread.persisted? ? help_center.support_thread_path(@support_thread) : help_center.support_threads_path), html: { data: {behavior: "comment-form"} } do |f| %> - <% if @support_thread.errors.any? %>

<%= pluralize(@support_thread.errors.count, "error") %> prohibited this support_thread from being saved:

-
    <% @support_thread.errors.full_messages.each do |message| %>
  • <%= message %>
    • @@ -13,44 +11,37 @@
<% end %> - -
+
<%= f.label :support_category_id, t('choose_a_category') %> <%= f.collection_select :support_category_id, SupportCategory.sorted, :id, :name, {include_blank: t('pick_a_category')}, {autofocus: true, class: "form-control"} %>
- -
+
<%= f.label t('title') %> <%= f.text_field :title, placeholder: t('how_do_i'), class: "form-control" %>
- -
+
<%= f.label t('position') %> <%= f.text_field :position, class: "form-control" %>
- -
+
<%= f.label t('content') %> <%= f.rich_text_area :content %>
- <% if local_assigns.fetch(:posts, true) %> <% if !f.object.new_record? %> <%= f.fields_for :support_posts do |p| %> -
+
<%= p.label :body, t('what_help_needed') %> <%= p.text_area :body, placeholder: t('add_a_comment'), rows: 10, class: "form-control simplemde", data: { behavior: "comment-body" } %>
<% end %> <% end %> <% end %> - -
+
<% if f.object.new_record? %> <%= f.button t('add'), class: "btn btn-primary", data: {disable_with: " #{t('saving')}"} %> <% else %> <%= f.button t('update'), class: "btn btn-primary", data: {disable_with: " #{t('saving')}"} %> <% end %>
- <% end %> diff --git a/app/views/help_center/support_threads/_support_thread.html.erb b/app/views/help_center/support_threads/_support_thread.html.erb index 3bde76b..dc80bf0 100644 --- a/app/views/help_center/support_threads/_support_thread.html.erb +++ b/app/views/help_center/support_threads/_support_thread.html.erb @@ -1,30 +1,25 @@ <%= cache support_thread do %>
-
- -
+
+
<%= link_to help_center.support_thread_path(support_thread) do %>

<%= support_thread.title %>

- -

<%= truncate(support_thread.content.to_plain_text, length: 200) %>

- -
+

<%= truncate(support_thread.content.to_plain_text, length: 200) %>

+
<%= t('content_updated_at', update_time: time_ago_in_words(support_thread.created_at)) %>
<% end %>
- <% if HelpCenter.enable_comments %> -
+
<%= link_to help_center.support_thread_path(support_thread), class: "thread-posts-count" do %> <%= support_thread.support_posts_count %> <%= t("post", count: support_thread.support_posts_count) %> <% end %>
<% end %> -
<% end %> diff --git a/app/views/help_center/support_threads/index.html.erb b/app/views/help_center/support_threads/index.html.erb index 7007694..45ba9f0 100644 --- a/app/views/help_center/support_threads/index.html.erb +++ b/app/views/help_center/support_threads/index.html.erb @@ -1,23 +1,19 @@ <% if @support_threads.none? %> -
<%= t('search_not_found') %>. <%= t('check_out') %> <%= link_to t('latest_questions'), help_center.support_threads_path %> <%= t('instead') %>
- <% else %> -
+
<% if request.url.include?('category') %> <%# If category, list all articles %> -
+

<%= @support_threads.first.support_category.name %>

+
<%= render partial: "help_center/support_threads/support_thread", collection: @support_threads, spacer_template: "shared/spacer" %> -
<%= will_paginate @support_threads, url_builder: help_center, renderer: HelpCenter::BootstrapLinkRenderer %>
- <% else %> <%# Set default index here %> - <% end %>
<% end %> diff --git a/app/views/help_center/support_threads/show.html.erb b/app/views/help_center/support_threads/show.html.erb index 4e84953..c04e260 100644 --- a/app/views/help_center/support_threads/show.html.erb +++ b/app/views/help_center/support_threads/show.html.erb @@ -1,39 +1 @@ -
-
-
- <%= support_category_link(@support_thread.support_category) %> > <%= @support_thread.title %> -

<%= icon "fas", "thumb-tack", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %>

-
- - <% if is_moderator_or_owner?(@support_thread) %> -
- <%= link_to icon("fas","pencil"), help_center.edit_support_thread_path(@support_thread), - class: "text-muted", - data: { toggle: "tooltip", placement: "left" }, - title: t('edit_this_thread') %> -
- <% end %> - -
- -

- <%= t('written_by_author', author: @support_thread.user.name) %> - <%= t('content_updated_at', update_time: time_ago_in_words(@support_thread.updated_at)) %> -

- -<%= @support_thread.content %> - -
-

Did this answer your question?

-

- 😞 - 😃 -

-
- -<% if HelpCenter.enable_comments %> -
- <%= render partial: "help_center/support_posts/support_post", collection: @support_thread.support_posts.includes(:user).sorted %> - <%= render partial: "help_center/support_posts/form" if user_signed_in? %> -<% end %> -
+<%= render "article" %> diff --git a/app/views/help_center/user_mailer/new_post.html.erb b/app/views/help_center/user_mailer/new_post.html.erb index 57edc0f..39b01eb 100644 --- a/app/views/help_center/user_mailer/new_post.html.erb +++ b/app/views/help_center/user_mailer/new_post.html.erb @@ -1,12 +1,9 @@
<%= gravatar_image_tag @support_post.user.email, style: "float: left" %> -

<%= @support_post.user.name %> commented:

<%= formatted_content @support_post.body %>
-
-

<%= link_to "Reply to this comment", support_thread_url(@support_post.support_thread, anchor: "support_post_#{@support_post.id}"), style: "background:#be2126; color:#fff; text-decoration:none; padding: 10px 20px" %>

diff --git a/app/views/help_center/user_mailer/new_thread.html.erb b/app/views/help_center/user_mailer/new_thread.html.erb index 57edc0f..39b01eb 100644 --- a/app/views/help_center/user_mailer/new_thread.html.erb +++ b/app/views/help_center/user_mailer/new_thread.html.erb @@ -1,12 +1,9 @@
<%= gravatar_image_tag @support_post.user.email, style: "float: left" %> -

<%= @support_post.user.name %> commented:

<%= formatted_content @support_post.body %>
-
-

<%= link_to "Reply to this comment", support_thread_url(@support_post.support_thread, anchor: "support_post_#{@support_post.id}"), style: "background:#be2126; color:#fff; text-decoration:none; padding: 10px 20px" %>

diff --git a/app/views/layouts/help_center.html.erb b/app/views/layouts/help_center.html.erb index e19f64e..6de3434 100644 --- a/app/views/layouts/help_center.html.erb +++ b/app/views/layouts/help_center.html.erb @@ -1,49 +1,37 @@ <% @layout = 'website' %> -
- - -
-
- -
+
+
+
<% if current_user && (current_user.admin? || current_user.moderator?) %> <%= link_to t('add_an_article'), help_center.new_support_thread_path, class: "btn btn-outline-primary btn-block" %>
<% end %> -
<% SupportCategory.sorted.each do |category| %>
<%= support_link_to help_center.support_category_support_threads_path(category) do %> <%= category.name %> <% end %> - <% if @category.present? && @category == category %>
- <% @support_threads.each do |thread| %> - <%= support_link_to help_center.support_thread_path(thread) do %> - <%= thread.title %> - <% end %> - <% end %> -
+ <% threads = SupportThread.where(support_category_id: category.id) %> + <% threads.each do |thread| %> + <%= support_link_to help_center.support_thread_path(thread) do %> + <%= thread.title %> + <% end %> <% end %> +
<% end %>
- - - <% if HelpCenter.enable_comments %>
- - -
@@ -82,15 +70,10 @@ <% end %>
- - - <% if @support_thread.present? && @support_thread.persisted? %>
- <%# User has not posted in the thread or subscribed %>
<%= t('.notifications') %>
- <%= link_to help_center.support_thread_notifications_path(@support_thread), method: :post, class: "btn btn-secondary btn-sm btn-block mb-2" do %> <% if @support_thread.subscribed? current_user %> <%= icon "fa-fw fas", "bell-slash" %> <%= t('.unsubscribe') %> @@ -99,22 +82,22 @@ <%= t('.suscribe') %> <% end %> <% end %> - <%= @support_thread.subscribed_reason(current_user) %> <% end %> <% end %>
-
- -
- -
+
+
+ <% if request.env['REQUEST_URI'] == "/support" %> + <% if SupportThread.exists?(id: 1) %> + <% @support_thread = SupportThread.find(1) %> + <%= render "help_center/support_threads/article"%> + <% end %> + <% end %> <%= yield %>
-
- <% parent_layout("application") %> From 36319d77b4cb4e6c466acbe7d856d9d842b68cd0 Mon Sep 17 00:00:00 2001 From: Nao Date: Mon, 27 Jul 2020 13:35:46 -0700 Subject: [PATCH 2/4] styling: updated styling --- .../support_threads/_article.html.erb | 19 +++++++++---------- app/views/layouts/help_center.html.erb | 17 +++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/help_center/support_threads/_article.html.erb b/app/views/help_center/support_threads/_article.html.erb index 9a746bc..7f3a495 100644 --- a/app/views/help_center/support_threads/_article.html.erb +++ b/app/views/help_center/support_threads/_article.html.erb @@ -1,23 +1,21 @@
-
-
- <%= support_category_link(@support_thread.support_category) %> > <%= @support_thread.title %> -

<%= icon "fas", "thumb-tack", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %>

-
+
<% if is_moderator_or_owner?(@support_thread) %> -
+
<%= link_to icon("fas","pencil"), help_center.edit_support_thread_path(@support_thread), class: "text-muted", data: { toggle: "tooltip", placement: "left" }, title: t('edit_this_thread') %>
<% end %> +
+ <%= support_category_link(@support_thread.support_category) %> > <%= @support_thread.title %> +

<%= icon "fas", "thumb-tack", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %>

+
+
-

- <%= t('written_by_author', author: @support_thread.user.name) %> - <%= t('content_updated_at', update_time: time_ago_in_words(@support_thread.updated_at)) %> -

<%= @support_thread.content %> + <% if HelpCenter.enable_comments %>
<%= render partial: "help_center/support_posts/support_post", collection: @support_thread.support_posts.includes(:user).sorted %> diff --git a/app/views/layouts/help_center.html.erb b/app/views/layouts/help_center.html.erb index 6de3434..4b301e3 100644 --- a/app/views/layouts/help_center.html.erb +++ b/app/views/layouts/help_center.html.erb @@ -1,11 +1,6 @@ <% @layout = 'website' %>
-
-

- <%= "Support" %> -

-
@@ -15,16 +10,22 @@ <% end %>
<% SupportCategory.sorted.each do |category| %> -
+
<%= support_link_to help_center.support_category_support_threads_path(category) do %> +
+ <%= category.name %> + +
<% end %> -
+
<% threads = SupportThread.where(support_category_id: category.id) %> <% threads.each do |thread| %> +
<%= support_link_to help_center.support_thread_path(thread) do %> <%= thread.title %> <% end %> +
<% end %>
@@ -88,7 +89,7 @@
-
+
<% if request.env['REQUEST_URI'] == "/support" %> <% if SupportThread.exists?(id: 1) %> <% @support_thread = SupportThread.find(1) %> From c19016e86d22c321565b9e683320daaa429bc01a Mon Sep 17 00:00:00 2001 From: Nao Date: Mon, 27 Jul 2020 14:18:08 -0700 Subject: [PATCH 3/4] refactor: added order --- app/controllers/help_center/support_threads_controller.rb | 2 +- app/views/layouts/help_center.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/help_center/support_threads_controller.rb b/app/controllers/help_center/support_threads_controller.rb index 6a07663..79bfb91 100644 --- a/app/controllers/help_center/support_threads_controller.rb +++ b/app/controllers/help_center/support_threads_controller.rb @@ -67,6 +67,6 @@ def set_support_thread end def support_thread_params - params.require(:support_thread).permit(:title, :content, :support_category_id, support_posts_attributes: [:body]) + params.require(:support_thread).permit(:title, :content, :position, :support_category_id, support_posts_attributes: [:body]) end end diff --git a/app/views/layouts/help_center.html.erb b/app/views/layouts/help_center.html.erb index 4b301e3..9e2b67a 100644 --- a/app/views/layouts/help_center.html.erb +++ b/app/views/layouts/help_center.html.erb @@ -19,7 +19,7 @@
<% end %>
- <% threads = SupportThread.where(support_category_id: category.id) %> + <% threads = SupportThread.where(support_category_id: category.id).order(:position) %> <% threads.each do |thread| %>
<%= support_link_to help_center.support_thread_path(thread) do %> From 5d8cd973a86dafeba7b93cc0fe84b30880e888ee Mon Sep 17 00:00:00 2001 From: Nao Date: Mon, 27 Jul 2020 15:57:01 -0700 Subject: [PATCH 4/4] refactor: all admins can edit articles --- app/views/help_center/support_threads/_article.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/help_center/support_threads/_article.html.erb b/app/views/help_center/support_threads/_article.html.erb index 7f3a495..079c904 100644 --- a/app/views/help_center/support_threads/_article.html.erb +++ b/app/views/help_center/support_threads/_article.html.erb @@ -1,6 +1,6 @@
- <% if is_moderator_or_owner?(@support_thread) %> + <% if current_user && current_user.admin? %>
<%= link_to icon("fas","pencil"), help_center.edit_support_thread_path(@support_thread), class: "text-muted",