Project

General

Profile

Download (6.93 KB)

Patch #31573 » 0001-Wrap-each-entry-in-a-box.patch

Marius BĂLTEANU, 2019-06-21 00:03

View differences:

app/views/issues/tabs/_changesets.html.erb
1 1 
<% @changesets.each do |changeset| %>
2 2 
  <div id="changeset-<%= changeset.id %>" class="changeset journal">
3 
    <h4>
4 
      <%= avatar(changeset.user, :size => "24") %>
5 
      <%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %>
6 
    </h4>
7 
    <p><%= link_to_revision(changeset, changeset.repository,
8 
                        :text => "#{l(:label_revision)} #{changeset.format_identifier}") %>
9 
    <% if changeset.filechanges.any? && User.current.allowed_to?(:browse_repository, changeset.project) %>
10 
    (<%= link_to(l(:label_diff),
11 
           :controller => 'repositories',
12 
           :action => 'diff',
13 
           :id     => changeset.project,
14 
           :repository_id => changeset.repository.identifier_param,
15 
           :path   => "",
16 
           :rev    => changeset.identifier) %>)
17 
    <% end %></p>
3 
    <div>
4 
      <h4>
5 
        <%= avatar(changeset.user, :size => "24") %>
6 
        <%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %>
7 
      </h4>
8 
      <p><%= link_to_revision(changeset, changeset.repository,
9 
                          :text => "#{l(:label_revision)} #{changeset.format_identifier}") %>
10 
      <% if changeset.filechanges.any? && User.current.allowed_to?(:browse_repository, changeset.project) %>
11 
      (<%= link_to(l(:label_diff),
12 
             :controller => 'repositories',
13 
             :action => 'diff',
14 
             :id     => changeset.project,
15 
             :repository_id => changeset.repository.identifier_param,
16 
             :path   => "",
17 
             :rev    => changeset.identifier) %>)
18 
      <% end %></p>
18 19 

  		




  19
  
  
    
    <div class="wiki changeset-comments">

  		




  20
  
  
    
      <%= format_changeset_comments changeset %>

  		




  
  20
  
    
      <div class="wiki changeset-comments">

  		




  
  21
  
    
        <%= format_changeset_comments changeset %>

  		




  
  22
  
    
      </div>

  		




  21
  23
  
    
    </div>

  		




  22
  24
  
    
  </div>

  		




  23
  25
  
    
  <%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %>

  		












  

    
      app/views/issues/tabs/_time_entries.html.erb
    
  





  1
  1
  
    
<% for time_entry in time_entries%>

  		




  2
  2
  
    
  <div id="time-entry-<%= time_entry.id %>" class="time_entry journal">

  		




  3
  
  
    
    <% if time_entry.editable_by?(User.current) -%>

  		




  4
  
  
    
      <div class="contextual">

  		




  5
  
  
    
        <%= link_to l(:button_edit), edit_time_entry_path(time_entry),

  		




  6
  
  
    
                    :title => l(:button_edit),

  		




  7
  
  
    
                    :class => 'icon-only icon-edit' %>

  		




  8
  
  
    
        <%= link_to l(:button_delete), time_entry_path(time_entry),

  		




  9
  
  
    
                    :data => {:confirm => l(:text_are_you_sure)},

  		




  10
  
  
    
                    :method => :delete,

  		




  11
  
  
    
                    :title => l(:button_delete),

  		




  12
  
  
    
                    :class => 'icon-only icon-del' %>

  		




  13
  
  
    
      </div>

  		




  14
  
  
    
    <% end -%>

  		




  15
  
  
    
    <h4>

  		




  16
  
  
    
      <%= avatar(time_entry.user, :size => "24") %>

  		




  17
  
  
    
      <%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %>

  		




  18
  
  
    
    </h4>

  		




  19
  
  
    
    <ul class="details">

  		




  20
  
  
    
      <li>

  		




  21
  
  
    
        <strong><%= l(:label_time_entry_plural) %></strong>:

  		




  22
  
  
    
        <%= l_hours_short time_entry.hours %>

  		




  23
  
  
    
      </li>

  		




  24
  
  
    
    </ul>

  		




  25
  
  
    
    <p><%= time_entry.comments %></p>

  		




  
  3
  
    
    <div>

  		




  
  4
  
    
      <% if time_entry.editable_by?(User.current) -%>

  		




  
  5
  
    
        <div class="contextual">

  		




  
  6
  
    
          <%= link_to l(:button_edit), edit_time_entry_path(time_entry),

  		




  
  7
  
    
                      :title => l(:button_edit),

  		




  
  8
  
    
                      :class => 'icon-only icon-edit' %>

  		




  
  9
  
    
          <%= link_to l(:button_delete), time_entry_path(time_entry),

  		




  
  10
  
    
                      :data => {:confirm => l(:text_are_you_sure)},

  		




  
  11
  
    
                      :method => :delete,

  		




  
  12
  
    
                      :title => l(:button_delete),

  		




  
  13
  
    
                      :class => 'icon-only icon-del' %>

  		




  
  14
  
    
        </div>

  		




  
  15
  
    
      <% end -%>

  		




  
  16
  
    
      <h4>

  		




  
  17
  
    
        <%= avatar(time_entry.user, :size => "24") %>

  		




  
  18
  
    
        <%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %>

  		




  
  19
  
    
      </h4>

  		




  
  20
  
    
      <ul class="details">

  		




  
  21
  
    
        <li>

  		




  
  22
  
    
          <strong><%= l(:label_time_entry_plural) %></strong>:

  		




  
  23
  
    
          <%= l_hours_short time_entry.hours %>

  		




  
  24
  
    
        </li>

  		




  
  25
  
    
      </ul>

  		




  
  26
  
    
      <p><%= time_entry.comments %></p>

  		




  
  27
  
    
    </div>

  		




  26
  28
  
    
  </div>

  		




  27
  29
  
    
  <%= call_hook(:view_issues_history_time_entry_bottom, { :time_entry => time_entry }) %>

  		




  28
  
  
    
