aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Magorsch <arzano@gentoo.org>2020-02-21 00:44:10 +0100
committerMax Magorsch <arzano@gentoo.org>2020-02-21 00:44:10 +0100
commit5b6c9f8d53caff642bf23169fc7747a2430d3634 (patch)
treeb2bb8e27969930196fa73b6816a82e483b04c001
parentUse the new Tyrian inline searchbar style (diff)
downloadpackages-5-5b6c9f8d53caff642bf23169fc7747a2430d3634.tar.gz
packages-5-5b6c9f8d53caff642bf23169fc7747a2430d3634.tar.bz2
packages-5-5b6c9f8d53caff642bf23169fc7747a2430d3634.zip
Condense the changelogs
Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r--app/views/packages/_changelog_entry.html.erb28
1 files changed, 12 insertions, 16 deletions
diff --git a/app/views/packages/_changelog_entry.html.erb b/app/views/packages/_changelog_entry.html.erb
index c6a2e32..a48b892 100644
--- a/app/views/packages/_changelog_entry.html.erb
+++ b/app/views/packages/_changelog_entry.html.erb
@@ -1,22 +1,18 @@
<li class="list-group-item">
<strong><%= annotate_bugs changelog.message.lines.first %></strong>
<div class="kk-byline">
- <table>
- <tr>
- <td class="pr-3">author </td>
- <td class="pr-3"><img class="rounded-sm inline" src="<%= gravatar_url changelog.author_email %>"> <%= changelog.author_name %> &lt;<%= changelog.author_email %>&gt;</td>
- <td><%= i18n_date(changelog.author_date) %></td>
- </tr>
- <tr>
- <td class="pr-3">committer </td>
- <td class="pr-3"><img class="rounded-sm inline" src="<%= gravatar_url changelog.committer_email %>"> <%= changelog.committer_name%> &lt;<%= changelog.committer_email %>&gt;</td>
- <td><%= i18n_date(changelog.committer_date) %></td>
- </tr>
- <tr>
- <td class="pr-3">commit </td>
- <td colspan="2"><%= full_link_to_gitweb_commit changelog.id%> (<a href="<%= gitweb_patch_url changelog.id%>">patch</a>)</td>
- </tr>
- </table>
+
+ <img class="rounded-sm inline" data-toggle="popover" data-img="http://placehold.it/400x200" src="<%= gravatar_url changelog.author_email %>">
+ <%= mail_to changelog.author_email, changelog.author_name %>
+ <%= i18n_date(changelog.author_date) %>,
+
+ <% if changelog.author_name != changelog.committer_name || changelog.author_date != changelog.committer_date %>
+ <img class="rounded-sm inline" src="<%= gravatar_url changelog.committer_email %>">
+ <%= mail_to changelog.committer_email, changelog.committer_name%>
+ <%= i18n_date(changelog.committer_date) %>,
+ <% end %>
+
+ commit <%= link_to_gitweb_commit changelog.id%>
</div>
<table class="table table-condensed kk-changelog-diffstat">