Download as
Browse Code »

Commit fa8219e0a753e642a6f1dbdfc010d01ae8a949ee

Authored by Dmitriy Zaporozhets
1 parent 81da8e46
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

better MR list, dashboard pollished

Showing 2 changed files with 13 additions and 11 deletions   Show diff stats
app/views/dashboard/index.html.haml
  Diff comments   View file @fa8219e
... ... @@ -20,8 +20,8 @@
20 20 .row
21 21 .dashboard_block
22 22 .row
23   - .span4
24   - %div.prettyprint.ipadded
  23 + .span4.right
  24 + %div.borders.ipadded
25 25 %h1
26 26 = pluralize current_user.projects.count, "project", "projects"
27 27 - if current_user.can_create_project?
... ... @@ -34,9 +34,9 @@
34 34 %br
35 35 = link_to new_project_path, :class => "btn" do
36 36 New Project »
37   - .span10.right= render "dashboard/projects_feed", :projects => @active_projects
  37 + .span10.left= render "dashboard/projects_feed", :projects => @active_projects
38 38 - if @last_push
39   - .ui-box.padded.prepend-top-20
  39 + .padded.prepend-top-20
40 40 %h5
41 41 %small Latest push was to the #{@last_push.branch_name} branch of #{@last_push.project.name}:
42 42 %ul.unstyled= render @last_push
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @fa8219e
1 1 %li.wll
  2 + .right
  3 + .left
  4 + - if merge_request.notes.any?
  5 + %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
  6 + %span.btn.small.disabled.padded
  7 + = merge_request.source_branch
  8 + →
  9 + = merge_request.target_branch
2 10 = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
3 11 %span.update-author
4 12 %strong= merge_request.author_name
5 13 authored
6 14 = time_ago_in_words(merge_request.created_at)
7 15 ago
8   - - if merge_request.notes.any?
9   - %span.pretty_label= pluralize merge_request.notes.count, 'note'
10 16 - if merge_request.upvotes > 0
11 17 %span.label.success= "+#{merge_request.upvotes}"
12   - .right
13   - %span.label= merge_request.source_branch
14   - →
15   - %span.label= merge_request.target_branch
16 18 = link_to project_merge_request_path(merge_request.project, merge_request) do
17   - %p.row_title= truncate(merge_request.title, :length => 100)
  19 + %p.row_title= truncate(merge_request.title, :length => 80)
... ...