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
6ff0652e
Commit
6ff0652e
authored
Aug 25, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Admin area -> user form
parent
f13bccc1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
62 deletions
+72
-62
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+5
-3
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+62
-54
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
-1
app/views/admin/users/new.html.haml
app/views/admin/users/new.html.haml
+2
-2
No files found.
app/views/admin/dashboard/index.html.haml
View file @
6ff0652e
...
...
@@ -35,11 +35,13 @@
%h3
Latest projects
%hr
-
@projects
.
each
do
|
project
|
%
h5
%
p
=
link_to
project
.
name
,
[
:admin
,
project
]
.span6
%h3
Latest users
%hr
-
@users
.
each
do
|
user
|
%h5
=
link_to
user
.
name
,
[
:admin
,
user
]
%p
=
link_to
[
:admin
,
user
]
do
=
user
.
name
%small
=
user
.
email
app/views/admin/projects/index.html.haml
View file @
6ff0652e
%h3
%h3
.page_title
Projects
=
link_to
'New Project'
,
new_admin_project_path
,
class:
"btn small right"
%br
...
...
app/views/admin/users/_form.html.haml
View file @
6ff0652e
...
...
@@ -2,68 +2,76 @@
=
form_for
[
:admin
,
@admin_user
]
do
|
f
|
-
if
@admin_user
.
errors
.
any?
#error_explanation
%ul
%ul
.unstyled.alert.alert-error
-
@admin_user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.row
.span6
.clearfix
=
f
.
label
:name
.input
=
f
.
text_field
:name
%span
.help-inline
* required
.clearfix
=
f
.
label
:email
.input
=
f
.
text_field
:email
%span
.help-inline
* required
%hr
-
if
f
.
object
.
new_record?
.clearfix
=
f
.
label
:admin
,
class:
"checkbox"
do
=
f
.
check_box
:force_random_password
,
{},
true
,
nil
%span
Generate random password
%div
.password-fields
.span7
.ui-box
%br
.clearfix
=
f
.
label
:password
.input
=
f
.
password_field
:password
,
disabled:
f
.
object
.
force_random_password
=
f
.
label
:name
.input
=
f
.
text_field
:name
%span
.help-inline
* required
.clearfix
=
f
.
label
:password_confirmation
.input
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
%hr
.clearfix
=
f
.
label
:skype
.input
=
f
.
text_field
:skype
.clearfix
=
f
.
label
:linkedin
.input
=
f
.
text_field
:linkedin
.clearfix
=
f
.
label
:twitter
.input
=
f
.
text_field
:twitter
.span6
.clearfix
=
f
.
label
:projects_limit
.input
=
f
.
text_field
:projects_limit
,
class:
"small_input"
=
f
.
label
:email
.input
=
f
.
text_field
:email
%span
.help-inline
* required
%hr
-
if
f
.
object
.
new_record?
.clearfix
=
f
.
label
:force_random_password
do
%span
Generate random password
.input
=
f
.
check_box
:force_random_password
,
{},
true
,
nil
%div
.password-fields
.clearfix
=
f
.
label
:password
.input
=
f
.
password_field
:password
,
disabled:
f
.
object
.
force_random_password
.clearfix
=
f
.
label
:password_confirmation
.input
=
f
.
password_field
:password_confirmation
,
disabled:
f
.
object
.
force_random_password
%hr
.clearfix
=
f
.
label
:skype
.input
=
f
.
text_field
:skype
.clearfix
=
f
.
label
:linkedin
.input
=
f
.
text_field
:linkedin
.clearfix
=
f
.
label
:twitter
.input
=
f
.
text_field
:twitter
.span5
.ui-box
%br
.clearfix
=
f
.
label
:projects_limit
.input
=
f
.
number_field
:projects_limit
.alert
.clearfix
%p
Make the user a GitLab administrator.
=
f
.
label
:admin
,
class:
"checkbox"
do
=
f
.
check_box
:admin
%span
Administrator
-
unless
@admin_user
.
new_record?
.alert.alert-error
-
if
@admin_user
.
blocked
%span
=
link_to
'Unblock'
,
unblock_admin_user_path
(
@admin_user
),
method: :put
,
class:
"btn small"
This user is blocked and is not able to login to GitLab
-
else
%span
=
link_to
'Block'
,
block_admin_user_path
(
@admin_user
),
confirm:
'USER WILL BE BLOCKED! Are you sure?'
,
method: :put
,
class:
"btn small danger"
Blocked users will be removed from all projects
&
will not be able to login to GitLab.
=
f
.
label
:admin
do
%strong
.cred
Administrator
.input
=
f
.
check_box
:admin
-
unless
@admin_user
.
new_record?
%hr
.padded.cred
-
if
@admin_user
.
blocked
%span
This user is blocked and is not able to login to GitLab
.clearfix
=
link_to
'Unblock User'
,
unblock_admin_user_path
(
@admin_user
),
method: :put
,
class:
"btn small right"
-
else
%span
Blocked users will be removed from all projects
&
will not be able to login to GitLab.
.clearfix
=
link_to
'Block User'
,
block_admin_user_path
(
@admin_user
),
confirm:
'USER WILL BE BLOCKED! Are you sure?'
,
method: :put
,
class:
"btn small right danger"
.row
.span6
.span6
.actions
=
f
.
submit
'Save'
,
class:
"btn primary"
-
if
@admin_user
.
new_record?
...
...
app/views/admin/users/edit.html.haml
View file @
6ff0652e
%h3
=
@admin_user
.
name
%h3
.page_title
#{
@admin_user
.
name
}
→
Edit user
%hr
=
render
'form'
app/views/admin/users/index.html.haml
View file @
6ff0652e
%h3
%h3
.page_title
Users
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn small right"
%br
...
...
app/views/admin/users/new.html.haml
View file @
6ff0652e
%h
2
New user
%
h
r
%h
3
.page_title
New user
%
b
r
=
render
'form'
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