Commit 03369a9165e2f333a3feb501004acf369e339d67
1 parent
57e210f6
Exists in
master
and in
4 other branches
Use one helper for linking to team member. More clear title for Issue and MR
Showing
8 changed files
with
55 additions
and
84 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -426,25 +426,21 @@ p.time { | @@ -426,25 +426,21 @@ p.time { | ||
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | .status_info { | 428 | .status_info { |
| 429 | - font-size: 14px; | 429 | + font-size: 18px; |
| 430 | padding: 5px 15px; | 430 | padding: 5px 15px; |
| 431 | - line-height: 24px; | ||
| 432 | - width: 60px; | 431 | + line-height: 48px; |
| 433 | text-align: center; | 432 | text-align: center; |
| 434 | - float: left; | ||
| 435 | - margin-right: 20px; | 433 | + float: right; |
| 434 | + position: relative; | ||
| 435 | + top: -15px; | ||
| 436 | + left: 15px; | ||
| 437 | + background: #F5F5F5; | ||
| 436 | 438 | ||
| 437 | &.success { | 439 | &.success { |
| 438 | - background: #5BB75B; | ||
| 439 | - color: white; | ||
| 440 | - text-shadow: 0 1px #111; | ||
| 441 | - border-color: #9A9; | ||
| 442 | } | 440 | } |
| 443 | &.error { | 441 | &.error { |
| 444 | - background: #DA4E49; | ||
| 445 | - border-color: #BD362F; | ||
| 446 | - color: white; | ||
| 447 | - text-shadow: 0 1px #111; | 442 | + color: #C32; |
| 443 | + border-bottom: 5px solid #C32; | ||
| 448 | } | 444 | } |
| 449 | } | 445 | } |
| 450 | 446 |
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
| @@ -41,6 +41,15 @@ | @@ -41,6 +41,15 @@ | ||
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | + .top_box_content { | ||
| 45 | + .box-title { | ||
| 46 | + color: $style_color; | ||
| 47 | + font-size: 18px; | ||
| 48 | + font-weight: normal; | ||
| 49 | + line-height: 28px; | ||
| 50 | + } | ||
| 51 | + } | ||
| 52 | + | ||
| 44 | .middle_box_content { | 53 | .middle_box_content { |
| 45 | @include border-radius(0); | 54 | @include border-radius(0); |
| 46 | border: none; | 55 | border: none; |
app/helpers/issues_helper.rb
| @@ -4,28 +4,6 @@ module IssuesHelper | @@ -4,28 +4,6 @@ module IssuesHelper | ||
| 4 | project_issues_path project, params | 4 | project_issues_path project, params |
| 5 | end | 5 | end |
| 6 | 6 | ||
| 7 | - def link_to_issue_assignee(issue) | ||
| 8 | - project = issue.project | ||
| 9 | - | ||
| 10 | - tm = project.team_member_by_id(issue.assignee_id) | ||
| 11 | - if tm | ||
| 12 | - link_to issue.assignee_name, project_team_member_path(project, tm), class: "author_link" | ||
| 13 | - else | ||
| 14 | - issue.assignee_name | ||
| 15 | - end | ||
| 16 | - end | ||
| 17 | - | ||
| 18 | - def link_to_issue_author(issue) | ||
| 19 | - project = issue.project | ||
| 20 | - | ||
| 21 | - tm = project.team_member_by_id(issue.author_id) | ||
| 22 | - if tm | ||
| 23 | - link_to issue.author_name, project_team_member_path(project, tm), class: "author_link" | ||
| 24 | - else | ||
| 25 | - issue.author_name | ||
| 26 | - end | ||
| 27 | - end | ||
| 28 | - | ||
| 29 | def issue_css_classes issue | 7 | def issue_css_classes issue |
| 30 | classes = "issue" | 8 | classes = "issue" |
| 31 | classes << " closed" if issue.closed | 9 | classes << " closed" if issue.closed |
app/helpers/merge_requests_helper.rb
| 1 | module MergeRequestsHelper | 1 | module MergeRequestsHelper |
| 2 | - def link_to_merge_request_assignee(merge_request) | ||
| 3 | - project = merge_request.project | ||
| 4 | - | ||
| 5 | - tm = project.team_member_by_id(merge_request.assignee_id) | ||
| 6 | - if tm | ||
| 7 | - link_to merge_request.assignee_name, project_team_member_path(project, tm), class: "author_link" | ||
| 8 | - else | ||
| 9 | - merge_request.assignee_name | ||
| 10 | - end | ||
| 11 | - end | ||
| 12 | - | ||
| 13 | - def link_to_merge_request_author(merge_request) | ||
| 14 | - project = merge_request.project | ||
| 15 | - | ||
| 16 | - tm = project.team_member_by_id(merge_request.author_id) | ||
| 17 | - if tm | ||
| 18 | - link_to merge_request.author_name, project_team_member_path(project, tm), class: "author_link" | ||
| 19 | - else | ||
| 20 | - merge_request.author_name | ||
| 21 | - end | ||
| 22 | - end | ||
| 23 | - | ||
| 24 | def new_mr_path_from_push_event(event) | 2 | def new_mr_path_from_push_event(event) |
| 25 | new_project_merge_request_path( | 3 | new_project_merge_request_path( |
| 26 | event.project, | 4 | event.project, |
app/helpers/projects_helper.rb
| @@ -20,6 +20,28 @@ module ProjectsHelper | @@ -20,6 +20,28 @@ module ProjectsHelper | ||
| 20 | end | 20 | end |
| 21 | end | 21 | end |
| 22 | 22 | ||
| 23 | + def link_to_member(project, author) | ||
| 24 | + return "(deleted)" unless author | ||
| 25 | + | ||
| 26 | + # Build avatar image tag | ||
| 27 | + avatar = image_tag(gravatar_icon(author.try(:email)), width: 16, class: "lil_av") | ||
| 28 | + | ||
| 29 | + # Build name strong tag | ||
| 30 | + name = content_tag :strong, author.name, class: 'author' | ||
| 31 | + | ||
| 32 | + author_html = avatar + name | ||
| 33 | + | ||
| 34 | + tm = project.team_member_by_id(author) | ||
| 35 | + | ||
| 36 | + content_tag :span, class: 'member-link' do | ||
| 37 | + if tm | ||
| 38 | + link_to author_html, project_team_member_path(project, tm), class: "author_link" | ||
| 39 | + else | ||
| 40 | + author_html | ||
| 41 | + end | ||
| 42 | + end | ||
| 43 | + end | ||
| 44 | + | ||
| 23 | def tm_path team_member | 45 | def tm_path team_member |
| 24 | project_team_member_path(@project, team_member) | 46 | project_team_member_path(@project, team_member) |
| 25 | end | 47 | end |
app/views/issues/show.html.haml
| @@ -26,22 +26,16 @@ | @@ -26,22 +26,16 @@ | ||
| 26 | 26 | ||
| 27 | .main_box | 27 | .main_box |
| 28 | .top_box_content | 28 | .top_box_content |
| 29 | - %h4 | 29 | + %h4.box-title |
| 30 | - if @issue.closed | 30 | - if @issue.closed |
| 31 | - .alert-message.error.status_info Closed | ||
| 32 | - - else | ||
| 33 | - .alert-message.success.status_info Open | 31 | + .error.status_info Closed |
| 34 | = gfm escape_once(@issue.title) | 32 | = gfm escape_once(@issue.title) |
| 35 | 33 | ||
| 36 | .middle_box_content | 34 | .middle_box_content |
| 37 | - %cite.cgray Created by | ||
| 38 | - = image_tag gravatar_icon(@issue.author_email), width: 16, class: "lil_av" | ||
| 39 | - %strong.author= link_to_issue_author(@issue) | ||
| 40 | - | ||
| 41 | - - if @issue.assignee | ||
| 42 | - %cite.cgray and currently assigned to | ||
| 43 | - = image_tag gravatar_icon(@issue.assignee_email), width: 16, class: "lil_av" | ||
| 44 | - %strong.author= link_to_issue_assignee(@issue) | 35 | + %cite.cgray |
| 36 | + Created by #{link_to_member(@project, @issue.author)} | ||
| 37 | + - if @issue.assignee | ||
| 38 | + \ and currently assigned to #{link_to_member(@project, @issue.assignee)} | ||
| 45 | 39 | ||
| 46 | - if @issue.milestone | 40 | - if @issue.milestone |
| 47 | - milestone = @issue.milestone | 41 | - milestone = @issue.milestone |
app/views/merge_requests/show/_mr_box.html.haml
| 1 | .main_box | 1 | .main_box |
| 2 | .top_box_content | 2 | .top_box_content |
| 3 | - %h4 | 3 | + %h4.box-title |
| 4 | - if @merge_request.closed | 4 | - if @merge_request.closed |
| 5 | - .alert-message.error.status_info Closed | ||
| 6 | - - else | ||
| 7 | - .alert-message.success.status_info Open | 5 | + .error.status_info Closed |
| 8 | = gfm escape_once(@merge_request.title) | 6 | = gfm escape_once(@merge_request.title) |
| 9 | 7 | ||
| 10 | .middle_box_content | 8 | .middle_box_content |
| 11 | %div | 9 | %div |
| 12 | - %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by | ||
| 13 | - = image_tag gravatar_icon(@merge_request.author_email), width: 16, class: "lil_av" | ||
| 14 | - %strong.author= link_to_merge_request_author(@merge_request) | ||
| 15 | - | ||
| 16 | - - if @merge_request.assignee | ||
| 17 | - %cite.cgray , currently assigned to | ||
| 18 | - = image_tag gravatar_icon(@merge_request.assignee_email), width: 16, class: "lil_av" | ||
| 19 | - %strong.author= link_to_merge_request_assignee(@merge_request) | 10 | + %cite.cgray |
| 11 | + Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)} | ||
| 12 | + - if @merge_request.assignee | ||
| 13 | + \, currently assigned to #{link_to_member(@project, @merge_request.assignee)} | ||
| 20 | - if @merge_request.milestone | 14 | - if @merge_request.milestone |
| 21 | - milestone = @merge_request.milestone | 15 | - milestone = @merge_request.milestone |
| 22 | %cite.cgray and attached to milestone | 16 | %cite.cgray and attached to milestone |
| @@ -27,10 +21,10 @@ | @@ -27,10 +21,10 @@ | ||
| 27 | .bottom_box_content | 21 | .bottom_box_content |
| 28 | - if @merge_request.merged? | 22 | - if @merge_request.merged? |
| 29 | %span | 23 | %span |
| 30 | - Merged by #{@merge_request.merge_event.author_name} | 24 | + Merged by #{link_to_member(@project, @merge_request.merge_event.author)} |
| 31 | %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. | 25 | %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. |
| 32 | - elsif @merge_request.closed_event | 26 | - elsif @merge_request.closed_event |
| 33 | %span | 27 | %span |
| 34 | - Closed by #{@merge_request.closed_event.author_name} | 28 | + Closed by #{link_to_member(@project, @merge_request.closed_event.author)} |
| 35 | %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. | 29 | %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. |
| 36 | 30 |
app/views/merge_requests/show/_mr_title.html.haml