From 48a1e31010f331db1ec0d7947bfb10b1b3c700ec Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 12 Nov 2011 12:41:34 +0200 Subject: [PATCH] snippet table restyle --- app/assets/stylesheets/projects.css.scss | 6 +++++- app/views/snippets/_snippet.html.haml | 22 ++++++++++++++-------- app/views/snippets/index.html.haml | 7 ++----- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 45bf317e..e92784f9 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -622,13 +622,16 @@ body.project-page table .commit { #notes-list .note .delete-note { display:none; } #notes-list .note:hover .delete-note { display:block; } +.snippet .action-links, #issues-table-holder .issue .action-links { display:none; a { margin-left:10px; } } - + +.snippet:hover .action-links { display:block; } + .issue-number { float: left; border-radius: 5px; @@ -665,6 +668,7 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f //.message .note-title p { margin-bottom:0px; } .commit, +.snippet, .message { .title { color:#666; diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml index ddfba6bf..dc45e132 100644 --- a/app/views/snippets/_snippet.html.haml +++ b/app/views/snippets/_snippet.html.haml @@ -2,11 +2,17 @@ %tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) } %td = image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;" - = truncate snippet.author.name, :lenght => 20 - %td= html_escape snippet.title - %td= html_escape snippet.file_name - %td - - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user - = link_to 'Edit', edit_project_snippet_path(@project, snippet), :class => "lbutton positive" - - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user - = link_to 'Destroy', [@project, snippet], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{snippet.id}" + %span + %strong= html_escape snippet.title + %br + %br + %div.author + %strong= truncate snippet.author.name, :lenght => 20 + %cite.cgray + = time_ago_in_words(snippet.updated_at) + ago + .right.action-links + - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user + = link_to 'Edit', edit_project_snippet_path(@project, snippet), :class => "cgray" + - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user + = link_to 'Destroy', [@project, snippet], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-snippet negative", :id => "destroy_snippet_#{snippet.id}" diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index 3f261000..58e6085f 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -3,11 +3,8 @@ .left= link_to 'New Snippet', new_project_snippet_path(@project), :class => "lbutton vm" %table.round-borders#snippets-table - %tr - %th Author - %th Title - %th File name - %th + %thead + %th = render @snippets.fresh :javascript $('.delete-snippet').live('ajax:success', function() {