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

Merge branch 'master' into 1647-locale_site_customization

Browse Source
This commit is contained in:
Raimond Garcia
2017-07-04 12:11:07 +02:00
committed by GitHub
parent ecaf7192c5 92f2bd67b3
commit e7e5b3c4a3
24 changed files with 175 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/admin/budget_investments/_investments.html.erb
View File

@@ -12,7 +12,9 @@
<th><%= t("admin.budget_investments.index.table_feasibility") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_valuation_finished") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_selection") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_winner") %></th>
<% if params[:filter] == 'selected' %>
<th class="text-center"><%= t("admin.budget_investments.index.table_incompatible") %></th>
<% end %>
</tr>
</thead>
@@ -75,9 +77,11 @@
<% end %>
<% end %>
</td>
<td class="small text-center">
<%= investment.winner? ? t('shared.yes'): t('shared.no') %>
</td>
<% if params[:filter] == 'selected' %>
<td class="small text-center">
<%= investment.incompatible? ? t('shared.yes'): t('shared.no') %>
</td>
<% end %>
</tr>
<% end %>
</table>

15
app/views/admin/budget_investments/edit.html.erb
View File

@@ -61,9 +61,20 @@
</div>
</div>
<p class="clear">
<h2 id="incompatible"><%= t("admin.budget_investments.edit.compatibility") %></h2>
<div class="row">
<div class="small-12 medium-8 column">
<%= f.label :incompatible do %>
<%= f.check_box :incompatible, title: t('admin.budget_investments.edit.compatibility'), label: false %>
<span class="checkbox"><%= t("admin.budget_investments.edit.mark_as_incompatible") %></span>
<% end %>
</div>
</div>
<div class="margin-top">
<%= f.submit(class: "button", value: t("admin.budget_investments.edit.submit_button")) %>
</p>
</div>
<% end %>
<hr>

5
app/views/admin/budget_investments/show.html.erb
View File

@@ -56,3 +56,8 @@
<p>
<%= link_to t("admin.budget_investments.show.new_milestone"), new_admin_budget_budget_investment_budget_investment_milestone_path(@budget, @investment) %>
</p>
<h2 id="incompatible"><%= t("admin.budget_investments.show.compatibility.title") %></h2>
<p id="incompatible">
<%= t("admin.budget_investments.show.compatibility.#{@investment.incompatible?}") %>
</p>