diff --git a/app/assets/stylesheets/proposal-graph.scss b/app/assets/stylesheets/proposal-graph.scss index a1132527a..b5886f9f9 100644 --- a/app/assets/stylesheets/proposal-graph.scss +++ b/app/assets/stylesheets/proposal-graph.scss @@ -1,12 +1,13 @@ -// #proposal-graph > svg > g:nth-child(2) > g.c3-grid.c3-grid-lines > g.c3-ygrid-lines > g:nth-child(2) > line -#proposal-graph { - .c3-ygrid-lines { - line { - stroke: #005c92; - } +.proposal-graph { - text { - fill: #005c92; - } + .c3-ygrid-lines { + + line { + stroke: #005c92; + } + + text { + fill: #005c92; } } +} diff --git a/app/assets/stylesheets/proposal.scss b/app/assets/stylesheets/proposal.scss index 98496fe2d..a01026d48 100644 --- a/app/assets/stylesheets/proposal.scss +++ b/app/assets/stylesheets/proposal.scss @@ -1,4 +1,5 @@ .proposal-show { + p.centered { text-align: center; } @@ -12,14 +13,16 @@ .proposal-created { margin-bottom: 1.5rem; + .row { background-color: #e7f3fd; } } .proposal-dashboard { + .dashboard-sidebar { - border-right: 1pt solid lightgray; + border-right: rem-calc(1) solid lightgray; background-color: #fbfbfb; @include breakpoint(medium) { @@ -64,6 +67,7 @@ } &.is-active a { + span { color: #00538b; font-weight: bold; @@ -135,8 +139,8 @@ .counter { flex-grow: 1; - padding-left: 10pt; - padding-right: 10pt; + padding-left: rem-calc(10); + padding-right: rem-calc(10); .counter-value { text-align: center; @@ -175,6 +179,7 @@ .proposal-link { flex-grow: 1; + .button { margin: 0; } @@ -205,13 +210,13 @@ .label { color: #fefefe; - margin-left: 10pt; + margin-left: rem-calc(10); } } .action-title { - margin-top: 5pt; - margin-bottom: 10pt; + margin-top: rem-calc(5); + margin-bottom: rem-calc(10); hr { max-width: 100%; @@ -243,11 +248,11 @@ } .title { - border-bottom: 1pt solid lightgray; + border-bottom: rem-calc(1) solid lightgray; h5 { padding: 1rem 1.5rem 1rem 1.5rem; - font-size: 16pt; + font-size: rem-calc(16); margin: 0; } } @@ -257,11 +262,11 @@ } .proposal-dashboard-action-links { - margin-bottom: 15pt; + margin-bottom: rem-calc(15); } .resource-card { - min-height: 200pt; + min-height: rem-calc(200); .bottom-container { padding-left: 0; @@ -276,12 +281,13 @@ } .resource-card { + i { display: inline-block; - width: 20pt; - height: 20pt; - border-radius: 10pt; - padding-right: 4pt; + width: rem-calc(20); + height: rem-calc(20); + border-radius: rem-calc(10); + padding-right: rem-calc(4); } } @@ -290,7 +296,7 @@ i { color: #116f8e; - border: 1pt solid #116f8e; + border: rem-calc(1) solid #116f8e; } } @@ -299,7 +305,7 @@ i { color: #00cf96; - border: 1pt solid #00cf96; + border: rem-calc(1) solid #00cf96; } } @@ -308,17 +314,17 @@ i { color: #ff828b; - border: 1pt solid #ff828b; + border: rem-calc(1) solid #ff828b; } } .proposed-action { display: flex; flex-flow: row wrap; - margin-bottom: 15pt; + margin-bottom: rem-calc(15); .exec-indicator { - margin-right: 10pt; + margin-right: rem-calc(10); i { color: #00e193; @@ -347,10 +353,10 @@ a { font-size: 16px; } - } .community-totals { + span { color: #898989; } @@ -359,4 +365,16 @@ color: #898989; } } + + .polls-form { + + hr { + width: 100%; + max-width: 100%; + } + + .remove-nested-record { + padding-top: 20px; + } + } } diff --git a/app/views/admin/proposal_dashboard/actions/_form.html.erb b/app/views/admin/proposal_dashboard/actions/_form.html.erb index d89a3ac64..61bebc553 100644 --- a/app/views/admin/proposal_dashboard/actions/_form.html.erb +++ b/app/views/admin/proposal_dashboard/actions/_form.html.erb @@ -41,13 +41,13 @@
<%= f.label :day_offset %> <%= f.number_field :day_offset, label: false, step: 1, min: 0 %> -

<%= t('admin.proposal_dashboard_actions.form.day_offset_help_text') %>

+

<%= t("admin.proposal_dashboard_actions.form.day_offset_help_text") %>

<%= f.label :required_supports %> <%= f.number_field :required_supports, label: false, step: 1, min: 0 %> -

<%= t('admin.proposal_dashboard_actions.form.required_supports_help_text') %>

+

<%= t("admin.proposal_dashboard_actions.form.required_supports_help_text") %>

@@ -84,7 +84,7 @@
- <%= f.submit(class: 'button expanded', value: t('admin.proposal_dashboard_actions.form.submit_button')) %> + <%= f.submit(class: 'button expanded', value: t("admin.proposal_dashboard_actions.form.submit_button")) %>
<% end %> diff --git a/app/views/admin/proposal_dashboard/actions/edit.html.erb b/app/views/admin/proposal_dashboard/actions/edit.html.erb index 7c1d44b9b..151320c39 100644 --- a/app/views/admin/proposal_dashboard/actions/edit.html.erb +++ b/app/views/admin/proposal_dashboard/actions/edit.html.erb @@ -1,8 +1,8 @@
- <%= back_link_to admin_proposal_dashboard_actions_path, t('admin.proposal_dashboard_actions.edit.back') %> + <%= back_link_to admin_proposal_dashboard_actions_path, t("admin.proposal_dashboard_actions.edit.back") %> -

<%= t('admin.proposal_dashboard_actions.edit.editing') %>

+

<%= t("admin.proposal_dashboard_actions.edit.editing") %>

<%= render 'form' %>
diff --git a/app/views/admin/proposal_dashboard/actions/index.html.erb b/app/views/admin/proposal_dashboard/actions/index.html.erb index 8cb0b3901..761e7e7c6 100644 --- a/app/views/admin/proposal_dashboard/actions/index.html.erb +++ b/app/views/admin/proposal_dashboard/actions/index.html.erb @@ -1,17 +1,17 @@ -<%= link_to t('admin.proposal_dashboard_actions.index.create'), +<%= link_to t("admin.proposal_dashboard_actions.index.create"), new_admin_proposal_dashboard_action_path, class: 'button success float-right' %>

- <%= ProposalDashboardAction.model_name.human(count: 2) %> + <%= t("admin.proposal_dashboard_actions.index.title") %>

- - - - + + + + @@ -19,7 +19,7 @@ <% if @proposal_dashboard_actions.empty? %> - + <% end %> @@ -30,14 +30,14 @@ <% end %> diff --git a/app/views/admin/proposal_dashboard/actions/new.html.erb b/app/views/admin/proposal_dashboard/actions/new.html.erb index 7cdc61540..091c8713b 100644 --- a/app/views/admin/proposal_dashboard/actions/new.html.erb +++ b/app/views/admin/proposal_dashboard/actions/new.html.erb @@ -1,8 +1,8 @@
- <%= back_link_to admin_proposal_dashboard_actions_path, t('admin.proposal_dashboard_actions.new.back') %> + <%= back_link_to admin_proposal_dashboard_actions_path, t("admin.proposal_dashboard_actions.new.back") %> -

<%= t('admin.proposal_dashboard_actions.new.creating') %>

+

<%= t("admin.proposal_dashboard_actions.new.creating") %>

<%= render 'form' %>
diff --git a/app/views/admin/proposal_dashboard/administrator_tasks/_form.html.erb b/app/views/admin/proposal_dashboard/administrator_tasks/_form.html.erb index c1bfc7655..cac4b3890 100644 --- a/app/views/admin/proposal_dashboard/administrator_tasks/_form.html.erb +++ b/app/views/admin/proposal_dashboard/administrator_tasks/_form.html.erb @@ -1,14 +1,16 @@ <%= form_for [:admin_proposal_dashboard, administrator_task] do |f| %>
-
<%=t '.proposal', title: administrator_task.source.proposal.title %>
-

<%=t '.request', title: administrator_task.source.proposal_dashboard_action.title %>

- <%= link_to t('.check_details'), proposal_path(administrator_task.source.proposal), target: '_blank' %> +
<%= t("admin.proposal_dashboard.administrator_tasks.form.proposal", title: administrator_task.source.proposal.title) %>
+

