Fix milestone calendar, Removed unnecessary selects from admin
This commit is contained in:
parent
3c132f2e68
commit
9270b6c3c7
6 changed files with 32 additions and 10 deletions
|
@ -661,3 +661,4 @@ li.note {
|
|||
margin-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
@include bg-gray-gradient;
|
||||
padding: 4px 7px;
|
||||
border: 1px solid #CCC;
|
||||
margin-bottom:5px;
|
||||
margin-bottom:20px;
|
||||
}
|
||||
|
||||
.project_clone_holder {
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue