diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-06 16:10:24 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-06 16:10:24 +0400 |
commit | 37eeeb9fca90aa34c502181b9967fb62f9f87752 (patch) | |
tree | 1b155cfd9d2ea0b3bfe5d592d35c93280b9093e1 /app/views/issues | |
parent | 39f4604653507e565c93a6fa8ef62bda421e78b2 (diff) |
Redesign issues, mr lists
Diffstat (limited to 'app/views/issues')
-rw-r--r-- | app/views/issues/_issue.html.haml | 53 | ||||
-rw-r--r-- | app/views/issues/index.html.haml | 4 |
2 files changed, 31 insertions, 26 deletions
diff --git a/app/views/issues/_issue.html.haml b/app/views/issues/_issue.html.haml index ab34116b42f..6c6d45e987b 100644 --- a/app/views/issues/_issue.html.haml +++ b/app/views/issues/_issue.html.haml @@ -1,12 +1,37 @@ %li{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) } - if controller.controller_name == 'issues' - .issue_check + .issue-check = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue) - .pull-right + + .issue-title + %span.light= "##{issue.id}" + = link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title" + + .issue-info + - if issue.assignee + assigned to #{link_to_member(@project, issue.assignee)} + - else + unassigned + - if issue.votes_count > 0 + = render 'votes/votes_inline', votable: issue - if issue.notes.any? - %span.btn.btn-small.disabled.grouped - %i.icon-comment + %span + %i.icon-comments = issue.notes.count + - if issue.milestone_id? + %span + %i.icon-time + = issue.milestone.title + .pull-right + %small updated #{time_ago_in_words(issue.updated_at)} ago + + .issue-labels + - issue.labels.each do |label| + %span.label.label-info + %i.icon-tag + = label.name + + .issue-actions - if can? current_user, :modify_issue, issue - if issue.closed? = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-small grouped reopen_issue", remote: true @@ -16,24 +41,4 @@ %i.icon-edit Edit - - if issue.assignee - = image_tag gravatar_icon(issue.assignee_email), class: "avatar" - - else - = image_tag "no_avatar.png", class: "avatar" - - %p= link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title" - - %span.update-author - %span.cdark= "##{issue.id}" - - if issue.assignee - assigned to #{issue.assignee_name} - - else - - - if issue.votes_count > 0 - = render 'votes/votes_inline', votable: issue - %span - - issue.labels.each do |label| - %span.label.label-info - %i.icon-tag - = label.name diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 875f29e2600..2e26ee72281 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -12,7 +12,7 @@ = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right' do = hidden_field_tag :project_id, @project.id, { id: 'project_id' } = hidden_field_tag :status, params[:status] - = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 pull-right neib search-text-input' } + = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' } .clearfix @@ -41,7 +41,7 @@ = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone") = hidden_field_tag :status, params[:status] - %ul#issues-table.well-list.issues_table + %ul#issues-table.well-list.issues-list = render "issues" :javascript |