<%= t("admin.proposal_dashboard.administrator_tasks.form.request", title: administrator_task.source.proposal_dashboard_action.title) %>

+ <%= link_to t("admin.proposal_dashboard.administrator_tasks.form.check_details"), + proposal_path(administrator_task.source.proposal), + target: '_blank' %>
- <%= f.submit(class: 'button expanded', value: t('.solve')) %> + <%= f.submit(class: 'button expanded', value: t("admin.proposal_dashboard.administrator_tasks.form.solve")) %>
<% end %> diff --git a/app/views/admin/proposal_dashboard/administrator_tasks/edit.html.erb b/app/views/admin/proposal_dashboard/administrator_tasks/edit.html.erb index 6d85c6d04..8379ba10b 100644 --- a/app/views/admin/proposal_dashboard/administrator_tasks/edit.html.erb +++ b/app/views/admin/proposal_dashboard/administrator_tasks/edit.html.erb @@ -1,8 +1,8 @@
- <%= back_link_to admin_proposal_dashboard_administrator_tasks_path, t('.back') %> + <%= back_link_to admin_proposal_dashboard_administrator_tasks_path, t("admin.proposal_dashboard.administrator_tasks.edit.back") %> -

<%= t('.solving') %>

+

<%= t("admin.proposal_dashboard.administrator_tasks.edit.solving") %>

<%= render 'form' %>
diff --git a/app/views/admin/proposal_dashboard/administrator_tasks/index.html.erb b/app/views/admin/proposal_dashboard/administrator_tasks/index.html.erb index 38614904f..7057aad93 100644 --- a/app/views/admin/proposal_dashboard/administrator_tasks/index.html.erb +++ b/app/views/admin/proposal_dashboard/administrator_tasks/index.html.erb @@ -1,5 +1,5 @@

- <%= AdministratorTask.model_name.human(count: 2) %> + <%= t("admin.proposal_dashboard.administrator_tasks.index.title") %>

<%= ProposalDashboardAction.human_attribute_name(:title) %><%= ProposalDashboardAction.human_attribute_name(:action_type) %><%= ProposalDashboardAction.human_attribute_name(:required_supports) %><%= ProposalDashboardAction.human_attribute_name(:active) %><%= t("admin.proposal_dashboard_actions.index.action_title") %><%= t("admin.proposal_dashboard_actions.index.action_type") %><%= t("admin.proposal_dashboard_actions.index.required_supports") %><%= t("admin.proposal_dashboard_actions.index.action_active") %>
<%= t('admin.proposal_dashboard_actions.index.no_records') %><%= t("admin.proposal_dashboard_actions.index.no_records") %>
<%= number_with_delimiter(action.required_supports, delimiter: '.') %> <%= active_human_readable(action.active) %> - <%= link_to t('admin.proposal_dashboard_actions.index.edit'), + <%= link_to t("admin.proposal_dashboard_actions.index.edit"), edit_admin_proposal_dashboard_action_path(action), class: 'edit-banner button hollow' %> - <%= link_to t('admin.proposal_dashboard_actions.index.delete'), + <%= link_to t("admin.proposal_dashboard_actions.index.delete"), admin_proposal_dashboard_action_path(action), method: :delete, class: 'button hollow alert', - data: { confirm: t('admin.actions.confirm') } %> + data: { confirm: t("admin.actions.confirm") } %>
@@ -13,7 +13,7 @@ <% if @administrator_tasks.empty? %> - + <% end %> @@ -24,7 +24,7 @@ <%= task.source.proposal_dashboard_action.title %> diff --git a/app/views/dashboard/polls/_form.html.erb b/app/views/dashboard/polls/_form.html.erb index e134d971b..d2e953482 100644 --- a/app/views/dashboard/polls/_form.html.erb +++ b/app/views/dashboard/polls/_form.html.erb @@ -32,7 +32,7 @@ diff --git a/app/views/dashboard/polls/_poll.html.erb b/app/views/dashboard/polls/_poll.html.erb index b3a4eadeb..88f479c03 100644 --- a/app/views/dashboard/polls/_poll.html.erb +++ b/app/views/dashboard/polls/_poll.html.erb @@ -8,20 +8,20 @@

<%= poll.title %>

- <%= t('.published_on') %> + <%= t("dashboard.polls.poll.published_on") %> <%= l(poll.starts_at.to_date) %>

- <%= t('.responses', count: poll.questions.count) %> + <%= t("dashboard.polls.poll.responses", count: poll.questions.count) %>
<% if poll.incoming? %> - <%= link_to t('.edit_poll'), edit_proposal_dashboard_poll_path(proposal, poll), class: 'button hollow' %> + <%= link_to t("dashboard.polls.poll.edit_poll"), edit_proposal_dashboard_poll_path(proposal, poll), class: 'button hollow' %> <% else %> - <%= link_to t('.view_results'), results_poll_path(poll), class: 'button', target: '_blank' %> + <%= link_to t("dashboard.polls.poll.view_results"), results_poll_path(poll), class: 'button', target: '_blank' %> <% end %>
@@ -34,9 +34,9 @@ false: raw(''), true: raw('') } %> - <%= t('.show_results') %> + <%= t("dashboard.polls.poll.show_results") %>

-

<%= t('.show_results_help') %>

+

<%= t("dashboard.polls.poll.show_results_help") %>

diff --git a/app/views/dashboard/polls/_question_answer_fields.html.erb b/app/views/dashboard/polls/_question_answer_fields.html.erb index 89bd39448..90eeb170f 100644 --- a/app/views/dashboard/polls/_question_answer_fields.html.erb +++ b/app/views/dashboard/polls/_question_answer_fields.html.erb @@ -3,10 +3,10 @@
<%= f.text_field :title %>
-
+
<%= link_to_remove_association f, class: 'button hollow alert' do %> - <%=t('.remove_answer') %> + <%=t("dashboard.polls.question_answer_fields.remove_answer") %> <% end %>
@@ -21,5 +21,5 @@ -
+
diff --git a/app/views/dashboard/polls/_question_fields.html.erb b/app/views/dashboard/polls/_question_fields.html.erb index d75bb1f8e..5f67e77d2 100644 --- a/app/views/dashboard/polls/_question_fields.html.erb +++ b/app/views/dashboard/polls/_question_fields.html.erb @@ -5,10 +5,10 @@
<%= f.text_field :title %>
-
+
<%= link_to_remove_association f, class: 'button alert hollow' do %> - <%=t('.remove_question') %> + <%=t("dashboard.polls.question_fields.remove_question") %> <% end %>
@@ -20,10 +20,10 @@ -
+
diff --git a/app/views/dashboard/polls/index.html.erb b/app/views/dashboard/polls/index.html.erb index 8aa583b22..2ecb595e1 100644 --- a/app/views/dashboard/polls/index.html.erb +++ b/app/views/dashboard/polls/index.html.erb @@ -1,4 +1,4 @@ -<% content_for :action_title, t('.title') %> +<% content_for :action_title, t("dashboard.polls.index.title") %>
<%== Setting['proposals.poll_description'] %> @@ -7,14 +7,14 @@
<% unless Setting['proposals.poll_link'].blank? %>
-

<%= t('.links') %>

- <%= link_to t('.additiontal_information'), Setting['proposals.poll_link'], target: '_blank' %> +

<%= t("dashboard.polls.index.links") %>

+ <%= link_to t("dashboard.polls.index.additiontal_information"), Setting['proposals.poll_link'], target: '_blank' %>
<% end %> - <%= t('.count', count: @polls.count) %> - <%= link_to t('.create'), + <%= t("dashboard.polls.index.count", count: @polls.count) %> + <%= link_to t("dashboard.polls.index.create"), new_proposal_dashboard_poll_path(proposal), class: 'button expanded' %>
diff --git a/app/views/dashboard/polls/show.html.erb b/app/views/dashboard/polls/show.html.erb deleted file mode 100644 index 636e6dfe5..000000000 --- a/app/views/dashboard/polls/show.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<% content_for :action_title, t(".title") %> - -<%= render "poll_header" %> - -
- <%= render "subnav" %> - - <%= render "questions" %> -
diff --git a/app/views/proposals_dashboard/_form.html.erb b/app/views/proposals_dashboard/_form.html.erb index 81e8e35a6..0cae2c35e 100644 --- a/app/views/proposals_dashboard/_form.html.erb +++ b/app/views/proposals_dashboard/_form.html.erb @@ -2,7 +2,7 @@ <%= form_for @proposal_executed_dashboard_action, url: create_request_proposal_dashboard_url(proposal, proposal_dashboard_action) do |f| %>
- <%= f.submit(class: 'button', value: t('.request')) %> + <%= f.submit(class: 'button', value: t("proposals_dashboard.form.request")) %>
<% end %> <% end %> diff --git a/app/views/proposals_dashboard/_goal.html.erb b/app/views/proposals_dashboard/_goal.html.erb index 4116fecd5..347d19bfd 100644 --- a/app/views/proposals_dashboard/_goal.html.erb +++ b/app/views/proposals_dashboard/_goal.html.erb @@ -2,7 +2,7 @@
- <%= t('.target_supports', count: number_with_precision(goal.required_supports, delimiter: '.', precision: 0)) %> + <%= t("proposals_dashboard.goal.target_supports", count: number_with_precision(goal.required_supports, delimiter: '.', precision: 0)) %>
 
@@ -12,15 +12,15 @@ <%= goal.title %>
-

<%= t('.unlocked_resource') %>

+

<%= t("proposals_dashboard.goal.unlocked_resource") %>

<% if goal.day_offset.positive? %>
- <%= t('.days', count: goal.day_offset) %> + <%= t("proposals_dashboard.goal.days", count: goal.day_offset) %>
-

<%= t('.ideal_time') %>

+

<%= t("proposals_dashboard.goal.ideal_time") %>

<% end %>
diff --git a/app/views/proposals_dashboard/_menu.html.erb b/app/views/proposals_dashboard/_menu.html.erb index d70a2b948..cde8f48fe 100644 --- a/app/views/proposals_dashboard/_menu.html.erb +++ b/app/views/proposals_dashboard/_menu.html.erb @@ -2,7 +2,7 @@
  • <%= link_to proposal_dashboard_index_path(proposal.to_param), class: my_proposal_menu_class do %> - <%= t('.my_proposal') %> + <%= t("proposals_dashboard.menu.my_proposal") %> <% end %>
    • @@ -10,7 +10,7 @@ <%= link_to progress_proposal_dashboard_index_path(proposal.to_param), class: progress_menu_class do %> - <%= t('.progress') %> + <%= t("proposals_dashboard.menu.progress") %> <% end %> @@ -18,14 +18,16 @@
  • > - <%= t('.resources') %> + <%= t("proposals_dashboard.menu.resources") %> <%= resources_menu do %> <% if can?(:manage_polls, proposal) %> <%= polls_menu do %> <%= link_to proposal_dashboard_polls_path(proposal.to_param) do %> - <%= t('.polls') %> + "> + <%= t("proposals_dashboard.menu.polls") %> + <% end %> <% end %> <% end %> @@ -47,7 +49,7 @@ <%= link_to community_proposal_dashboard_index_path(proposal.to_param), class: community_menu_class do %> - <%= t('.community') %> + <%= t("proposals_dashboard.menu.community") %> <% end %>
    • diff --git a/app/views/proposals_dashboard/_next_goal.html.erb b/app/views/proposals_dashboard/_next_goal.html.erb index e2c36e284..b84e998ea 100644 --- a/app/views/proposals_dashboard/_next_goal.html.erb +++ b/app/views/proposals_dashboard/_next_goal.html.erb @@ -1,7 +1,7 @@ <% if next_goal.present? %>

    -
    <%= t('.title') %>
    +
    <%= t("proposals_dashboard.next_goal.title") %>
    @@ -9,16 +9,16 @@ <%= render 'goal', goal: next_goal %>
    - <%= t('.see_complete_course') %> + <%= t("proposals_dashboard.next_goal.see_complete_course") %>
    <% if course.count > 1 %>
    - <%= render partial: 'goal', collection: course %>, + <%= render partial: 'goal', collection: course %>
    - <%= t('.hide_course') %> + <%= t("proposals_dashboard.next_goal.hide_course") %>
    <% end %> diff --git a/app/views/proposals_dashboard/_poll_resource.html.erb b/app/views/proposals_dashboard/_poll_resource.html.erb index 02649ff94..101fc1575 100644 --- a/app/views/proposals_dashboard/_poll_resource.html.erb +++ b/app/views/proposals_dashboard/_poll_resource.html.erb @@ -1,13 +1,13 @@ <% if can?(:manage_polls, proposal) %>
    " data-position="bottom" data-alignment="right">

    -

    <%= t('proposals_dashboard.menu.polls') %>

    +

    <%= t("proposals_dashboard.menu.polls") %>

    <%= Setting['proposals.poll_short_title'] %>

    @@ -15,7 +15,7 @@
    - <%= link_to t('proposals_dashboard.resource.request_resource'), proposal_dashboard_polls_path(proposal.to_param), class: 'button primary' %> + <%= link_to t("proposals_dashboard.resource.request_resource"), proposal_dashboard_polls_path(proposal.to_param), class: 'button primary' %>
    diff --git a/app/views/proposals_dashboard/_recommended_actions.html.erb b/app/views/proposals_dashboard/_recommended_actions.html.erb index b6ec1a6ac..aa218399b 100644 --- a/app/views/proposals_dashboard/_recommended_actions.html.erb +++ b/app/views/proposals_dashboard/_recommended_actions.html.erb @@ -1,7 +1,7 @@ <% if proposed_actions.any? %>

    -
    <%= t('.title') %>
    +
    <%= t("proposals_dashboard.recommended_actions.title") %>
    diff --git a/app/views/proposals_dashboard/_resource.html.erb b/app/views/proposals_dashboard/_resource.html.erb index 3313c5cc3..7029c2d08 100644 --- a/app/views/proposals_dashboard/_resource.html.erb +++ b/app/views/proposals_dashboard/_resource.html.erb @@ -21,13 +21,17 @@
    <% if resource.executed_for?(proposal) %>
    - <%= link_to t('.view_resource'), new_request_proposal_dashboard_path(proposal, resource), class: 'button success' %> + <%= link_to t("proposals_dashboard.resource.view_resource"), + new_request_proposal_dashboard_path(proposal, resource), + class: 'button success' %>
    <% elsif resource.requested_for?(proposal) %> - <%= t('.resource_requested') %> + <%= t("proposals_dashboard.resource.resource_requested") %> <% elsif resource.active_for?(proposal) %>
    - <%= link_to t('.request_resource'), new_request_proposal_dashboard_path(proposal, resource), class: 'button primary' %> + <%= link_to t("proposals_dashboard.resource.request_resource"), + new_request_proposal_dashboard_path(proposal, resource), + class: 'button primary' %>
    <% else %> diff --git a/app/views/proposals_dashboard/_resources.html.erb b/app/views/proposals_dashboard/_resources.html.erb index 765ba8aeb..715d72393 100644 --- a/app/views/proposals_dashboard/_resources.html.erb +++ b/app/views/proposals_dashboard/_resources.html.erb @@ -1,6 +1,6 @@

    -
    <%= t('.available_resources') %>
    +
    <%= t("proposals_dashboard.resources.available_resources") %>
    diff --git a/app/views/proposals_dashboard/community.html.erb b/app/views/proposals_dashboard/community.html.erb index 54c15bf0e..c3f757d32 100644 --- a/app/views/proposals_dashboard/community.html.erb +++ b/app/views/proposals_dashboard/community.html.erb @@ -1,35 +1,35 @@ -<% content_for :action_title, t('proposals_dashboard.menu.community') %> +<% content_for :action_title, t("proposals_dashboard.menu.community") %>
    - <%= link_to t('.access_community'), community_path(proposal.community), class: 'button hollow' %> + <%= link_to t("proposals_dashboard.community.access_community"), community_path(proposal.community), class: 'button hollow' %> <% unless proposal.community.latest_activity.nil? %> -

    <%= t('.latest_activity', at: l(proposal.community.latest_activity.to_date)) %>

    +

    <%= t("proposals_dashboard.community.latest_activity", at: l(proposal.community.latest_activity.to_date)) %>

    <% end %>
     <%= number_with_delimiter(proposal.community.participants_count, delimiter: '.') %> -

    <%= t('.participants') %>

    +

    <%= t("proposals_dashboard.community.participants") %>

     <%= number_with_delimiter(proposal.community.debates_count, delimiter: '.') %> -

    <%= t('.debates') %>

    +

    <%= t("proposals_dashboard.community.debates") %>

     <%= number_with_delimiter(proposal.community.comments_count, delimiter: '.') %> -

    <%= t('.comments') %>

    +

    <%= t("proposals_dashboard.community.comments") %>

    <% if proposal.community.comments.any? %>
    -
    <%= t('.latest_comments') %>
    +
    <%= t("proposals_dashboard.community.latest_comments") %>
    diff --git a/app/views/proposals_dashboard/index.html.erb b/app/views/proposals_dashboard/index.html.erb index dde3c420e..a9f49ce33 100644 --- a/app/views/proposals_dashboard/index.html.erb +++ b/app/views/proposals_dashboard/index.html.erb @@ -1,25 +1,25 @@ -<% content_for :action_title, t('.title') %> +<% content_for :action_title, t("proposals_dashboard.index.title") %> <% if current_editable?(proposal) %> - <%= link_to t('.edit_proposal_link'), edit_proposal_path(proposal), target: '_blank', class: 'button hollow' %> + <%= link_to t("proposals_dashboard.index.edit_proposal_link"), edit_proposal_path(proposal), target: '_blank', class: 'button hollow' %> <% end %> <% if can_destroy_image?(proposal) %> - <%= link_to t('images.remove_image'), + <%= link_to t("images.remove_image"), image_path(proposal.image, from: request.url), method: :delete, class: 'button hollow alert', - data: { confirm: t('images.actions.destroy.confirm') } %> + data: { confirm: t("images.actions.destroy.confirm") } %> <% end %> <% unless proposal.retired? %> - <%= link_to t('.retire'), + <%= link_to t("proposals_dashboard.index.retire"), retire_form_proposal_path(proposal), class: 'button hollow alert', target: '_blank' %> <% end %> <% if can?(:publish, proposal) %> - <%= link_to t('.publish'), publish_proposal_dashboard_index_path(proposal), class: 'button success', method: :patch %> + <%= link_to t("proposals_dashboard.index.publish"), publish_proposal_dashboard_index_path(proposal), class: 'button success', method: :patch %> <% end %> diff --git a/app/views/proposals_dashboard/new_request.html.erb b/app/views/proposals_dashboard/new_request.html.erb index e1844d261..bdbc795e1 100644 --- a/app/views/proposals_dashboard/new_request.html.erb +++ b/app/views/proposals_dashboard/new_request.html.erb @@ -9,7 +9,7 @@
    <% if proposal_dashboard_action.links.any? %>
    -

    <%= t('.links') %>

    +

    <%= t("proposals_dashboard.new_request.links") %>

    <% proposal_dashboard_action.links.each do |link| %> <% if link.open_in_new_tab %> <%= link_to link.label, link.url, target: '_blank' %> diff --git a/app/views/proposals_dashboard/progress.html.erb b/app/views/proposals_dashboard/progress.html.erb index 2584ec373..1662ca2b3 100644 --- a/app/views/proposals_dashboard/progress.html.erb +++ b/app/views/proposals_dashboard/progress.html.erb @@ -1,15 +1,15 @@ -<% content_for :action_title, t('.title') %> +<% content_for :action_title, t("proposals_dashboard.progress.title") %>
    - <%= link_to t('.group_by_date'), + <%= link_to t("proposals_dashboard.progress.group_by_date"), progress_proposal_dashboard_index_path(proposal), class: "button #{daily_selected_class}" %> - <%= link_to t('.group_by_week'), + <%= link_to t("proposals_dashboard.progress.group_by_week"), progress_proposal_dashboard_index_path(proposal, group_by: 'week'), class: "button #{weekly_selected_class}" %> - <%= link_to t('.group_by_month'), + <%= link_to t("proposals_dashboard.progress.group_by_month"), progress_proposal_dashboard_index_path(proposal, group_by: 'month'), class: "button #{monthly_selected_class}" %>
    @@ -22,11 +22,11 @@ data-successful-proposal-graph-url="<%= successful_supports_proposal_dashboard_index_path(proposal, format: :json) %>" data-proposal-achievements-url="<%= achievements_proposal_dashboard_index_path(proposal, format: :json) %>" data-proposal-graph-group-by="<%= params[:group_by] %>" - data-proposal-graph-progress-label="<%= t('.progress') %>" - data-proposal-graph-supports-label="<%= t('.supports') %>" - data-proposal-graph-success-label="<%= t('.success') %>" + data-proposal-graph-progress-label="<%= t("proposals_dashboard.progress.progress") %>" + data-proposal-graph-supports-label="<%= t("proposals_dashboard.progress.supports") %>" + data-proposal-graph-success-label="<%= t("proposals_dashboard.progress.success") %>" data-proposal-success="<%= Setting["votes_for_proposal_success"] %>" - class="c3" + class="c3 proposal-graph" style="max-height: 320px; position: relative;">
    diff --git a/app/views/users/_proposal.html.erb b/app/views/users/_proposal.html.erb index 1d688308b..fa3601d7f 100644 --- a/app/views/users/_proposal.html.erb +++ b/app/views/users/_proposal.html.erb @@ -6,24 +6,24 @@
    <% if proposal.retired? %> - + <% elsif can?(:dashboard, proposal) %> <% else %> <% end %> diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb index 7c9467ef5..4bc136963 100644 --- a/app/views/users/_proposals.html.erb +++ b/app/views/users/_proposals.html.erb @@ -2,7 +2,7 @@ - + <% @proposals.each do |proposal| %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 119c890a6..2dcce0b5a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -1105,6 +1105,11 @@ en: no_records: No records found active: 'Yes' inactive: 'No' + title: Resources/Recomended actions + action_title: Title + action_type: Type + required_supports: Required supports + action_active: Active new: creating: New action for the proposals dashboard back: Back to list @@ -1322,6 +1327,7 @@ en: proposal_dashboard: administrator_tasks: index: + title: Pending tasks solve: Solve no_records: There are no pending tasks edit: diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index a535c45fc..bd814e68b 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -587,8 +587,6 @@ en: add_answer: Add answer question_answer_fields: remove_answer: Remove answer - show: - title: Configure poll polls: all: "All" no_dates: "no date assigned" @@ -893,6 +891,8 @@ en: draft: Draft published: Published see: "See proposal" + actions: Actions + retired_help_text: Dashboard not available for retired proposals votes: agree: I agree anonymous: Too many anonymous votes to admit vote %{verify_account}. diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index a96108e79..f87de3847 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -1105,6 +1105,11 @@ es: no_records: No se encontraron registros active: 'Si' inactive: 'No' + title: Recursos/Acciones recomendadas + action_title: Título + action_type: Tipo + required_supports: Apoyos necesarios + action_active: Activo new: creating: Nueva acción para el dashboard de propuestas back: Volver a la lista @@ -1322,6 +1327,7 @@ es: proposal_dashboard: administrator_tasks: index: + title: Tareas pendientes solve: Resolver no_records: No hay tareas pendientes edit: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 8c310c8de..0f9cb8220 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -528,7 +528,7 @@ es: publish: Publicar retire: Retirar new_request: - liks: Enlaces + links: Enlaces resources: available_resources: Recursos disponibles resource: @@ -587,8 +587,6 @@ es: add_answer: Añadir respuesta question_answer_fields: remove_answer: Borrar respuesta - show: - title: Configurar encuesta polls: all: "Todas" no_dates: "sin fecha asignada" @@ -892,6 +890,8 @@ es: draft: Borrador published: Publicada see: "Ver propuesta" + actions: Acciones + retired_help_text: Dashboard no disponible para propuestas retiradas votes: agree: Estoy de acuerdo anonymous: Demasiados votos anónimos, para poder votar %{verify_account}. diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index 8f76be698..60663ee57 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -67,4 +67,4 @@ es: successful_proposal_id: Propuesta exitosa poll_short_title: Subtítulo funcionalidad encuestas poll_description: Descripción funcionalidad encuestas - proposals.poll_link: Enlace información adicional + poll_link: Enlace información adicional
    <%= t('.no_records') %><%= t("admin.proposal_dashboard.administrator_tasks.index.no_records") %>
    - <%= link_to t('.solve'), + <%= link_to t("admin.proposal_dashboard.administrator_tasks.index.solve"), edit_admin_proposal_dashboard_administrator_task_path(task), class: 'edit-banner button hollow' %> <% if proposal.retired? %> - <%= t('users.proposals.retired') %> + <%= t("users.proposals.retired") %> <% elsif proposal.draft? %> - <%= t('users.proposals.draft') %> + <%= t("users.proposals.draft") %> <% else %> - <%= t('users.proposals.published') %> + <%= t("users.proposals.published") %> <% end %> <%= t("users.proposals.retired_help_text") %> - <%= link_to t('proposals.show.dashboard_proposal_link'), + <%= link_to t("proposals.show.dashboard_proposal_link"), proposal_dashboard_index_path(proposal), class: 'button hollow expanded' %> - <%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %> + <%= link_to t("users.proposals.see"), proposal, class: 'button hollow' %>
    <%= t("users.show.proposals") %> <%= t("users.show.proposals_status") %><%= t("users.proposals.actions") %>