Milestone show, Team index: Better UI

Dmitriy Zaporozhets
1 parent db78a63e
Showing 10 changed files with 76 additions and 57 deletions Show diff stats
app/assets/images/logo_mars.png
app/views/help/index.html.haml
app/views/issues/_show.html.haml
app/views/issues/show.html.haml
app/views/merge_requests/show.html.haml
app/views/milestones/show.html.haml
app/views/projects/_team.html.haml
app/views/projects/team.html.haml
app/views/repositories/tags.html.haml
app/views/team_members/_show.html.haml
-%h3 
-  Gitlabhq
+%h3.cgray 
+  GITLAB
   %span.right v2.5
 %hr
 %h4 Self Hosted Git Management
@@ -7,7 +7,10 @@
         = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "btn small padded", :remote => true
       - else
         = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small padded", :remote => true
-      = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
+      = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do 
+        %i.icon-edit
+        Edit
+
   = image_tag gravatar_icon(issue.assignee_email), :class => "avatar"
   %span.update-author
     assigned to
@@ -12,6 +12,7 @@
         = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue"
     - if can?(current_user, :admin_project, @project) || @issue.author == current_user
       = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do 
+        %i.icon-edit
         Edit
     %br
@@ -10,6 +10,7 @@
       - if @merge_request.open?
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
         = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do 
+          %i.icon-edit
           Edit
     %br
@@ -4,8 +4,10 @@
     = @milestone.expires_at
   %span.right
+    = link_to 'Browse Issues', project_issues_path(@milestone.project, :milestone_id => @milestone.id), :class => "btn edit-milestone-link small"
     - if can?(current_user, :admin_milestone, @project)
-      = link_to edit_project_milestone_path(@project, @milestone), :class => "btn" do 
+      = link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do 
+        %i.icon-edit
         Edit
 .back_link
@@ -20,22 +22,16 @@
       - else 
         .alert-message.success.status_info Open
       = @milestone.title
+      %small.right= @milestone.expires_at
   .middle_box_content
-    .row
-      .span2
-        = link_to 'Browse Issues', project_issues_path(@milestone.project, :milestone_id => @milestone.id), :class => "btn small edit-milestone-link"
-      .span4
-        %span
-          = @milestone.expires_at
-
-      .span4.right
-        .progress
-        %br
-        %span
-          #{@milestone.issues.opened.count} open
-          &ndash;
-          #{@milestone.issues.closed.count} closed
+    %h5
+      Progress:
+      %small
+        #{@milestone.issues.opened.count} open
+        &ndash;
+        #{@milestone.issues.closed.count} closed
+    .progress
   - if @milestone.description.present?
     .bottom_box_content
@@ -44,28 +40,31 @@
 .row
   .span6
-    %h4 Open Issues:
-    - @issues.each do |issue|
-      = link_to [@project, issue] do 
-        %h5
-          = image_tag gravatar_icon(issue.assignee_email, 16), :width => "16"
-          &nbsp;
-          Issue ##{issue.id}
-          &ndash;
-          = truncate issue.title, :length => 50
-          %small
-            updated at 
-            = issue.updated_at.stamp("Aug 25, 2011")
+    %table.admin-table
+      %thead
+        %th Open Issues
+      - @issues.each do |issue|
+        %tr
+          %td
+            = link_to [@project, issue] do 
+              = image_tag gravatar_icon(issue.assignee_email, 16), :width => "16"
+              &nbsp;
+              %span.badge.badge-info ##{issue.id}
+              &ndash;
+              = truncate issue.title, :length => 60
     %br
     = paginate @issues, :theme => "gitlab"
   .span6
