diff --git a/app/assets/images/logo_mars.png b/app/assets/images/logo_mars.png
deleted file mode 100644
index 1270700e909e0425038a2456ef514db46bafa49f..0000000000000000000000000000000000000000
Binary files a/app/assets/images/logo_mars.png and /dev/null differ
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index a5040f68c63001423d3e7a6c06d0d3e552f23294..88f8d7b8ac8278feaa03249e858c252d0f61be58 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -1,5 +1,5 @@
-%h3
- Gitlabhq
+%h3.cgray
+ GITLAB
%span.right v2.5
%hr
%h4 Self Hosted Git Management
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index b2cf54d10d4151308544ea59d5a3af3ecba6b1f6..a4f8d338ba45386700c6fdee7f3f03088dadc5e2 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -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
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 9241a460e95561f26ceceee18f6ed6c19d497fc5..314cfefd7fee7c9b7aaae0616b99927d2df8799a 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -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
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index 6c57103a8b40204b459501df7e2e8c1c4e75d038..fb6c3ec2666260890803d283d025b5fe0fcd7153 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -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
diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml
index 4996e7472f7e9feade2d4adb5a23931d481e1d99..5c57d7302006c202a2aa635d2c2548037a5abba1 100644
--- a/app/views/milestones/show.html.haml
+++ b/app/views/milestones/show.html.haml
@@ -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
- –
- #{@milestone.issues.closed.count} closed
+ %h5
+ Progress:
+ %small
+ #{@milestone.issues.opened.count} open
+ –
+ #{@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"
-
- Issue ##{issue.id}
- –
- = 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"
+
+ %span.badge.badge-info ##{issue.id}
+ –
+ = 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"
-
- = user.name
+ %table.admin-table
+ %thead
+ %th Participants
+ - @users.each do |user|
+ %tr
+ %td
+ = image_tag gravatar_icon(user.email, 24), :width => "24"
+
+ = user.name
:javascript
$(function() {
diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml
index 60f84085555eb91b880b56444fd0e7c660221ed3..196c7b92db12a4f988037b58eb823a1ba6a60076 100644
--- a/app/views/projects/_team.html.haml
+++ b/app/views/projects/_team.html.haml
@@ -1,7 +1,9 @@
-.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})
diff --git a/app/views/projects/team.html.haml b/app/views/projects/team.html.haml
index 742ce3490fc5b770318e206e001e18fc53818082..b023e5bf94f318417fda38f41d7ff4b96cbfdaa5 100644
--- a/app/views/projects/team.html.haml
+++ b/app/views/projects/team.html.haml
@@ -1,4 +1,7 @@
= render "project_head"
+%h3
+ Team Members
+ %small (#{@project.users_projects.count})
- if can? current_user, :admin_team_member, @project
.alert.alert-info
diff --git a/app/views/repositories/tags.html.haml b/app/views/repositories/tags.html.haml
index 92883892228a636742f7a6d95a726399a6851fb8..884db3b352a5df6839bd21e1500fb46a95ada353 100644
--- a/app/views/repositories/tags.html.haml
+++ b/app/views/repositories/tags.html.haml
@@ -1,18 +1,25 @@
= 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
%td
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index 00d0660166895506f4e0ee91282f9e473c93b418..1213a9816dc3dce1c491c6a9d255631b340a118b 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -1,17 +1,20 @@
- 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