Download as
Browse Code »

Commit 81847a9335722a616362ce7d51cee4fe94afe999

Authored by Aleksei Kvitinskii
2 parents 072b2d5d 671e261e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev

Showing 4 changed files with 17 additions and 12 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @81847a9
... ... @@ -663,6 +663,10 @@ table.highlighttable pre{
663 663 }
664 664 }
665 665  
  666 +.cgray { color:gray; }
  667 +.cred { color:#D12F19; }
  668 +.cgreen { color:#44aa22; }
  669 +
666 670 body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
667 671 body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
668 672 body.project-page #notes-list .note img{float: left; margin-right: 10px;}
... ...
app/views/issues/_issues.html.haml
  Diff comments   View file @81847a9
... ... @@ -6,7 +6,6 @@
6 6 %th ID
7 7 %th Title
8 8 %th Closed?
9   - %th
10 9  
11 10 - @issues.critical.each do |issue|
12 11 = render(:partial => 'show', :locals => {:issue => issue})
... ...
app/views/issues/_show.html.haml
  Diff comments   View file @81847a9
... ... @@ -14,6 +14,14 @@
14 14 %span.tag.high critical
15 15 - if issue.today?
16 16 %span.tag.today today
  17 +
  18 + .right
  19 + - if can?(current_user, :admin_issue, @project) || issue.author == current_user
  20 + = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray", :remote => true
  21 + - if can?(current_user, :admin_issue, @project) || issue.author == current_user
  22 +  
  23 + = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
  24 +
17 25 -#- if issue.author == current_user
18 26 -#%span.tag.yours yours
19 27 -#- if issue.notes.count > 0
... ... @@ -27,9 +35,3 @@
27 35 = hidden_field_tag :status_only, true
28 36 - else
29 37 = check_box_tag "closed", 1, issue.closed, :disabled => true
30   - %td
31   - - if @view_mode == :fluid
32   - - if can?(current_user, :admin_issue, @project) || issue.author == current_user
33   - = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "lbutton positive", :remote => true
34   - - if can?(current_user, :admin_issue, @project) || issue.author == current_user
35   - = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{issue.id}"
... ...
app/views/notes/_show.html.haml
  Diff comments   View file @81847a9
... ... @@ -2,16 +2,16 @@
2 2 = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
3 3 %div.note-author
4 4 %strong= note.author_name
5   - %cite
  5 + %cite.cgray
6 6 = time_ago_in_words(note.updated_at)
7 7 ago
8 8 - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
9   - = link_to 'Remove', [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-note right negative"
  9 + = link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note right"
10 10  
11 11 %div.note-title
12 12 = markdown(note.note)
13 13 - if note.attachment.url
14   - Attachment:
15   - = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
16   - %br
  14 + .right
  15 + %span.file
  16 + = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
17 17 .clear
... ...