summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/lists.scss9
-rw-r--r--app/views/dashboard/projects.html.haml2
-rw-r--r--app/views/projects/milestones/_milestone.html.haml3
-rw-r--r--app/views/projects/milestones/show.html.haml46
5 files changed, 33 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore
index 1210ac3b44a..60e17328880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ vendor/bundle/*
rails_best_practices_output.html
doc/code/*
.secret
+*.log
diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
index d23323979bc..83066b5beec 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
@@ -83,4 +83,13 @@ ul.bordered-list {
a { color: #777; }
}
}
+
+ &.top-list {
+ li:first-child {
+ padding-top: 0;
+ h4, h5 {
+ margin-top: 0;
+ }
+ }
+ }
}
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index ab090c42218..8fd0744a63f 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -36,7 +36,7 @@
= label.name
.span9
- %ul.bordered-list.my-projects
+ %ul.bordered-list.my-projects.top-list
- @projects.each do |project|
%li
%h4.project-title
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml
index 894fa6c1133..bc3368b765c 100644
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
@@ -4,8 +4,7 @@
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
%i.icon-edit
Edit
- - if milestone.can_be_closed?
- = link_to 'Close', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
+ = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
%h4
= link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone)
- if milestone.expired? and not milestone.closed?
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 7be3ba2f758..8a5c2a938b1 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -1,32 +1,23 @@
= render "projects/issues/head"
-.row
- .span6
- %h3.page-title
- Milestone ##{@milestone.id}
- %small
- = @milestone.expires_at
- .back-link
- = link_to project_milestones_path(@project) do
- ← To milestones list
- .span6
- .pull-right
- - unless @milestone.closed?
- = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
- %i.icon-plus
- New Issue
- = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
- - if can?(current_user, :admin_milestone, @project)
- = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-small grouped" do
- %i.icon-edit
- Edit
+%h3.page-title
+ Milestone ##{@milestone.id}
+ %small
+ = @milestone.expires_at
+ .pull-right
+ - if can?(current_user, :admin_milestone, @project)
+ = link_to edit_project_milestone_path(@project, @milestone), class: "btn grouped" do
+ %i.icon-edit
+ Edit
+ = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove"
+- if @milestone.issues.any? && @milestone.can_be_closed?
+ .alert.alert-success
+ %span All issues for this milestone are closed. You may close milestone now.
+.back-link
+ = link_to project_milestones_path(@project) do
+ ← To milestones list
-- if @milestone.can_be_closed?
- %hr
- %p
- %span All issues for this milestone are closed. You may close milestone now.
- = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-small btn-remove"
.ui-box.ui-box-show
.ui-box-head
@@ -69,6 +60,11 @@
Participants
%span.badge= @users.count
+ .pull-right
+ = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
+ %i.icon-plus
+ New Issue
+ = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link grouped"
.tab-content
.tab-pane.active#tab-issues