diff --git a/app/assets/stylesheets/legislation.scss b/app/assets/stylesheets/legislation.scss index 6247b64b9..b70783789 100644 --- a/app/assets/stylesheets/legislation.scss +++ b/app/assets/stylesheets/legislation.scss @@ -83,7 +83,7 @@ } .legislation-calendar { - background: #e5ecf2; + background: $highlight; padding-top: 1rem; h4 { diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index 474d80bbb..cb4488004 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -212,7 +212,7 @@ } .quiz-title { - background: #e5ecf2; + background: $highlight; .quiz-header-title { font-size: $small-font-size; @@ -982,3 +982,27 @@ margin-top: 0; } } + +.process-proposal { + margin-bottom: $line-height; + + .header { + background: $highlight; + padding: $line-height; + + @include breakpoint(medium) { + height: $line-height * 4; + } + } + + .process-title { + font-size: $small-font-size; + margin-bottom: 0; + text-transform: uppercase; + } + + .process-link { + font-size: rem-calc(19); + font-weight: bold; + } +} diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 434f4f97b..efe8bf9f0 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,9 +1,9 @@ class DashboardController < Dashboard::BaseController helper_method :dashboard_action, :active_resources, :course before_action :set_done_and_pending_actions, only: [:recommended_actions, :progress] + before_action :authorize_dashboard, only: [:show, :progress, :community, :recommended_actions, :messages] def show - authorize! :dashboard, proposal end def publish @@ -14,15 +14,15 @@ class DashboardController < Dashboard::BaseController end def progress - authorize! :dashboard, proposal end def community - authorize! :dashboard, proposal end def recommended_actions - authorize! :dashboard, proposal + end + + def messages end private @@ -42,4 +42,8 @@ class DashboardController < Dashboard::BaseController @done_actions = proposed_actions.joins(:proposals).where("proposals.id = ?", proposal.id) @pending_actions = proposed_actions - @done_actions end + + def authorize_dashboard + authorize! :dashboard, proposal + end end diff --git a/app/helpers/proposals_dashboard_helper.rb b/app/helpers/proposals_dashboard_helper.rb index 619308c01..b7abee430 100644 --- a/app/helpers/proposals_dashboard_helper.rb +++ b/app/helpers/proposals_dashboard_helper.rb @@ -7,6 +7,10 @@ module ProposalsDashboardHelper controller_name == "dashboard" && action_name == "community" end + def messages_menu_active? + controller_name == "dashboard" && action_name == "messages" + end + def progress_menu_active? is_proposed_action_request? || (controller_name == "dashboard" && action_name == "progress") end diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 886a39aaa..9fc0f875b 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -61,7 +61,12 @@ <% end %> -  • <%= l comment.created_at.to_datetime, format: :datetime %> +  •  + + <%= link_to comment_path(comment) do %> + <%= l comment.created_at.to_datetime, format: :datetime %> + <% end %> +
<%= t("shared.hide") %> - <%= t("comments.comment.responses", count: comment.children.size) %> + + + <%= t("comments.comment.responses_collapse", count: comment.children.size) %> <% end %> <% else %> <%= t("comments.comment.responses", count: 0) %> diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb index 91b70dd62..fee2108eb 100644 --- a/app/views/communities/show.html.erb +++ b/app/views/communities/show.html.erb @@ -29,14 +29,6 @@