From 05e0ecf38b2296bab673a43db66385e48e3eb7aa Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Thu, 20 Jun 2019 21:50:01 +0000 Subject: [PATCH 1/3] Wrap each entry in a box --- app/views/issues/tabs/_changesets.html.erb | 36 ++++++++++---------- app/views/issues/tabs/_time_entries.html.erb | 50 +++++++++++++++------------- public/stylesheets/application.css | 18 ++++------ 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/app/views/issues/tabs/_changesets.html.erb b/app/views/issues/tabs/_changesets.html.erb index f869a5d..5801b15 100644 --- a/app/views/issues/tabs/_changesets.html.erb +++ b/app/views/issues/tabs/_changesets.html.erb @@ -1,23 +1,25 @@ <% @changesets.each do |changeset| %>
-

- <%= avatar(changeset.user, :size => "24") %> - <%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %> -

-

<%= link_to_revision(changeset, changeset.repository, - :text => "#{l(:label_revision)} #{changeset.format_identifier}") %> - <% if changeset.filechanges.any? && User.current.allowed_to?(:browse_repository, changeset.project) %> - (<%= link_to(l(:label_diff), - :controller => 'repositories', - :action => 'diff', - :id => changeset.project, - :repository_id => changeset.repository.identifier_param, - :path => "", - :rev => changeset.identifier) %>) - <% end %>

+
+

+ <%= avatar(changeset.user, :size => "24") %> + <%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %> +

+

<%= link_to_revision(changeset, changeset.repository, + :text => "#{l(:label_revision)} #{changeset.format_identifier}") %> + <% if changeset.filechanges.any? && User.current.allowed_to?(:browse_repository, changeset.project) %> + (<%= link_to(l(:label_diff), + :controller => 'repositories', + :action => 'diff', + :id => changeset.project, + :repository_id => changeset.repository.identifier_param, + :path => "", + :rev => changeset.identifier) %>) + <% end %>

-
- <%= format_changeset_comments changeset %> +
+ <%= format_changeset_comments changeset %> +
<%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %> diff --git a/app/views/issues/tabs/_time_entries.html.erb b/app/views/issues/tabs/_time_entries.html.erb index c34edc0..9e485bf 100644 --- a/app/views/issues/tabs/_time_entries.html.erb +++ b/app/views/issues/tabs/_time_entries.html.erb @@ -1,28 +1,30 @@ <% for time_entry in time_entries%>
- <% if time_entry.editable_by?(User.current) -%> -
- <%= link_to l(:button_edit), edit_time_entry_path(time_entry), - :title => l(:button_edit), - :class => 'icon-only icon-edit' %> - <%= link_to l(:button_delete), time_entry_path(time_entry), - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :title => l(:button_delete), - :class => 'icon-only icon-del' %> -
- <% end -%> -

- <%= avatar(time_entry.user, :size => "24") %> - <%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %> -

-
    -
  • - <%= l(:label_time_entry_plural) %>: - <%= l_hours_short time_entry.hours %> -
    • -
-

<%= time_entry.comments %>

+
+ <% if time_entry.editable_by?(User.current) -%> +
+ <%= link_to l(:button_edit), edit_time_entry_path(time_entry), + :title => l(:button_edit), + :class => 'icon-only icon-edit' %> + <%= link_to l(:button_delete), time_entry_path(time_entry), + :data => {:confirm => l(:text_are_you_sure)}, + :method => :delete, + :title => l(:button_delete), + :class => 'icon-only icon-del' %> +
+ <% end -%> +

+ <%= avatar(time_entry.user, :size => "24") %> + <%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %> +

+
    +
  • + <%= l(:label_time_entry_plural) %>: + <%= l_hours_short time_entry.hours %> +
    • +
+

<%= time_entry.comments %>

+
<%= call_hook(:view_issues_history_time_entry_bottom, { :time_entry => time_entry }) %> -<% end %> \ No newline at end of file +<% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1dc44f3..97b613f 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -6,7 +6,7 @@ h1, h2, h3, h4 {font-family: "Trebuchet MS", Verdana, sans-serif;padding: 2px 10 h2, .wiki h1 {font-size: 20px;} h3, .wiki h2 {font-size: 16px;} h4, .wiki h3 {font-size: 13px;} -h4 {border-bottom: 1px solid #ccc; font-weight:normal;} +h4 {border-bottom: 1px solid #ccc; font-weight: normal;} pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} /***** Layout *****/ @@ -540,23 +540,17 @@ div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; } div#issue-changesets p { margin-top: 0; margin-bottom: 1em;} .changeset-comments {margin-bottom:1em;} +div.journal {padding: 15px 6px; border: 1px solid #d7d7d7; border-radius: 3px; margin: 10px 0;} div.journal .contextual {margin-top: 0;} +div.journal div.wiki > :last-child {margin-bottom: 0;} div.journal.private-notes .wiki {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;} -div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 1.5em;} +div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 0;} div.journal ul.details a, ul.revision-info a {color:#70A7CD;} div.journal ul.details a:hover, ul.revision-info a:hover {color:#D14848;} -body.avatars-on div.journal {padding-left:32px;} +body.avatars-on div.journal > div {padding-left:32px;} +div.journal h4 {border-bottom: 0} div.journal h4 img.gravatar {margin-left:-32px;} -#history .tab-content { - padding: 0 6px; - margin-bottom: 10px; - border-right: 1px solid #d7d7d7; - border-bottom: 1px solid #d7d7d7; - border-left: 1px solid #d7d7d7; - border-radius: 0 0 3px 3px / 0 0 3px 3px; -} - #history div:target h4 {background-color:#DDEEFF;} #history p.nodata {display: none;} -- 2.1.4