Project

General

Profile

Defect #43168 » fix-43168.diff

Mizuki ISHIKAWA, 2025-08-29 10:18

View differences:

app/assets/stylesheets/responsive.css
764 764
    text-align: left;
765 765
  }
766 766

  
767
  /* subtasks and related issues list on issue show */
768
  #issue_tree .issues, #relations .issues {
767
  /* subtasks and related issues list on issue show (without headers) */
768
  #issue_tree table:not(.with-headers) .issues,
769
  #relations table:not(.with-headers) .issues {
769 770
    border-collapse: separate;
770 771
    border-spacing: 0 1em; /* vertical space between tasks */
771 772
  }
772 773

  
773
  #issue_tree .issue > td:not(.checkbox), #relations .issue > td:not(.checkbox) {
774
  #issue_tree table:not(.with-headers) .issue > td:not(.checkbox),
775
  #relations table:not(.with-headers) .issue > td:not(.checkbox) {
774 776
    display: block;
775 777
    float: left;
776 778
    text-align: left;
777 779
    padding-right: 5px;
778 780
  }
779 781

  
780
  #issue_tree .issue > td.subject, #relations .issue > td.subject {
782
  #issue_tree table:not(.with-headers) .issue > td.subject,
783
  #relations table:not(.with-headers) .issue > td.subject {
781 784
    width: 100%; /* let subject have one full width column */
782 785
  }
783 786

  
784
  #issue_tree .issue:has(.buttons a) > td.subject, #relations .issue:has(.buttons a) > td.subject {
787
  #issue_tree table:not(.with-headers) .issue:has(.buttons a) > td.subject,
788
  #relations table:not(.with-headers) .issue:has(.buttons a) > td.subject {
785 789
    padding-right: 40px;
786 790
  }
787 791

  
788
  #issue_tree .issue > td:not(.subject), #relations .issue > td:not(.subject) {
792
  #issue_tree table:not(.with-headers) .issue > td:not(.subject),
793
  #relations table:not(.with-headers) .issue > td:not(.subject) {
789 794
    width: 20%; /* three columns for all cells that are not subject */
790 795
  }
791 796

  
792
  #issue_tree .issues, #issue_tree .issue,
793
  #relations .issues, #relations .issue {
797
  #issue_tree table:not(.with-headers) .issues, #issue_tree .issue,
798
  #relations table:not(.with-headers) .issues, #relations .issue {
794 799
    position: relative; /* needed for .buttons positioning */
795 800
  }
796 801

  
797 802
  /* positioniong of unline button */
798
  #issue_tree .issue > td.buttons,
799
  #relations .issue > td.buttons {
803
  #issue_tree table:not(.with-headers) .issue > td.buttons,
804
  #relations table:not(.with-headers) .issue > td.buttons {
800 805
    text-align: right;
801 806
    position: absolute;
802 807
    right: 0;
......
804 809
    padding-right: 0;
805 810
  }
806 811

  
807
  #issue_tree .issue .buttons a,
808
  #relations .issue .buttons a {
812
  #issue_tree table:not(.with-headers) .issue .buttons a,
813
  #relations table:not(.with-headers) .issue .buttons a {
809 814
    vertical-align: middle;
810 815
  }
811 816

  
817
  /* subtasks and related issues list on issue show (with headers) */
818
  #issue_tree .subtasks-wrapper:has(table.with-headers),
819
  #relations .relation-issues-wrapper:has(table.with-headers) {
820
    overflow-x: scroll;
821
  }
822

  
823
  #issue_tree table.with-headers .issue > td.subject,
824
  #relations table.with-headers .issue > td.subject {
825
    min-width: 15rem;
826
  }
827

  
812 828
  /* attachment upload form */
813 829
  .attachments_fields span {
814 830
    position: relative;
app/helpers/issues_helper.rb
105 105
    columns_list = get_related_issues_columns_for_project(issue)
106 106

  
107 107
    manage_relations = User.current.allowed_to?(:manage_subtasks, issue.project)
108
    s = +'<table class="list issues odd-even">'
108

  
109
    table_classes = 'list issues odd-even'
110
    table_classes += ' with-headers' if Setting.display_related_issues_table_headers?
111
    s = "<table class=\"#{table_classes}\">"
109 112

  
110 113
    if Setting.display_related_issues_table_headers?
111 114
      headers = [l(:field_subject)]
......
251 254
      row_content << content_tag('td', buttons, class: 'buttons')
252 255
      s << content_tag('tr', row_content, id: "relation-#{relation.id}", class: css)
253 256
    end
254
    content_tag('table', s, :class => 'list issues odd-even')
257

  
258
    table_classes = 'list issues odd-even'
259
    table_classes += ' with-headers' if Setting.display_related_issues_table_headers?
260
    content_tag('table', s, :class => table_classes)
255 261
  end
256 262

  
257 263
  def issue_estimated_hours_details(issue)
app/views/issues/_relations.html.erb
11 11

  
12 12
<% if @relations.present? %>
13 13
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
14
  <%= render_issue_relations(@issue, @relations) %>
14
  <div class="relation-issues-wrapper">
15
    <%= render_issue_relations(@issue, @relations) %>
16
  </div>
15 17
<% end %>
16 18
<% end %>
17 19

  
app/views/issues/_subtasks.html.erb
8 8
</p>
9 9

  
10 10
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
11
  <%= render_descendants_tree(@issue) unless @issue.leaf? %>
11
  <div class="subtasks-wrapper">
12
    <%= render_descendants_tree(@issue) unless @issue.leaf? %>
13
  </div>
12 14
<% end %>
(4-4/4)