From 9270b6c3c7cdb99eef1c99af8274dae5789d9830 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Wed, 26 Sep 2012 16:49:20 +0300
Subject: [PATCH] Fix milestone calendar, Removed unnecessary selects from
 admin

---
 app/assets/stylesheets/common.scss            |  1 +
 app/assets/stylesheets/sections/issues.scss   | 14 ++++++++++++++
 app/assets/stylesheets/sections/projects.scss |  2 +-
 app/views/admin/projects/show.html.haml       | 10 ++++++----
 app/views/admin/users/show.html.haml          | 10 ++++++----
 app/views/milestones/show.html.haml           |  5 ++++-
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f13a1d6d..46de2cf3 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -661,3 +661,4 @@ li.note {
     margin-right: 30px;
   }
 }
+
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss
index 10def510..485a9766 100644
--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -113,3 +113,17 @@ input.check_all_issues {
 .milestone {
   @extend .wll;
 }
+
+/**
+ *  Fix milestone calendar
+ */
+
+.ui-datepicker {
+  border:none;
+  box-shadow:none;
+  .ui-datepicker-header {
+    @include solid_shade;
+    margin-bottom:10px;
+    border:1px solid #bbb;
+  }
+}
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 92d0fc43..a29504ec 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -74,7 +74,7 @@
   @include bg-gray-gradient;
   padding: 4px 7px;
   border: 1px solid #CCC;
-  margin-bottom:5px;
+  margin-bottom:20px;
 }
 
 .project_clone_holder {
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 63987410..ede48ea2 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,6 +1,8 @@
-%h3
-  = @admin_project.name
-  = link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small"
+%h3.page_title
+  Project: #{@admin_project.name}
+  = link_to edit_admin_project_path(@admin_project), class: "btn right" do
+    %i.icon-edit
+    Edit
 
 %br
 %table.zebra-striped
@@ -56,7 +58,7 @@
     %tr
       %td
         = link_to tm.user_name, admin_user_path(tm.user)
-      %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), class: "medium project-access-select", disabled: :disabled
+      %td= tm.project_access_human
       %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small"
       %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small"
 
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 731916e9..e73f4d10 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,10 +1,12 @@
-%h3
-  = @admin_user.name
+%h3.page_title
+  User: #{@admin_user.name}
   - if @admin_user.blocked
     %small Blocked
   - if @admin_user.admin
     %small Administrator
-  = link_to 'Edit', edit_admin_user_path(@admin_user), class: "btn small right"
+  = link_to edit_admin_user_path(@admin_user), class: "btn right" do
+    %i.icon-edit
+    Edit
 
 %br
 
@@ -94,6 +96,6 @@
       - project = tm.project
       %tr
         %td= link_to project.name, admin_project_path(project)
-        %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), class: "medium project-access-select", disabled: :disabled
+        %td= tm.project_access_human
         %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small"
         %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn small danger"
diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml
index ba71ead7..4d0c9a4c 100644
--- a/app/views/milestones/show.html.haml
+++ b/app/views/milestones/show.html.haml
@@ -1,9 +1,12 @@
-%h3
+%h3.page_title
   Milestone ##{@milestone.id}
   %small
     = @milestone.expires_at
 
   %span.right
+    = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "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 small grouped" do