diff --git a/app/views/deliverables/_finance_form.html.erb b/app/views/deliverables/_finance_form.html.erb index d4118fa..b77a973 100644 --- a/app/views/deliverables/_finance_form.html.erb +++ b/app/views/deliverables/_finance_form.html.erb @@ -1,5 +1,9 @@ <% form.inputs :name => label, :class => "deliverable-finances #{fieldset_class}" do %> + +
  • <%= content_tag(:label, l(:field_labor)) %> diff --git a/assets/javascripts/contracts.js b/assets/javascripts/contracts.js index 247b391..5d37437 100644 --- a/assets/javascripts/contracts.js +++ b/assets/javascripts/contracts.js @@ -48,12 +48,20 @@ jQuery(function($) { if (deliverableType == 'FixedDeliverable') { showDeliverableTotal(); hideDeliverableFrequency(); + $('#retainer-finances-message').hide(); } else if(deliverableType == "HourlyDeliverable") { hideDeliverableTotal(); hideDeliverableFrequency(); + $('#retainer-finances-message').hide(); } else if(deliverableType == "RetainerDeliverable") { hideDeliverableTotal(); showDeliverableFrequency(); + if ($('form.deliverable #deliverable_stored_id').val() == '') { + $('#retainer-finances-message').show(); + } else { + $('#retainer-finances-message').hide(); + } + } }, diff --git a/config/locales/en.yml b/config/locales/en.yml index f96dd41..7a82241 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -66,3 +66,4 @@ en: text_missing_period: "This deliverable is missing a date range so it cannot have budget items. Please save start and end dates before adding any budget items." text_changed_period_message: "The period for this deliverable has been changed. Would you like to expand/shrink the Deliverable Finances?" field_current_period: "Current period" + text_retainer_monthly_message: "For a single month"