diff --git a/app/views/topics/_filter_subnav.html.erb b/app/views/topics/_filter_subnav.html.erb index 8b8c39d40..f6762dcce 100644 --- a/app/views/topics/_filter_subnav.html.erb +++ b/app/views/topics/_filter_subnav.html.erb @@ -1,6 +1,8 @@
+ +
diff --git a/app/views/topics/_form.html.erb b/app/views/topics/_form.html.erb index 3feba50c4..83f8cbb24 100644 --- a/app/views/topics/_form.html.erb +++ b/app/views/topics/_form.html.erb @@ -3,6 +3,7 @@ <%= render 'shared/errors', resource: @topic %>
+
<%= f.label :title, t("community.topic.form.topic_title") %> <%= f.text_field :title, label: false %> @@ -13,6 +14,7 @@
<%= f.submit(class: "button", value: t("community.topic.form.#{action_name}.submit_button")) %>
+
- + <% end %> diff --git a/app/views/topics/_recommendations.html.erb b/app/views/topics/_recommendations.html.erb index c6a842684..022b7eb93 100644 --- a/app/views/topics/_recommendations.html.erb +++ b/app/views/topics/_recommendations.html.erb @@ -1,9 +1,13 @@
+ +

<%= t("community.topic.sidebar.recommendations_title") %>

+ +
diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb index 498f9105a..27983e343 100644 --- a/app/views/topics/_topics.html.erb +++ b/app/views/topics/_topics.html.erb @@ -1,4 +1,5 @@ <% if topics.any? %> +
<%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> @@ -6,9 +7,12 @@
<% topics.each do |topic| %> +
+

<%= link_to topic.title, community_topic_path(@community, topic) %>

+

  <%= link_to t("community.show.topic.comments", count: topic.comments_count), community_topic_path(@community, topic, anchor: "comments") %> @@ -17,14 +21,19 @@  •  <%= topic.author.name %>

+
+
<% if topic.author == current_user %> <%= link_to t("community.show.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %> <% end %>
+
+ <% end %> + <% else %>

<%= t("community.show.create_first_community_topic") %>

<% end %> diff --git a/app/views/topics/edit.html.erb b/app/views/topics/edit.html.erb index 4d8e13f14..15c026ca8 100644 --- a/app/views/topics/edit.html.erb +++ b/app/views/topics/edit.html.erb @@ -7,4 +7,5 @@
<%= render "recommendations" %> +
diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb index c48147021..c1f1c42da 100644 --- a/app/views/topics/new.html.erb +++ b/app/views/topics/new.html.erb @@ -1,4 +1,5 @@
+
<%= back_link_to community_path(@community) %>

<%= t("community.topic.create") %>

diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 73d26d773..914839bdd 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -1,5 +1,6 @@
+ <%= back_link_to community_path(@community) %>
@@ -21,5 +22,6 @@ <%= render "topics/comments" %>
+
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 73a6f3677..0a2aa15ca 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -327,6 +327,7 @@ feature 'Budget Investments' do within("#investment_code") do expect(page).to have_content(investment.id) end + expect(page).to have_content "Access the community" end scenario "Don't display flaggable buttons" do