Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9270b6c3
Commit
9270b6c3
authored
Sep 26, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix milestone calendar, Removed unnecessary selects from admin
parent
3c132f2e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
10 deletions
+32
-10
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+1
-0
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/issues.scss
+14
-0
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+1
-1
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+6
-4
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+6
-4
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+4
-1
No files found.
app/assets/stylesheets/common.scss
View file @
9270b6c3
...
@@ -661,3 +661,4 @@ li.note {
...
@@ -661,3 +661,4 @@ li.note {
margin-right
:
30px
;
margin-right
:
30px
;
}
}
}
}
app/assets/stylesheets/sections/issues.scss
View file @
9270b6c3
...
@@ -113,3 +113,17 @@ input.check_all_issues {
...
@@ -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
;
}
}
app/assets/stylesheets/sections/projects.scss
View file @
9270b6c3
...
@@ -74,7 +74,7 @@
...
@@ -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
:
5
px
;
margin-bottom
:
20
px
;
}
}
.project_clone_holder
{
.project_clone_holder
{
...
...
app/views/admin/projects/show.html.haml
View file @
9270b6c3
%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 @@
...
@@ -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"
...
...
app/views/admin/users/show.html.haml
View file @
9270b6c3
%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 @@
...
@@ -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"
app/views/milestones/show.html.haml
View file @
9270b6c3
%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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment