consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #236

Browse Source 
Addressed comments related to CSS and views.
This commit is contained in:
Juan Salvador Pérez García
2018-07-23 07:25:22 +02:00
parent 4e808c7729
commit 01846089d4
34 changed files with 170 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/stylesheets/proposal-graph.scss
View File

@@ -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;
}
}
}

58
app/assets/stylesheets/proposal.scss
View File

@@ -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;
}
}
}

6
app/views/admin/proposal_dashboard/actions/_form.html.erb
View File

@@ -41,13 +41,13 @@
<div class="small-12 medium-4 large-4 column">
<%= f.label :day_offset %>
<%= f.number_field :day_offset, label: false, step: 1, min: 0 %>
<p class="help-text"><%= t('admin.proposal_dashboard_actions.form.day_offset_help_text') %></p>
<p class="help-text"><%= t("admin.proposal_dashboard_actions.form.day_offset_help_text") %></p>
</div>
<div class="small-12 medium-4 large-4 column">
<%= f.label :required_supports %>
<%= f.number_field :required_supports, label: false, step: 1, min: 0 %>
<p class="help-text"><%= t('admin.proposal_dashboard_actions.form.required_supports_help_text') %></p>
<p class="help-text"><%= t("admin.proposal_dashboard_actions.form.required_supports_help_text") %></p>
</div>
<div class="small-12 medium-4 large-4 column">
@@ -84,7 +84,7 @@
<div class="row">
<div class="actions small-12 large-3 medium-3 column">
<%= 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")) %>
</div>
</div>
<% end %>

4
app/views/admin/proposal_dashboard/actions/edit.html.erb
View File

@@ -1,8 +1,8 @@
<div class="row">
<div class="small-12 column">
<%= 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") %>
<h1><%= t('admin.proposal_dashboard_actions.edit.editing') %></h1>
<h1><%= t("admin.proposal_dashboard_actions.edit.editing") %></h1>
<%= render 'form' %>
</div>

20
app/views/admin/proposal_dashboard/actions/index.html.erb
View File

@@ -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' %>
<h2 class="inline-block">
<%= ProposalDashboardAction.model_name.human(count: 2) %>
<%= t("admin.proposal_dashboard_actions.index.title") %>
</h2>
<table>
<thead>
<tr>
<th><%= ProposalDashboardAction.human_attribute_name(:title) %></th>
<th><%= ProposalDashboardAction.human_attribute_name(:action_type) %></th>
<th class="text-right"><%= ProposalDashboardAction.human_attribute_name(:required_supports) %></th>
<th class="text-center"><%= ProposalDashboardAction.human_attribute_name(:active) %></th>
<th><%= t("admin.proposal_dashboard_actions.index.action_title") %></th>
<th><%= t("admin.proposal_dashboard_actions.index.action_type") %></th>
<th class="text-right"><%= t("admin.proposal_dashboard_actions.index.required_supports") %></th>
<th class="text-center"><%= t("admin.proposal_dashboard_actions.index.action_active") %></th>
<th></th>
</tr>
</thead>
@@ -19,7 +19,7 @@
<tbody>
<% if @proposal_dashboard_actions.empty? %>
<tr>
<td colspan="100%"><%= t('admin.proposal_dashboard_actions.index.no_records') %></td>
<td colspan="100%"><%= t("admin.proposal_dashboard_actions.index.no_records") %></td>
</tr>
<% end %>
@@ -30,14 +30,14 @@
<td class="text-right"><%= number_with_delimiter(action.required_supports, delimiter: '.') %></td>
<td class="text-center"><%= active_human_readable(action.active) %></td>
<td class="text-right">
<%= 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") } %>
</td>
</tr>
<% end %>

4
app/views/admin/proposal_dashboard/actions/new.html.erb
View File

@@ -1,8 +1,8 @@
<div class="proposal-dashboard-action-new row">
<div class="small-12 column">
<%= 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") %>
<h1><%= t('admin.proposal_dashboard_actions.new.creating') %></h1>
<h1><%= t("admin.proposal_dashboard_actions.new.creating") %></h1>
<%= render 'form' %>
</div>

10
app/views/admin/proposal_dashboard/administrator_tasks/_form.html.erb
View File

@@ -1,14 +1,16 @@
<%= form_for [:admin_proposal_dashboard, administrator_task] do |f| %>
<div class="callout">
<h5><%=t '.proposal', title: administrator_task.source.proposal.title %></h5>
<p><%=t '.request', title: administrator_task.source.proposal_dashboard_action.title %></p>
<%= link_to t('.check_details'), proposal_path(administrator_task.source.proposal), target: '_blank' %>
<h5><%= t("admin.proposal_dashboard.administrator_tasks.form.proposal", title: administrator_task.source.proposal.title) %></h5>
<p><%= t("admin.proposal_dashboard.administrator_tasks.form.request", title: administrator_task.source.proposal_dashboard_action.title) %></p>
<%= link_to t("admin.proposal_dashboard.administrator_tasks.form.check_details"),
proposal_path(administrator_task.source.proposal),
target: '_blank' %>
</div>
<div class="row">
<div class="actions small-12 large-3 medium-3 column">
<%= f.submit(class: 'button expanded', value: t('.solve')) %>
<%= f.submit(class: 'button expanded', value: t("admin.proposal_dashboard.administrator_tasks.form.solve")) %>
</div>
</div>
<% end %>

4
app/views/admin/proposal_dashboard/administrator_tasks/edit.html.erb
View File

@@ -1,8 +1,8 @@
<div class="row">
<div class="small-12 column">
<%= 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") %>
<h1><%= t('.solving') %></h1>
<h1><%= t("admin.proposal_dashboard.administrator_tasks.edit.solving") %></h1>
<%= render 'form' %>
</div>

6
app/views/admin/proposal_dashboard/administrator_tasks/index.html.erb
View File

@@ -1,5 +1,5 @@
<h2 class="inline-block">
<%= AdministratorTask.model_name.human(count: 2) %>
<%= t("admin.proposal_dashboard.administrator_tasks.index.title") %>
</h2>
<table>
@@ -13,7 +13,7 @@
<tbody>
<% if @administrator_tasks.empty? %>
<tr>
<td colspan="100%"><%= t('.no_records') %></td>
<td colspan="100%"><%= t("admin.proposal_dashboard.administrator_tasks.index.no_records") %></td>
</tr>
<% end %>
@@ -24,7 +24,7 @@
<%= task.source.proposal_dashboard_action.title %>
</td>
<td style="text-align: right">
<%= 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' %>
</td>

2
app/views/dashboard/polls/_form.html.erb
View File

@@ -32,7 +32,7 @@
<div id="links row">
<div class="small-12">
<%= link_to_add_association t('.add_question'), f, :questions, class: 'button hollow' %>
<%= link_to_add_association t("dashboard.polls.form.add_question"), f, :questions, class: 'button hollow' %>
</div>
</div>
</div>

12
app/views/dashboard/polls/_poll.html.erb
View File

@@ -8,20 +8,20 @@
</p>
<h4 class="text-center"><%= poll.title %></h4>
<p class="text-center">
<%= t('.published_on') %>
<%= t("dashboard.polls.poll.published_on") %>
<%= l(poll.starts_at.to_date) %>
</p>
</div>
<div class="card-section text-center">
<strong><%= t('.responses', count: poll.questions.count) %></strong>
<strong><%= t("dashboard.polls.poll.responses", count: poll.questions.count) %></strong>
</div>
<div class="card-section text-center">
<% 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 %>
</div>
<div class="card-section">
@@ -34,9 +34,9 @@
false: raw('<input type="checkbox">'),
true: raw('<input type="checkbox" checked>')
} %>
<strong><%= t('.show_results') %></strong>
<strong><%= t("dashboard.polls.poll.show_results") %></strong>
</p>
<p class="help-text"><%= t('.show_results_help') %></p>
<p class="help-text"><%= t("dashboard.polls.poll.show_results_help") %></p>
</div>
</div>
</div>

6
app/views/dashboard/polls/_question_answer_fields.html.erb
View File

@@ -3,10 +3,10 @@
<div class="small-12 large-9 column">
<%= f.text_field :title %>
</div>
<div class="small-12 large-3 column" style="padding-top: 20px">
<div class="small-12 large-3 column remove-nested-record">
<%= link_to_remove_association f, class: 'button hollow alert' do %>
<span class="icon-x" aria-hidden="true"></span>
<span><%=t('.remove_answer') %></span>
<span><%=t("dashboard.polls.question_answer_fields.remove_answer") %></span>
<% end %>
</div>
</div>
@@ -21,5 +21,5 @@
</div>
</div>
<hr style="max-width:100%">
<hr>
</div>

8
app/views/dashboard/polls/_question_fields.html.erb
View File

@@ -5,10 +5,10 @@
<div class="small-12 large-9 column">
<%= f.text_field :title %>
</div>
<div class="small-12 large-3 column" style="padding-top: 20px">
<div class="small-12 large-3 column remove-nested-record">
<%= link_to_remove_association f, class: 'button alert hollow' do %>
<span class="icon-x" aria-hidden="true"></span>
<span><%=t('.remove_question') %></span>
<span><%=t("dashboard.polls.question_fields.remove_question") %></span>
<% end %>
</div>
</div>
@@ -20,10 +20,10 @@
<div id="links" class="row">
<div class="small-12">
<%= link_to_add_association t('.add_answer'), f, :question_answers, class: 'button hollow' %>
<%= link_to_add_association t("dashboard.polls.question_fields.add_answer"), f, :question_answers, class: 'button hollow' %>
</div>
</div>
</div>
<hr style="max-width:100%">
<hr>
</div>

10
app/views/dashboard/polls/index.html.erb
View File

@@ -1,4 +1,4 @@
<% content_for :action_title, t('.title') %>
<% content_for :action_title, t("dashboard.polls.index.title") %>
<div class="row">
<div class="small-12 medium-9 column">
<%== Setting['proposals.poll_description'] %>
@@ -7,14 +7,14 @@
<div class="small-12 medium-3 column">
<% unless Setting['proposals.poll_link'].blank? %>
<div class="proposal-dashboard-action-links">
<h3><%= t('.links') %></h3>
<%= link_to t('.additiontal_information'), Setting['proposals.poll_link'], target: '_blank' %>
<h3><%= t("dashboard.polls.index.links") %></h3>
<%= link_to t("dashboard.polls.index.additiontal_information"), Setting['proposals.poll_link'], target: '_blank' %>
</div>
<% end %>
<strong><%= t('.count', count: @polls.count) %></strong>
<%= link_to t('.create'),
<strong><%= t("dashboard.polls.index.count", count: @polls.count) %></strong>
<%= link_to t("dashboard.polls.index.create"),
new_proposal_dashboard_poll_path(proposal),
class: 'button expanded' %>
</div>

9
app/views/dashboard/polls/show.html.erb
View File

@@ -1,9 +0,0 @@
<% content_for :action_title, t(".title") %>
<%= render "poll_header" %>
<div id="poll-resources">
<%= render "subnav" %>
<%= render "questions" %>
</div>

2
app/views/proposals_dashboard/_form.html.erb
View File

@@ -2,7 +2,7 @@
<%= form_for @proposal_executed_dashboard_action,
url: create_request_proposal_dashboard_url(proposal, proposal_dashboard_action) do |f| %>
<div class="actions">
<%= f.submit(class: 'button', value: t('.request')) %>
<%= f.submit(class: 'button', value: t("proposals_dashboard.form.request")) %>
</div>
<% end %>
<% end %>

8
app/views/proposals_dashboard/_goal.html.erb
View File

@@ -2,7 +2,7 @@
<div class="column small-12">
<i class="fi-flag"></i>
<strong>
<%= 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)) %>
</strong>
</div>
<div class="column small-12">&nbsp;</div>
@@ -12,15 +12,15 @@
<strong><%= goal.title %></strong>
</div>
<div class="column small-12 skip-icon">
<p class="help-text"><%= t('.unlocked_resource') %></p>
<p class="help-text"><%= t("proposals_dashboard.goal.unlocked_resource") %></p>
</div>
<% if goal.day_offset.positive? %>
<div class="column small-12">
<strong><%= t('.days', count: goal.day_offset) %></strong>
<strong><%= t("proposals_dashboard.goal.days", count: goal.day_offset) %></strong>
</div>
<div class="column small-12">
<p class="help-text"><%= t('.ideal_time') %></p>
<p class="help-text"><%= t("proposals_dashboard.goal.ideal_time") %></p>
</div>
<% end %>
</div>

12
app/views/proposals_dashboard/_menu.html.erb
View File

@@ -2,7 +2,7 @@
<li class="section-title">
<%= link_to proposal_dashboard_index_path(proposal.to_param), class: my_proposal_menu_class do %>
<i class="fi-lightbulb"></i>
<strong><%= t('.my_proposal') %></strong>
<strong><%= t("proposals_dashboard.menu.my_proposal") %></strong>
<% end %>
</li>
@@ -10,7 +10,7 @@
<%= link_to progress_proposal_dashboard_index_path(proposal.to_param),
class: progress_menu_class do %>
<span class="fi-graph-trend"></span>
<strong><%= t('.progress') %></strong>
<strong><%= t("proposals_dashboard.menu.progress") %></strong>
<% end %>
</li>
@@ -18,14 +18,16 @@
<li class="section-title">
<a href="#" <%= 'class=is-active' if resources_menu_active? %>>
<span class="icon-file-text-o"></span>
<strong><%= t('.resources') %></strong>
<strong><%= t("proposals_dashboard.menu.resources") %></strong>
</a>
<%= resources_menu do %>
<% if can?(:manage_polls, proposal) %>
<%= polls_menu do %>
<%= link_to proposal_dashboard_polls_path(proposal.to_param) do %>
<span data-tooltip title="<%= Setting['proposals.poll_short_title'] || t('.polls') %>"><%= t('.polls') %></span>
<span data-tooltip title="<%= Setting['proposals.poll_short_title'] || t("proposals_dashboard.menu.polls") %>">
<%= t("proposals_dashboard.menu.polls") %>
</span>
<% end %>
<% end %>
<% end %>
@@ -47,7 +49,7 @@
<%= link_to community_proposal_dashboard_index_path(proposal.to_param),
class: community_menu_class do %>
<span class="fi-torsos-all"></span>
<strong><%= t('.community') %></strong>
<strong><%= t("proposals_dashboard.menu.community") %></strong>
<% end %>
</li>
</ul>

8
app/views/proposals_dashboard/_next_goal.html.erb
View File

@@ -1,7 +1,7 @@
<% if next_goal.present? %>
<br><br>
<div class="action-title">
<h5><%= t('.title') %></h5>
<h5><%= t("proposals_dashboard.next_goal.title") %></h5>
<hr>
</div>
@@ -9,16 +9,16 @@
<%= render 'goal', goal: next_goal %>
<div class="column small-12">
<a data-toggle="complete-course next-goal"><%= t('.see_complete_course') %></a>
<a data-toggle="complete-course next-goal"><%= t("proposals_dashboard.next_goal.see_complete_course") %></a>
</div>
</div>
<% if course.count > 1 %>
<div class="hide" id="complete-course" data-toggler=".hide">
<%= render partial: 'goal', collection: course %>,
<%= render partial: 'goal', collection: course %>
<div class="column small-12">
<a data-toggle="complete-course next-goal"><%= t('.hide_course') %></a>
<a data-toggle="complete-course next-goal"><%= t("proposals_dashboard.next_goal.hide_course") %></a>
</div>
</div>
<% end %>

6
app/views/proposals_dashboard/_poll_resource.html.erb
View File

@@ -1,13 +1,13 @@
<% if can?(:manage_polls, proposal) %>
<div class="column">
<div class="card resource-card primary"
data-tooltip title="<%= t('proposals_dashboard.resource.request_resource') %>"
data-tooltip title="<%= t("proposals_dashboard.resource.request_resource") %>"
data-position="bottom" data-alignment="right">
<div class="card-section">
<p class="text-right">
<i class="fi-pencil"></i>
</p>
<h4 class="text-center"><%= t('proposals_dashboard.menu.polls') %></h4>
<h4 class="text-center"><%= t("proposals_dashboard.menu.polls") %></h4>
<p class="text-center">
<%= Setting['proposals.poll_short_title'] %>
</p>
@@ -15,7 +15,7 @@
<div class="card-section text-center bottom-container">
<div class="bottom-element text-center">
<%= 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' %>
</div>
</div>
</div>

2
app/views/proposals_dashboard/_recommended_actions.html.erb
View File

@@ -1,7 +1,7 @@
<% if proposed_actions.any? %>
<br><br>
<div class="action-title">
<h5><%= t('.title') %></h5>
<h5><%= t("proposals_dashboard.recommended_actions.title") %></h5>
<hr>
</div>

10
app/views/proposals_dashboard/_resource.html.erb
View File

@@ -21,13 +21,17 @@
<div class="card-section text-center bottom-container">
<% if resource.executed_for?(proposal) %>
<div class="bottom-element text-center">
<%= 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' %>
</div>
<% elsif resource.requested_for?(proposal) %>
<strong><%= t('.resource_requested') %></strong>
<strong><%= t("proposals_dashboard.resource.resource_requested") %></strong>
<% elsif resource.active_for?(proposal) %>
<div class="bottom-element text-center">
<%= 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' %>
</div>
<% else %>
<strong>

2
app/views/proposals_dashboard/_resources.html.erb
View File

@@ -1,6 +1,6 @@
<br><br>
<div class="action-title">
<h5><%= t('.available_resources') %></h5>
<h5><%= t("proposals_dashboard.resources.available_resources") %></h5>
<hr>
</div>

