| ... | ... |
@@ -50,60 +50,70 @@ |
| 50 | 50 |
%= include '/include/project_header'; |
| 51 | 51 |
%= include '/include/code_menu', display => 'commits'; |
| 52 | 52 |
|
| 53 |
- <div class="bk-blue-light padding5 border-gray" style="border-bottom:none"> |
|
| 53 |
+ <div class="bk-blue-light border-gray" style="border-bottom:none;padding:10px;border-top-left-radius:5px;border-top-right-radius:5px"> |
|
| 54 | 54 |
<div class="row"> |
| 55 |
- <div class="span8"> |
|
| 56 |
- <b> |
|
| 57 |
- <big> |
|
| 58 |
- <%= $commit->{title_short} %>
|
|
| 59 |
- % unless ($commit->{title_short} eq $commit->{title}) {
|
|
| 60 |
- ... |
|
| 61 |
- % } |
|
| 62 |
- </big> |
|
| 63 |
- </b> |
|
| 64 |
- % for (my $i = 0; $i < @{$commit->{comment}}; $i++) {
|
|
| 65 |
- % my $comment = $commit->{comment}[$i];
|
|
| 66 |
- % if ($i == 0) {
|
|
| 67 |
- % $comment =~ s/^\Q$commit->{title_short}//;
|
|
| 55 |
+ <div class="span10"> |
|
| 56 |
+ <big> |
|
| 57 |
+ % if ($commit->{title_short} eq $commit->{title}) {
|
|
| 58 |
+ <b><%= $commit->{title_short} %></b>;
|
|
| 59 |
+ % } else {
|
|
| 60 |
+ <% |
|
| 61 |
+ my $title_short = $commit->{title_short};
|
|
| 62 |
+ $title_short =~ s/\.\.\.\s*$//; |
|
| 63 |
+ use D;d $title_short; |
|
| 64 |
+ my $title_tail = $commit->{title};
|
|
| 65 |
+ $title_tail =~ s/^\Q$title_short//; |
|
| 66 |
+ $title_tail =~ s/^\s+//; |
|
| 67 |
+ %> |
|
| 68 |
+ <p style="margin-bottom:2px;"><b><%= $title_short %>...</b></p> |
|
| 69 |
+ <p style="margin-top:2px;margin-bottom:15px;">...<%= $title_tail %></p> |
|
| 68 | 70 |
% } |
| 69 |
- % if ($comment ne '') {
|
|
| 70 |
- <div> |
|
| 71 |
- <%= $comment %> |
|
| 72 |
- </div> |
|
| 73 |
- % } |
|
| 74 |
- % } |
|
| 71 |
+ </big> |
|
| 75 | 72 |
</div> |
| 76 |
- <div class="span3 offset1-mini text-right"> |
|
| 73 |
+ <div class="text-right"> |
|
| 77 | 74 |
<a class="btn btn-primary" href="<%= url_for("/$user/$project/tree/$commit->{id}") %>">
|
| 78 | 75 |
Browse code |
| 79 | 76 |
</a> |
| 80 | 77 |
</div> |
| 81 | 78 |
</div> |
| 82 |
- </div> |
|
| 83 |
- <div class="border-gray padding5" style="border-bottom:none"> |
|
| 84 |
- <span><%= $commit->{author_name} %></span>
|
|
| 85 |
- <span class="muted">authored <%= $commit->{age_string_age} %></span>
|
|
| 86 |
- </div> |
|
| 87 |
- <div class="border-gray padding5" style="padding-top:0;border-top:none;margin-bottom:20px"> |
|
| 88 |
- % my $parent = $commit->{parent};
|
|
| 89 |
- % my $parents = $commit->{parents};
|
|
| 90 |
- |
|
| 91 |
- % if (!defined $parent) {
|
|
| 92 |
- 0 <span class="muted">parent</span> |
|
| 93 |
- % } elsif (@$parents == 1) {
|
|
| 94 |
- 1 <span class="muted">parent</span> |
|
| 95 |
- <a class="font-black" href="<%= url_for("/$user/$project/commit/$parent") %>">
|
|
| 96 |
- <%= substr($parent, 0, 7) %> |
|
| 97 |
- </a> |
|
| 98 |
- % } else {
|
|
| 99 |
- <%= @$parents %> <span class="muted">parents</span>: |
|
| 100 |
- % for my $parent (@$parents) {
|
|
| 101 |
- <a class="font-black" href="<%= url_for("/$user/$project/commit/$parent") %>">
|
|
| 102 |
- <%= substr($parent, 0, 7) %> |
|
| 103 |
- </a> |
|
| 104 |
- % } |
|
| 79 |
+ % if (@{$commit->{comment}} > 1) {
|
|
| 80 |
+ <div style="padding-left:15px"> |
|
| 81 |
+ % for (my $i = 1; $i < @{$commit->{comment}}; $i++) {
|
|
| 82 |
+ <div> |
|
| 83 |
+ <%= $commit->{comment}[$i] %>
|
|
| 84 |
+ </div> |
|
| 85 |
+ % } |
|
| 86 |
+ </div> |
|
| 105 | 87 |
% } |
| 106 |
- <span class="muted">commit</span> <%= $commit->{id} %>
|
|
| 88 |
+ </div> |
|
| 89 |
+ <div class="border-gray" style="border-bottom-left-radius:5px;border-bottom-right-radius:5px"> |
|
| 90 |
+ <div class="row"> |
|
| 91 |
+ <div class="span4 padding5"> |
|
| 92 |
+ <span><b><%= $commit->{author_name} %></b></span>
|
|
| 93 |
+ <span class="muted">authored <%= $commit->{age_string_age} %></span>
|
|
| 94 |
+ </div> |
|
| 95 |
+ <div class="span7 padding5 text-right" style="margin-left:75px"> |
|
| 96 |
+ % my $parent = $commit->{parent};
|
|
| 97 |
+ % my $parents = $commit->{parents};
|
|
| 98 |
+ |
|
| 99 |
+ % if (!defined $parent) {
|
|
| 100 |
+ 0 <span class="muted">parent</span> |
|
| 101 |
+ % } elsif (@$parents == 1) {
|
|
| 102 |
+ 1 <span class="muted">parent</span> |
|
| 103 |
+ <a class="font-black" href="<%= url_for("/$user/$project/commit/$parent") %>">
|
|
| 104 |
+ <%= substr($parent, 0, 7) %> |
|
| 105 |
+ </a> |
|
| 106 |
+ % } else {
|
|
| 107 |
+ <%= @$parents %> <span class="muted">parents</span>: |
|
| 108 |
+ % for my $parent (@$parents) {
|
|
| 109 |
+ <a class="font-black" href="<%= url_for("/$user/$project/commit/$parent") %>">
|
|
| 110 |
+ <%= substr($parent, 0, 7) %> |
|
| 111 |
+ </a> |
|
| 112 |
+ % } |
|
| 113 |
+ % } |
|
| 114 |
+ <span class="muted">commit</span> <%= $commit->{id} %>
|
|
| 115 |
+ </div> |
|
| 116 |
+ </div> |
|
| 107 | 117 |
</div> |
| 108 | 118 |
|
| 109 | 119 |
<%= include '/include/difftree', id => $commit->{id}, from_id => $commit->{parent},
|