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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
22be0785
Commit
22be0785
authored
Nov 18, 2011
by
Alexander Randa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changing admin disign for users finish
parent
f950d788
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
39 deletions
+54
-39
app/views/admin/users/edit.html.haml
app/views/admin/users/edit.html.haml
+1
-1
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+1
-4
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+52
-34
No files found.
app/views/admin/users/edit.html.haml
View file @
22be0785
=
render
'form'
=
render
'form'
=
link_to
'Show'
,
[
:admin
,
@admin_user
],
:class
=>
"right lbutton"
=
link_to
'Back'
,
admin_users_path
,
:class
=>
"right lbutton"
=
link_to
'Back'
,
admin_users_path
,
:class
=>
"right lbutton"
=
link_to
'Show'
,
[
:admin
,
@admin_user
],
:class
=>
"right lbutton"
app/views/admin/users/index.html.haml
View file @
22be0785
...
@@ -18,8 +18,5 @@
...
@@ -18,8 +18,5 @@
%td
=
link_to
'Edit'
,
edit_admin_user_path
(
user
),
:id
=>
"edit_
#{
dom_id
(
user
)
}
"
%td
=
link_to
'Edit'
,
edit_admin_user_path
(
user
),
:id
=>
"edit_
#{
dom_id
(
user
)
}
"
%td
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
%td
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
%br
=
paginate
@admin_users
=
paginate
@admin_users
=
link_to
'New User'
,
new_admin_user_path
,
:class
=>
"lbutton"
=
link_to
'New User'
,
new_admin_user_path
app/views/admin/users/show.html.haml
View file @
22be0785
-
unless
notice
.
nil?
-
unless
notice
.
nil?
%p
#notice
=
notice
%p
#notice
=
notice
#infoblock
%h2
=
@admin_user
.
name
%p
%b
Name:
=
@admin_user
.
name
%p
%b
Email:
=
@admin_user
.
email
%p
%b
Admin:
=
@admin_user
.
admin
%p
%b
Projects limit:
=
@admin_user
.
projects_limit
%p
%table
.round-borders
%b
Skype:
%tr
=
@admin_user
.
skype
%td
%p
%b
%b
LinkedIn:
Email:
=
@admin_user
.
linkedin
%td
%p
=
@admin_user
.
email
%b
Twitter:
%tr
=
@admin_user
.
twitter
%td
%b
.clear
Admin:
=
link_to
'Edit'
,
edit_admin_user_path
(
@admin_user
)
%td
=
check_box_tag
"admin"
,
1
,
@admin_user
.
admin
,
:disabled
=>
:disabled
\|
%tr
=
link_to
'Back'
,
admin_users_path
%td
%b
Projects limit:
%td
=
@admin_user
.
projects_limit
-
unless
@admin_user
.
skype
.
empty?
%tr
%td
%b
Skype:
%td
=
@admin_user
.
skype
-
unless
@admin_user
.
linkedin
.
empty?
%tr
%td
%b
Linkedin:
%td
=
@admin_user
.
linkedin
-
unless
@admin_user
.
twitter
.
empty?
%tr
%td
%b
Twitter:
%td
=
@admin_user
.
twitter
%tr
%td
{
:colspan
=>
2
}
=
link_to
'Edit'
,
edit_admin_user_path
(
@admin_user
),
:class
=>
"lbutton"
=
link_to
'Back'
,
admin_users_path
,
:class
=>
"right lbutton"
.span-14
.span-14
%h2
Projects
%h2
Projects
%table
.round-borders
%table
.round-borders
%tr
%tr
%th
Name
%thead
%th
Added
%th
Name
%th
Web
%th
Added
%th
Git
%th
Web
%th
Admin
%th
Git
%th
%th
Admin
%th
-
@admin_user
.
users_projects
.
each
do
|
tm
|
-
@admin_user
.
users_projects
.
each
do
|
tm
|
-
project
=
tm
.
project
-
project
=
tm
.
project
...
@@ -53,4 +71,4 @@
...
@@ -53,4 +71,4 @@
%td
=
link_to
'Edit'
,
edit_admin_team_member_path
(
tm
)
%td
=
link_to
'Edit'
,
edit_admin_team_member_path
(
tm
)
%td
=
link_to
'Cancel'
,
admin_team_member_path
(
tm
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
%td
=
link_to
'Cancel'
,
admin_team_member_path
(
tm
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
=
link_to
'Add To Another Project'
,
new_admin_team_member_path
(
:team_member
=>
{
:user_id
=>
@admin_user
.
id
})
=
link_to
'Add To Another Project'
,
new_admin_team_member_path
(
:team_member
=>
{
:user_id
=>
@admin_user
.
id
})
,
:class
=>
"lbutton"
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