diff options
| -rw-r--r-- | app/views/issues/_edit.html.erb | 6 | ||||
| -rw-r--r-- | app/views/issues/_form.html.erb | 14 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 9c99b234d..022d159f1 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -2,11 +2,7 @@ <%= error_messages_for 'issue', 'time_entry' %> <div class="box"> <% if @edit_allowed || !@allowed_statuses.empty? %> - <fieldset class="tabular"><legend><%= l(:label_change_properties) %> - <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %> - <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small> - <% end %> - </legend> + <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend> <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %> </fieldset> <% end %> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 57258fece..8b5c014a5 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -1,6 +1,5 @@ <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %> -<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>> <% if @issue.safe_attribute_names.include?('is_private') %> <p style="float:right; margin-right:1em;"> <label class="inline" for="issue_is_private" id="issue_is_private_label"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label> @@ -12,12 +11,19 @@ :with => "Form.serialize('issue-form')" %> <p><%= f.text_field :subject, :size => 80, :required => true %></p> -<p><%= f.text_area :description, +<p> + <label><%= l(:field_description) %></label> + <%= link_to_function image_tag('edit.png'), + 'Element.hide(this); Effect.toggle("issue_description_and_toolbar", "appear", {duration:0.3})' unless @issue.new_record? %> + <% content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %> + <%= f.text_area :description, :cols => 60, :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), :accesskey => accesskey(:edit), - :class => 'wiki-edit' %></p> -</div> + :class => 'wiki-edit', + :no_label => true %> + <% end %> +</p> <div id="attributes" class="attributes"> <%= render :partial => 'issues/attributes' %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 7c42e6f20..94bac1af0 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -405,7 +405,7 @@ p.pagination {margin-top:8px;} margin: 0; padding: 3px 0 3px 0; padding-left: 180px; /* width of left column containing the label elements */ -height: 1%; +min-height: 1.8em; clear:left; } |