-    %h4 Participants:
-    - @users.each do |user|
-      %h5
-        = image_tag gravatar_icon(user.email, 16), :width => "16"
-        &nbsp;
-        = user.name
+    %table.admin-table
+      %thead
+        %th Participants
+      - @users.each do |user|
+        %tr
+          %td
+            = image_tag gravatar_icon(user.email, 24), :width => "24"
+            &nbsp;
+            = user.name
 :javascript
   $(function() {
-.ui-box
-  %h5
-    .cgray Team Members (#{@project.users_projects.count})
-  %ul.unstyled
+%table.admin-table
+  %thead
+    %tr
+      %th User
+      %th Permissions
+  %tbody
     - @project.users_projects.each do |up|
       = render(:partial => 'team_members/show', :locals => {:member => up})
 = render "project_head"
+%h3 
+  Team Members
+  %small (#{@project.users_projects.count})
 - if can? current_user, :admin_team_member, @project
   .alert.alert-info
 = render "commits/head"
 - unless @tags.empty?
-  %table.table-striped.borders
+  %table.admin-table
+    %thead
+      %tr
+        %th Name
+        %th Last commit
+        %th Updated at
+        %th
     - @tags.each do |tag|
+      - commit = Commit.new(tag.commit)
       %tr
         %td
           %strong= link_to tag.name, project_commits_path(@project, :ref => tag.name), :class => ""
         %td
-          = link_to project_commit_path(@project, tag.commit.id) do
-            %code= tag.commit.id.to_s[0..10]
-          = image_tag gravatar_icon(Commit.new(tag.commit).author_email), :class => "", :width => 16
-          = truncate(Commit.new(tag.commit).safe_message, :length => 40)
+          = link_to project_commit_path(@project, commit.id) do
+            %code= commit.id.to_s[0..10]
+          = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
+          = truncate(commit.safe_message, :length => 40)
         %td
           %span.update-author.right
-            = time_ago_in_words(tag.commit.committed_date)
+            = time_ago_in_words(commit.committed_date)
             ago
             &nbsp;
         %td
 - user = member.user
 - allow_admin = can? current_user, :admin_project, @project
-%li{:id => dom_id(member), :class => "team_member_row wll"}
-  .row
-    .span8
-      = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do 
-        = image_tag gravatar_icon(user.email, 40), :class => "avatar"
-        %strong= truncate(user.name, :lenght => 40)
-      %div.cgray= user.email
-
-    .span3
-      = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
-        = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, :class => "medium project-access-select", :disabled => !allow_admin
+%tr{:id => dom_id(member), :class => "team_member_row"}
+  %td
+    .right
       - if @project.owner == user
         %span.label Project Owner
       - if user.blocked
         %span.label Blocked
+
+    = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do 
+      = image_tag gravatar_icon(user.email, 40), :class => "avatar"
+    = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do 
+      %strong= truncate(user.name, :lenght => 40)
+    %br
+    %div.cgray= user.email
+
+  %td
+    = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
+      = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, :class => "medium project-access-select", :disabled => !allow_admin
1	-%h3
2	- Gitlabhq	1	+%h3.cgray
		2	+ GITLAB
3	%span.right v2.5	3	%span.right v2.5
4	%hr	4	%hr
5	%h4 Self Hosted Git Management	5	%h4 Self Hosted Git Management
	@@ -12,6 +12,7 @@		@@ -12,6 +12,7 @@
12	= link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue"	12	= link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue"
13	- if can?(current_user, :admin_project, @project) \|\| @issue.author == current_user	13	- if can?(current_user, :admin_project, @project) \|\| @issue.author == current_user
14	= link_to edit_project_issue_path(@project, @issue), :class => "btn small" do	14	= link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
		15	+ %i.icon-edit
15	Edit	16	Edit
16		17
17	%br	18	%br
	@@ -10,6 +10,7 @@		@@ -10,6 +10,7 @@
10	- if @merge_request.open?	10	- if @merge_request.open?
11	= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"	11	= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
12	= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do	12	= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
		13	+ %i.icon-edit
13	Edit	14	Edit
14		15
15	%br	16	%br
1	= render "project_head"	1	= render "project_head"
		2	+%h3
		3	+ Team Members
		4	+ %small (#{@project.users_projects.count})
2		5
3	- if can? current_user, :admin_team_member, @project	6	- if can? current_user, :admin_team_member, @project
4	.alert.alert-info	7	.alert.alert-info