<% end %>

  		




  
  30
  
    
<% end %>

  		












  

    
      public/stylesheets/application.css
    
  





  6
  6
  
    
h2, .wiki h1 {font-size: 20px;}

  		




  7
  7
  
    
h3, .wiki h2 {font-size: 16px;}

  		




  8
  8
  
    
h4, .wiki h3 {font-size: 13px;}

  		




  9
  
  
    
h4 {border-bottom: 1px solid #ccc; font-weight:normal;}

  		




  
  9
  
    
h4 {border-bottom: 1px solid #ccc; font-weight: normal;}

  		




  10
  10
  
    
pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}

  		




  11
  11
  
    

  		




  12
  12
  
    
/***** Layout *****/

  		




  ......




  540
  540
  
    
div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}

  		




  541
  541
  
    
.changeset-comments {margin-bottom:1em;}

  		




  542
  542
  
    

  		




  
  543
  
    
div.journal {padding: 15px 6px; border: 1px solid #d7d7d7; border-radius: 3px; margin: 10px 0;}

  		




  543
  544
  
    
div.journal .contextual {margin-top: 0;}

  		




  
  545
  
    
div.journal div.wiki > :last-child {margin-bottom: 0;}

  		




  544
  546
  
    
div.journal.private-notes .wiki {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}

  		




  545
  
  
    
div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 1.5em;}

  		




  
  547
  
    
div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 0;}

  		




  546
  548
  
    
div.journal ul.details a, ul.revision-info a {color:#70A7CD;}

  		




  547
  549
  
    
div.journal ul.details a:hover, ul.revision-info a:hover {color:#D14848;}

  		




  548
  
  
    
body.avatars-on div.journal {padding-left:32px;}

  		




  
  550
  
    
body.avatars-on div.journal > div {padding-left:32px;}

  		




  
  551
  
    
div.journal h4 {border-bottom: 0}

  		




  549
  552
  
    
div.journal h4 img.gravatar {margin-left:-32px;}

  		




  550
  553
  
    

  		




  551
  
  
    
#history .tab-content {

  		




  552
  
  
    
  padding: 0 6px;

  		




  553
  
  
    
  margin-bottom: 10px;

  		




  554
  
  
    
  border-right: 1px solid #d7d7d7;

  		




  555
  
  
    
  border-bottom: 1px solid #d7d7d7;

  		




  556
  
  
    
  border-left: 1px solid #d7d7d7;

  		




  557
  
  
    
  border-radius: 0 0 3px 3px / 0 0 3px 3px;

  		




  558
  
  
    
}

  		




  559
  
  
    

  		




  560
  554
  
    
#history div:target h4 {background-color:#DDEEFF;}

  		




  561
  555
  
    
#history p.nodata {display: none;}

  		




  562
  556
  
    

  		















  (3-3/8)