deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix milestone calendar, Removed unnecessary selects from admin

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-09-26 16:49:20 +03:00
parent 3c132f2e68
commit 9270b6c3c7
6 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/common.scss
View file

@ -661,3 +661,4 @@ li.note {
margin-right: 30px; margin-right: 30px;
} }
} }

14
app/assets/stylesheets/sections/issues.scss
View file

@ -113,3 +113,17 @@ input.check_all_issues {
.milestone { .milestone {
@extend .wll; @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;
}
}

2
app/assets/stylesheets/sections/projects.scss
View file

@ -74,7 +74,7 @@
@include bg-gray-gradient; @include bg-gray-gradient;
padding: 4px 7px; padding: 4px 7px;
border: 1px solid #CCC; border: 1px solid #CCC;
margin-bottom:5px; margin-bottom:20px;
} }
.project_clone_holder { .project_clone_holder {

10
app/views/admin/projects/show.html.haml
View file

@ -1,6 +1,8 @@
%h3 %h3.page_title
= @admin_project.name Project: #{@admin_project.name}
= link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small" = link_to edit_admin_project_path(@admin_project), class: "btn right" do
%i.icon-edit
Edit
%br %br
%table.zebra-striped %table.zebra-striped
@ -56,7 +58,7 @@
%tr %tr
%td %td
= link_to tm.user_name, admin_user_path(tm.user) = 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 '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" %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small"

10
app/views/admin/users/show.html.haml
View file

@ -1,10 +1,12 @@
%h3 %h3.page_title
= @admin_user.name User: #{@admin_user.name}
- if @admin_user.blocked - if @admin_user.blocked
%small Blocked %small Blocked
- if @admin_user.admin - if @admin_user.admin
%small Administrator %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 %br
@ -94,6 +96,6 @@
- project = tm.project - project = tm.project
%tr %tr
%td= link_to project.name, admin_project_path(project) %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 '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" %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn small danger"

5
app/views/milestones/show.html.haml
View file

@ -1,9 +1,12 @@
%h3 %h3.page_title
Milestone ##{@milestone.id} Milestone ##{@milestone.id}
%small %small
= @milestone.expires_at = @milestone.expires_at
%span.right %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" = 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) - if can?(current_user, :admin_milestone, @project)
= link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do = link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do