| ... | ... |
@@ -4,16 +4,12 @@ |
| 4 | 4 |
# API |
| 5 | 5 |
my $api = Gitprep::API->new($self); |
| 6 | 6 |
|
| 7 |
+ # Parameters |
|
| 7 | 8 |
my $user = param('user');
|
| 8 | 9 |
my $project = param('project');
|
| 9 |
- |
|
| 10 | 10 |
my $root_ns = $api->root_ns(config->{root});
|
| 11 |
- |
|
| 12 |
- # Parameters |
|
| 13 | 11 |
my $project_ns = "$root_ns/$user/$project.git"; |
| 14 | 12 |
my $project = "/$project_ns"; |
| 15 |
- my $home_ns = $api->dirname($project_ns); |
|
| 16 |
- my $home = "/$home_ns"; |
|
| 17 | 13 |
|
| 18 | 14 |
# Git |
| 19 | 15 |
my $git = $self->app->git; |
| ... | ... |
@@ -47,12 +43,12 @@ |
| 47 | 43 |
.branches {
|
| 48 | 44 |
width:100%; |
| 49 | 45 |
} |
| 50 |
- .branches .default {
|
|
| 46 |
+ .branches .bdefault {
|
|
| 51 | 47 |
width:100%; |
| 52 | 48 |
background-color:black; |
| 53 | 49 |
color:white; |
| 54 | 50 |
} |
| 55 |
- .branches .default td {
|
|
| 51 |
+ .branches .bdefault td {
|
|
| 56 | 52 |
padding-left:5px; |
| 57 | 53 |
padding-right:5px; |
| 58 | 54 |
} |
| ... | ... |
@@ -62,22 +58,21 @@ |
| 62 | 58 |
border-bottom:1px solid #E5E5E5; |
| 63 | 59 |
vertical-align:middle; |
| 64 | 60 |
} |
| 65 |
- .branches .name {
|
|
| 61 |
+ .branches .bname {
|
|
| 66 | 62 |
font-size:120%; |
| 67 | 63 |
font-weight:bold; |
| 68 | 64 |
} |
| 69 | 65 |
|
| 70 |
- .branches .last_updated {
|
|
| 66 |
+ .branches .blast_updated {
|
|
| 71 | 67 |
color:#666; |
| 72 | 68 |
} |
| 73 |
- .branches .left {
|
|
| 69 |
+ .branches .bleft {
|
|
| 74 | 70 |
|
| 75 | 71 |
} |
| 76 |
- .branches .right {
|
|
| 72 |
+ .branches .bright {
|
|
| 77 | 73 |
text-align:right; |
| 78 | 74 |
} |
| 79 |
- |
|
| 80 |
- .branches .right a {
|
|
| 75 |
+ .branches .bright a {
|
|
| 81 | 76 |
color:#333; |
| 82 | 77 |
display:inline-block; |
| 83 | 78 |
padding:5px; |
| ... | ... |
@@ -85,7 +80,7 @@ |
| 85 | 80 |
border-radius:3px; |
| 86 | 81 |
background-color:#F3F3F3; |
| 87 | 82 |
} |
| 88 |
- .branches .right a:hover {
|
|
| 83 |
+ .branches .bright a:hover {
|
|
| 89 | 84 |
color:#FFF; |
| 90 | 85 |
background-color:#4183C4; |
| 91 | 86 |
} |
| ... | ... |
@@ -115,15 +110,15 @@ |
| 115 | 110 |
|
| 116 | 111 |
<div class="branches_number">Showing <%= @$branches %> branches not merged into master</div> |
| 117 | 112 |
<table class="branches"> |
| 118 |
- <tr class="default"> |
|
| 119 |
- <td class="left"> |
|
| 120 |
- <div class="name"><%= $default_branch->{name} %></div>
|
|
| 121 |
- <div class="last_updated">Last updated <%= $default_branch->{commit}{age_string} %> by <%= $default_branch->{commit}{author_name} %></div>
|
|
| 113 |
+ <tr class="bdefault"> |
|
| 114 |
+ <td class="bleft"> |
|
| 115 |
+ <div class="bname"><%= $default_branch->{name} %></div>
|
|
| 116 |
+ <div class="blast_updated">Last updated <%= $default_branch->{commit}{age_string} %> by <%= $default_branch->{commit}{author_name} %></div>
|
|
| 122 | 117 |
</td> |
| 123 | 118 |
<td> |
| 124 | 119 |
|
| 125 | 120 |
</td> |
| 126 |
- <td class="right"> |
|
| 121 |
+ <td class="bright"> |
|
| 127 | 122 |
Base branch |
| 128 | 123 |
</td> |
| 129 | 124 |
</tr> |
| ... | ... |
@@ -133,18 +128,18 @@ |
| 133 | 128 |
% my $branch = $branches->[$i]; |
| 134 | 129 |
% my $name = $branch->{name};
|
| 135 | 130 |
<tr> |
| 136 |
- <td class="left"> |
|
| 137 |
- <div class="name"> |
|
| 131 |
+ <td class="bleft"> |
|
| 132 |
+ <div class="bname"> |
|
| 138 | 133 |
<a href="<%= url_for("/$user/$project/tree/$name") %>">
|
| 139 | 134 |
<%= $name %> |
| 140 | 135 |
</a> |
| 141 | 136 |
</div> |
| 142 |
- <div class="last_updated">Last updated <%= $branch->{commit}{age_string} %> by <%= $branch->{commit}{author_name} %></div>
|
|
| 137 |
+ <div class="blast_updated">Last updated <%= $branch->{commit}{age_string} %> by <%= $branch->{commit}{author_name} %></div>
|
|
| 143 | 138 |
</td> |
| 144 | 139 |
<td> |
| 145 | 140 |
|
| 146 | 141 |
</td> |
| 147 |
- <td class="right"> |
|
| 142 |
+ <td class="bright"> |
|
| 148 | 143 |
<a href="<%= url_for("/$user/$project/compare/$default_branch->{name}...$name") %>">Compare</a>
|
| 149 | 144 |
</td> |
| 150 | 145 |
</tr> |