Download as
Browse Code »

Commit 9270b6c3c7cdb99eef1c99af8274dae5789d9830

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

Fix milestone calendar, Removed unnecessary selects from admin

Showing 6 changed files with 32 additions and 10 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @9270b6c
... ... @@ -661,3 +661,4 @@ li.note {
661 661 margin-right: 30px;
662 662 }
663 663 }
  664 +
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @9270b6c
... ... @@ -113,3 +113,17 @@ input.check_all_issues {
113 113 .milestone {
114 114 @extend .wll;
115 115 }
  116 +
  117 +/**
  118 + * Fix milestone calendar
  119 + */
  120 +
  121 +.ui-datepicker {
  122 + border:none;
  123 + box-shadow:none;
  124 + .ui-datepicker-header {
  125 + @include solid_shade;
  126 + margin-bottom:10px;
  127 + border:1px solid #bbb;
  128 + }
  129 +}
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @9270b6c
... ... @@ -74,7 +74,7 @@
74 74 @include bg-gray-gradient;
75 75 padding: 4px 7px;
76 76 border: 1px solid #CCC;
77   - margin-bottom:5px;
  77 + margin-bottom:20px;
78 78 }
79 79  
80 80 .project_clone_holder {
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @9270b6c
1   -%h3
2   - = @admin_project.name
3   - = link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small"
  1 +%h3.page_title
  2 + Project: #{@admin_project.name}
  3 + = link_to edit_admin_project_path(@admin_project), class: "btn right" do
  4 + %i.icon-edit
  5 + Edit
4 6  
5 7 %br
6 8 %table.zebra-striped
... ... @@ -56,7 +58,7 @@
56 58 %tr
57 59 %td
58 60 = link_to tm.user_name, admin_user_path(tm.user)
59   - %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), class: "medium project-access-select", disabled: :disabled
  61 + %td= tm.project_access_human
60 62 %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small"
61 63 %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small"
62 64  
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @9270b6c
1   -%h3
2   - = @admin_user.name
  1 +%h3.page_title
  2 + User: #{@admin_user.name}
3 3 - if @admin_user.blocked
4 4 %small Blocked
5 5 - if @admin_user.admin
6 6 %small Administrator
7   - = link_to 'Edit', edit_admin_user_path(@admin_user), class: "btn small right"
  7 + = link_to edit_admin_user_path(@admin_user), class: "btn right" do
  8 + %i.icon-edit
  9 + Edit
8 10  
9 11 %br
10 12  
... ... @@ -94,6 +96,6 @@
94 96 - project = tm.project
95 97 %tr
96 98 %td= link_to project.name, admin_project_path(project)
97   - %td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), class: "medium project-access-select", disabled: :disabled
  99 + %td= tm.project_access_human
98 100 %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small"
99 101 %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn small danger"
... ...
app/views/milestones/show.html.haml
  Diff comments   View file @9270b6c
1   -%h3
  1 +%h3.page_title
2 2 Milestone ##{@milestone.id}
3 3 %small
4 4 = @milestone.expires_at
5 5  
6 6 %span.right
  7 + = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn small grouped", title: "New Issue" do
  8 + %i.icon-plus
  9 + New Issue
7 10 = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
8 11 - if can?(current_user, :admin_milestone, @project)
9 12 = link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do
... ...