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

Adds styles to budget investment milestone status and fixes spec

Browse Source
This commit is contained in:
decabeza
2018-06-27 19:28:43 +02:00
parent fb5b993920
commit d683a6cd6b
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/participation.scss
View File

@@ -627,6 +627,15 @@
}
}
.milestone-status {
background: $budget;
border-radius: rem-calc(4);
color: #fff;
display: inline-block;
margin-top: $line-height / 6;
padding: $line-height / 4 $line-height / 2;
}
.show-actions-menu {
[class^="icon-"] {

18
app/views/admin/budget_investment_milestones/_form.html.erb
View File

@@ -5,17 +5,13 @@
<%= f.hidden_field :title, value: l(Time.current, format: :datetime),
maxlength: Budget::Investment::Milestone.title_max_length %>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.select :status_id,
@statuses.collect { |s| [s.name, s.id] },
{ include_blank: @statuses.any? ? '' : t('admin.milestones.form.no_statuses_defined') },
{ disabled: @statuses.blank? } %>
</div>
<div class="small-12 medium-6 column">
<%= link_to t('admin.milestones.form.admin_statuses'),
admin_budget_investment_statuses_path %>
</div>
<div class="small-12 medium-6 margin-bottom">
<%= f.select :status_id,
@statuses.collect { |s| [s.name, s.id] },
{ include_blank: @statuses.any? ? '' : t('admin.milestones.form.no_statuses_defined') },
{ disabled: @statuses.blank? } %>
<%= link_to t('admin.milestones.form.admin_statuses'),
admin_budget_investment_statuses_path %>
</div>
<%= f.label :description, t("admin.milestones.new.description") %>

12
app/views/budgets/investments/milestones/_milestone.html.erb
View File

@@ -10,6 +10,18 @@
</span>
<% end %>
<% if milestone.status.present? %>
<p>
<strong>
<%= t("budgets.investments.show.milestone_status_changed") %>
</strong>
<br>
<span class="milestone-status">
<%= milestone.status.name %>
</span>
</p>
<% end %>
<%= image_tag(milestone.image_url(:large), { id: "image_#{milestone.id}", alt: milestone.image.title, class: "margin" }) if milestone.image.present? %>
<% globalize(neutral_locale(locale)) do %>

2
spec/features/admin/budget_investment_milestones_spec.rb
View File

@@ -42,7 +42,7 @@ feature 'Admin budget investment milestones' do
click_link 'Create new milestone'
select status.name, from: 'budget_investment_milestone_status_id'
fill_in 'budget_investment_milestone_description', with: 'New description milestone'
fill_in 'budget_investment_milestone_description_en', with: 'New description milestone'
fill_in 'budget_investment_milestone_publication_date', with: Date.current
click_button 'Create milestone'