14
app/views/proposals_dashboard/community.html.erb
View File

@@ -1,35 +1,35 @@
<% content_for :action_title, t('proposals_dashboard.menu.community') %>
<% content_for :action_title, t("proposals_dashboard.menu.community") %>
<div class="row">
<div class="small-12 large-9 column">
<%= 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? %>
<p class="help-text"><%= t('.latest_activity', at: l(proposal.community.latest_activity.to_date)) %></p>
<p class="help-text"><%= t("proposals_dashboard.community.latest_activity", at: l(proposal.community.latest_activity.to_date)) %></p>
<% end %>
</div>
<div class="small-12 large-1 column community-totals">
<span class="fi-torsos-all"></span>
&nbsp;<strong><%= number_with_delimiter(proposal.community.participants_count, delimiter: '.') %></strong>
<p><%= t('.participants') %></p>
<p><%= t("proposals_dashboard.community.participants") %></p>
</div>
<div class="small-12 large-1 column community-totals">
<span class="fi-comment-quotes"></span>
&nbsp;<strong><%= number_with_delimiter(proposal.community.debates_count, delimiter: '.') %></strong>
<p><%= t('.debates') %></p>
<p><%= t("proposals_dashboard.community.debates") %></p>
</div>
<div class="small-12 large-1 column community-totals">
<span class="fi-comments"></span>
&nbsp;<strong><%= number_with_delimiter(proposal.community.comments_count, delimiter: '.') %></strong>
<p><%= t('.comments') %></p>
<p><%= t("proposals_dashboard.community.comments") %></p>
</div>
</div>
<% if proposal.community.comments.any? %>
<div class="action-title">
<h5><%= t('.latest_comments') %></h5>
<h5><%= t("proposals_dashboard.community.latest_comments") %></h5>
<hr>
</div>

12
app/views/proposals_dashboard/index.html.erb
View File

@@ -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 %>

2
app/views/proposals_dashboard/new_request.html.erb
View File

@@ -9,7 +9,7 @@
<div class="small-12 medium-4 column">
<% if proposal_dashboard_action.links.any? %>
<div class="proposal-dashboard-action-links">
<h3><%= t('.links') %></h3>
<h3><%= t("proposals_dashboard.new_request.links") %></h3>
<% proposal_dashboard_action.links.each do |link| %>
<% if link.open_in_new_tab %>
<%= link_to link.label, link.url, target: '_blank' %>

16
app/views/proposals_dashboard/progress.html.erb
View File

@@ -1,15 +1,15 @@
<% content_for :action_title, t('.title') %>
<% content_for :action_title, t("proposals_dashboard.progress.title") %>
<div class="row">
<div class="small-12 column">
<div class="button-group">
<%= 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}" %>
</div>
@@ -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;"></div>
</div>

12
app/views/users/_proposal.html.erb
View File

@@ -6,24 +6,24 @@
</td>
<td class="small-2 text-center">
<% if proposal.retired? %>
<span class="label alert"><%= t('users.proposals.retired') %></span>
<span class="label alert"><%= t("users.proposals.retired") %></span>
<% elsif proposal.draft? %>
<span class="label info"><%= t('users.proposals.draft') %></span>
<span class="label info"><%= t("users.proposals.draft") %></span>
<% else %>
<span class="label success"><%= t('users.proposals.published') %></span>
<span class="label success"><%= t("users.proposals.published") %></span>
<% end %>
</td>
<% if proposal.retired? %>
<td></td>
<td class="help-text"><%= t("users.proposals.retired_help_text") %></td>
<% elsif can?(:dashboard, proposal) %>
<td>
<%= 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' %>
</td>
<% else %>
<td class="text-center">
<%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %>
<%= link_to t("users.proposals.see"), proposal, class: 'button hollow' %>
</td>
<% end %>
</tr>

2
app/views/users/_proposals.html.erb
View File

@@ -2,7 +2,7 @@
<thead>
<th scope="col"><%= t("users.show.proposals") %></th>
<th scope="col" class="text-center"><%= t("users.show.proposals_status") %></th>
<th scope="col"></th>
<th scope="col" class="text-center"><%= t("users.proposals.actions") %></th>
</thead>
<tbody>
<% @proposals.each do |proposal| %>

6
config/locales/en/admin.yml
View File

@@ -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:

4
config/locales/en/general.yml
View File

@@ -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}.

6
config/locales/es/admin.yml
View File

@@ -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:

6
config/locales/es/general.yml
View File

@@ -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}.

2
config/locales/es/settings.yml
View File

@@ -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