deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

better MR list, dashboard pollished

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-22 22:57:04 +02:00
parent 81da8e46f2
commit fa8219e0a7
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/dashboard/index.html.haml
View file

@ -20,8 +20,8 @@
.row .row
.dashboard_block .dashboard_block
.row .row
.span4 .span4.right
%div.prettyprint.ipadded %div.borders.ipadded
%h1 %h1
= pluralize current_user.projects.count, "project", "projects" = pluralize current_user.projects.count, "project", "projects"
- if current_user.can_create_project? - if current_user.can_create_project?
@ -34,9 +34,9 @@
%br %br
= link_to new_project_path, :class => "btn" do = link_to new_project_path, :class => "btn" do
New Project » New Project »
.span10.right= render "dashboard/projects_feed", :projects => @active_projects .span10.left= render "dashboard/projects_feed", :projects => @active_projects
- if @last_push - if @last_push
.ui-box.padded.prepend-top-20 .padded.prepend-top-20
%h5 %h5
%small Latest push was to the #{@last_push.branch_name} branch of #{@last_push.project.name}: %small Latest push was to the #{@last_push.branch_name} branch of #{@last_push.project.name}:
%ul.unstyled= render @last_push %ul.unstyled= render @last_push

16
app/views/merge_requests/_merge_request.html.haml
View file

@ -1,17 +1,19 @@
%li.wll %li.wll
.right
.left
- if merge_request.notes.any?
%span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
%span.btn.small.disabled.padded
= merge_request.source_branch
→
= merge_request.target_branch
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar" = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
%span.update-author %span.update-author
%strong= merge_request.author_name %strong= merge_request.author_name
authored authored
= time_ago_in_words(merge_request.created_at) = time_ago_in_words(merge_request.created_at)
ago ago
- if merge_request.notes.any?
%span.pretty_label= pluralize merge_request.notes.count, 'note'
- if merge_request.upvotes > 0 - if merge_request.upvotes > 0
%span.label.success= "+#{merge_request.upvotes}" %span.label.success= "+#{merge_request.upvotes}"
.right
%span.label= merge_request.source_branch
→
%span.label= merge_request.target_branch
= link_to project_merge_request_path(merge_request.project, merge_request) do = link_to project_merge_request_path(merge_request.project, merge_request) do
%p.row_title= truncate(merge_request.title, :length => 100) %p.row_title= truncate(merge_request.title, :length => 80)