diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 0377aa35f..a3cba7263 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2047,6 +2047,21 @@ table { width: 100%; } +.budget-investment-info, +.debate-info, +.investment-project-info, +.proposal-info, +.topic-info { + + .comments-count { + @include has-fa-icon(comments, regular); + + &::before { + margin-right: 0.3rem; + } + } +} + // 16. Flags // --------- diff --git a/app/components/budgets/investments/info_component.html.erb b/app/components/budgets/investments/info_component.html.erb index e4f8922d3..8de99aa8b 100644 --- a/app/components/budgets/investments/info_component.html.erb +++ b/app/components/budgets/investments/info_component.html.erb @@ -2,9 +2,10 @@ <%= l investment.created_at.to_date %>  •  -   - <%= link_to t("shared.comments", count: investment.comments_count), - budget_investment_path(investment.budget, investment, anchor: "comments") %> + + <%= link_to t("shared.comments", count: investment.comments_count), + budget_investment_path(investment.budget, investment, anchor: "comments") %> + <% if investment.author.hidden? || investment.author.erased? %>  •  diff --git a/app/views/admin/debates/show.html.erb b/app/views/admin/debates/show.html.erb index 3319a11cb..bf79aa1c0 100644 --- a/app/views/admin/debates/show.html.erb +++ b/app/views/admin/debates/show.html.erb @@ -17,8 +17,9 @@  •  <%= l @debate.created_at.to_date %>  •  -   - <%= link_to t("debates.show.comments", count: @debate.comments_count), debate_path(@debate, anchor: "comments") %> + + <%= link_to t("debates.show.comments", count: @debate.comments_count), debate_path(@debate, anchor: "comments") %> +  •  <%= render "shared/flag_actions", flaggable: @debate %> diff --git a/app/views/budgets/investments/_investment_detail.erb b/app/views/budgets/investments/_investment_detail.erb index 987dd3174..198387893 100644 --- a/app/views/budgets/investments/_investment_detail.erb +++ b/app/views/budgets/investments/_investment_detail.erb @@ -5,8 +5,9 @@  •  <%= l investment.created_at.to_date %>  •  -   - <%= link_to t("shared.comments", count: investment.comments_count), "#comments" %> + + <%= link_to t("shared.comments", count: investment.comments_count), "#comments" %> +  •  <%= investment.heading.name %>  •  diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb index 83f865023..ef0087d8a 100644 --- a/app/views/debates/_debate.html.erb +++ b/app/views/debates/_debate.html.erb @@ -7,8 +7,10 @@

<%= link_to debate.title, debate %>

-   - <%= link_to t("debates.debate.comments", count: debate.comments_count), debate_path(debate, anchor: "comments") %> + + <%= link_to t("debates.debate.comments", count: debate.comments_count), + debate_path(debate, anchor: "comments") %> +  •  <%= l debate.created_at.to_date %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 72fb918e7..c7c62c0df 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -26,8 +26,9 @@  •  <%= l @debate.created_at.to_date %>  •  -   - <%= link_to t("debates.show.comments", count: @debate.comments_count), "#comments" %> + + <%= link_to t("debates.show.comments", count: @debate.comments_count), "#comments" %> +  •  <%= render "shared/flag_actions", flaggable: @debate %> diff --git a/app/views/legislation/proposals/_proposal.html.erb b/app/views/legislation/proposals/_proposal.html.erb index 0142be99c..622293702 100644 --- a/app/views/legislation/proposals/_proposal.html.erb +++ b/app/views/legislation/proposals/_proposal.html.erb @@ -19,9 +19,11 @@ <% cache [locale_and_user_status(proposal), "index", proposal, proposal.author] do %>

<%= link_to proposal.title, legislation_process_proposal_path(proposal.legislation_process_id, proposal) %>

-   - <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), legislation_process_proposal_path(proposal.legislation_process_id, proposal, anchor: "comments") %> - + + <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), + legislation_process_proposal_path(proposal.legislation_process_id, proposal, + anchor: "comments") %> +  •  <%= l proposal.created_at.to_date %> diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index 91a210d01..cfc953d16 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -44,8 +44,9 @@  •  <%= l @proposal.created_at.to_date %>  •  -   - <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + + <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + <% if current_user %>  •  diff --git a/app/views/proposals/_info.html.erb b/app/views/proposals/_info.html.erb index 15467348b..ab41e9d98 100644 --- a/app/views/proposals/_info.html.erb +++ b/app/views/proposals/_info.html.erb @@ -6,8 +6,9 @@ <% unless @proposal.selected? %>  •  -   - <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + + <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + <% end %> <% if current_user %> diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index 0b3c8ec33..3adbe05af 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -21,9 +21,10 @@ <% cache [locale_and_user_status(proposal), "index", proposal, proposal.author] do %>

<%= link_to proposal.title, namespaced_proposal_path(proposal) %>

-   - <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), - namespaced_proposal_path(proposal, anchor: "comments") %> + + <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), + namespaced_proposal_path(proposal, anchor: "comments") %> +  •  <%= l proposal.created_at.to_date %> diff --git a/app/views/topics/_topic.html.erb b/app/views/topics/_topic.html.erb index 4082bf3f7..a2afb656f 100644 --- a/app/views/topics/_topic.html.erb +++ b/app/views/topics/_topic.html.erb @@ -5,8 +5,10 @@

<%= 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") %> + + <%= link_to t("community.show.topic.comments", count: topic.comments_count), + community_topic_path(@community, topic, anchor: "comments") %> +  •  <%= I18n.l topic.created_at.to_date %>  •  diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 75c4b406b..a20e8815a 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -14,9 +14,10 @@  •  <%= l(@topic.created_at.to_date) %>  •  -   - <%= link_to t("community.show.topic.comments", count: @topic.comments_count), - community_topic_path(@community, @topic, anchor: "comments") %> + + <%= link_to t("community.show.topic.comments", count: @topic.comments_count), + community_topic_path(@community, @topic, anchor: "comments") %> +


<%= @topic.description %>