From 091e1d492c0c9f05bc42a29b2206d968b45b3473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?= Date: Fri, 14 Sep 2018 16:52:30 +0200 Subject: [PATCH] Enhacements in navigation Proposal menu will appear highlighted when the voting shown is related to a proposal. The voting menu entry will appear disabled. --- app/views/shared/_subnavigation.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index 7a942f13a..278d3db7c 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -13,7 +13,7 @@
  • <%= layout_menu_link_to t("layouts.header.proposals"), proposals_path, - controller_name == 'proposals', + controller_name == 'proposals' || @poll&.related&.is_a?(Proposal), accesskey: "2", title: t("shared.go_to_page") + t("layouts.header.proposals") %>
    • @@ -22,7 +22,7 @@
  • <%= layout_menu_link_to t("layouts.header.poll_questions"), polls_path, - controller_name == "polls" || (controller_name == "questions" && controller.class.parent == Polls), + (controller_name == "polls" && @poll&.related.nil?) || (controller_name == "questions" && controller.class.parent == Polls), accesskey: "3", title: t("shared.go_to_page") + t("layouts.header.poll_questions") %>