dinislage/redmine_contracts
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#4650] Added labels to the Fixed Budget form

Browse Source
This commit is contained in:
Eric Davis committed 2010-10-14 13:05:02 -07:00
1 parent 5a0cb948c9
commit 2aea176df0
2 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/deliverables/_finance_form.html.erb
+9 -11
View File
@@ -66,26 +66,24 @@
<%= fixed_budget.hidden_field(:year) %> <%= fixed_budget.hidden_field(:year) %>
<%= fixed_budget.hidden_field(:month) %> <%= fixed_budget.hidden_field(:month) %>
<p class="inline-hints" style="display:none;"><%= fixed_budget.label(:title, l(:field_title))%></p> <p class="inline-hints"><%= fixed_budget.label(:title, l(:field_title))%>
<%= fixed_budget.text_field(:title) %> <%= fixed_budget.text_field(:title) %>
</p>
<p class="inline-hints"> <p class="inline-hints">
<%= fixed_budget.label(:budget, l(:field_budget), :style => 'display: none;')%> <%# Hidden label :| %> <%= fixed_budget.label(:budget, l(:field_budget))%> <%= l(:text_dollar_sign) %>
<%= l(:text_dollar_sign) %> <%= fixed_budget.text_field(:budget, :value => format_deliverable_value_fields(fixed_budget.object.budget), :class => 'financial') %>
</p> </p>
<%= fixed_budget.text_field(:budget, :value => format_deliverable_value_fields(fixed_budget.object.budget), :class => 'financial') %>
<p class="inline-hints"> <p class="inline-hints">
<%= fixed_budget.label(:markup, l(:field_markup), :style => 'display: none;')%> <%# Hidden label :| %> <%= fixed_budget.label(:markup, l(:field_markup)) %> <%= l(:field_discount_hint) %>
<%= l(:field_discount_hint) %> <%= fixed_budget.text_field(:markup, :value => format_deliverable_value_fields_as_dollar_or_percent(fixed_budget.object.markup), :class => 'financial') %>
</p> </p>
<%= fixed_budget.text_field(:markup, :value => format_deliverable_value_fields_as_dollar_or_percent(fixed_budget.object.markup), :class => 'financial') %>
<p class="inline-hints"> <p class="inline-hints">
<%= fixed_budget.label(:paid, l(:field_paid), :style => 'display: none;') %><%# Hidden label :| %> <%= fixed_budget.label(:paid, l(:field_paid)) %>
<%= l(:field_paid) %> <%= fixed_budget.check_box(:paid) %>
</p> </p>
<%= fixed_budget.check_box(:paid) %>
<p class="inline-hints" style="display:none;"><%= fixed_budget.label(:description, l(:field_description), :for => "fixed-description#{fixed_budget.object.object_id}")%></p> <p class="inline-hints" style="display:none;"><%= fixed_budget.label(:description, l(:field_description), :for => "fixed-description#{fixed_budget.object.object_id}")%></p>
<%= fixed_budget.text_area(:description, :class => 'wiki-edit', :rows => '5', :id => "fixed-description#{fixed_budget.object.object_id}") %> <%= fixed_budget.text_area(:description, :class => 'wiki-edit', :rows => '5', :id => "fixed-description#{fixed_budget.object.object_id}") %>
assets/stylesheets/redmine_contracts.css
+3 -1
View File
@@ -132,7 +132,9 @@ input.financial{
border: 0; border: 0;
} }
.deliverable_finance_table p.inline-hints label {font-weight: normal; float: none; display: auto; margin-left: 0px; } /* An inline label so it needs to be reset from .tabular */ .deliverable-finances p.inline-hints label {font-weight: normal; float: none; display: auto; margin-left: 0px; } /* An inline label so it needs to be reset from .tabular */
.deliverable-finances .fixed-item-form p.inline-hints { margin-right: 13px; }
#expand_terms{ #expand_terms{
margin: 10px 0 10px 0; margin: 10px 0 10px 0;