Project

General

Profile

Patch #38732 » adjusting_elements_position_on_issue_edit_view.patch

Yasu Saku, 2023-06-16 11:51

View differences:

app/views/issues/_attributes.html.erb
59 59
</div>
60 60

  
61 61
<div class="splitcontentright">
62
<% if @issue.safe_attribute? 'parent_issue_id' %>
63
<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10,
64
                                      :required => @issue.required_attribute?('parent_issue_id'),
65
                                      :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
66
<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript(auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id))}')" %>
67
<% end %>
68

  
69 62
<% if @issue.safe_attribute? 'start_date' %>
70 63
<p id="start_date_area">
71 64
  <%= f.date_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
......
80 73
</p>
81 74
<% end %>
82 75

  
76
<% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
77
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
78
<% end %>
79

  
83 80
<% if @issue.safe_attribute? 'estimated_hours' %>
84 81
<p><%= f.hours_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
85 82
<% end %>
86 83

  
87
<% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
88
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
89
<% end %>
90 84
</div>
91 85
</div>
92 86

  
app/views/issues/_form.html.erb
15 15
                :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
16 16
<% end %>
17 17

  
18
<% if @issue.safe_attribute? 'parent_issue_id' %>
19
<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10,
20
                                      :required => @issue.required_attribute?('parent_issue_id'),
21
                                      :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
22
<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript(auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id))}')" %>
23
<% end %>
24

  
18 25
<% if @issue.safe_attribute?('tracker_id') || (@issue.persisted? && @issue.tracker_id_changed?) %>
19 26
<p>
20 27
  <%= f.select :tracker_id, trackers_options_for_select(@issue), {:required => true},
......
29 36
<p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true %></p>
30 37
<% end %>
31 38

  
39
<hr>
40

  
41
<div id="attributes" class="attributes">
42
  <%= render :partial => 'issues/attributes' %>
43
</div>
44

  
45
<hr>
46

  
32 47
<% if @issue.safe_attribute? 'description' %>
33 48
<p>
34 49
  <%= f.label_for_field :description, :required => @issue.required_attribute?('description') %>
......
45 60
<%= wikitoolbar_for 'issue_description', preview_issue_path(:project_id => @issue.project, :issue_id => @issue.id) %>
46 61
<% end %>
47 62

  
48
<div id="attributes" class="attributes">
49
  <%= render :partial => 'issues/attributes' %>
50
</div>
51

  
52 63
<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
53 64
<% end %>
54 65

  
public/stylesheets/application.css
601 601
.add-filter {width:35%; float:right; text-align: right; vertical-align: top;}
602 602

  
603 603
#issue_is_private_wrap {float:right; margin-right:1em;}
604
#parent_issue {float:right;}
604 605
.toggle-multiselect { margin-right:5px; cursor:pointer;}
605 606
.buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
606 607
.buttons .icon {padding-bottom:3px; padding-top:1px;}
(1-1/2)