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
Kazuhiko Shiozaki
gitlab-ce
Commits
0b747a0f
Commit
0b747a0f
authored
Aug 06, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor UI improvements
parent
84565840
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
14 deletions
+13
-14
app/views/projects/deploy_keys/index.html.haml
app/views/projects/deploy_keys/index.html.haml
+7
-7
app/views/projects/team_members/import.html.haml
app/views/projects/team_members/import.html.haml
+4
-5
app/views/projects/team_members/index.html.haml
app/views/projects/team_members/index.html.haml
+2
-2
No files found.
app/views/projects/deploy_keys/index.html.haml
View file @
0b747a0f
%
p
.slead
%
h3
.page-title
Deploy keys allow read-only access to repository
Deploy keys allow read-only access to repository
=
link_to
new_project_deploy_key_path
(
@project
),
class:
"btn btn-new pull-right"
,
title:
"New Deploy Key"
do
=
link_to
new_project_deploy_key_path
(
@project
),
class:
"btn btn-new pull-right"
,
title:
"New Deploy Key"
do
...
@@ -13,9 +13,9 @@
...
@@ -13,9 +13,9 @@
.row
.row
.span5.enabled-keys
.span5.enabled-keys
%h5
.cgreen
%h5
Enabled deploy keys
%strong
.cgreen
Enabled deploy keys
%small
for this project
for this project
%ul
.bordered-list
%ul
.bordered-list
=
render
@enabled_keys
=
render
@enabled_keys
-
if
@enabled_keys
.
blank?
-
if
@enabled_keys
.
blank?
...
@@ -23,10 +23,10 @@
...
@@ -23,10 +23,10 @@
%p
.nothing_here_message
Create
#{
link_to
'new deploy key'
,
new_project_deploy_key_path
(
@project
)
}
or add existing one
%p
.nothing_here_message
Create
#{
link_to
'new deploy key'
,
new_project_deploy_key_path
(
@project
)
}
or add existing one
.span5.available-keys
.span5.available-keys
%h5
%h5
Available d
eploy keys
%strong
D
eploy keys
%small
from projects you are able to manage
from projects available for you
%ul
.bordered-list
%ul
.bordered-list
=
render
@available_keys
=
render
@available_keys
-
if
@available_keys
.
blank?
-
if
@available_keys
.
blank?
.light-well
.light-well
%p
.nothing_here_message
All deploy keys created in projects you
own
will be displayed here
%p
.nothing_here_message
All deploy keys created in projects you
participate
will be displayed here
app/views/projects/team_members/import.html.haml
View file @
0b747a0f
%h3
.page-title
%h3
.page-title
=
"Import team from another project"
=
"Import members from another project"
%p
.light
Only project members will be improted. Group members will be skipped.
%hr
%hr
%p
.slead
Read more about project team import
#{
link_to
"here"
,
'#'
,
class:
'vlink'
}
.
=
form_tag
apply_import_project_team_members_path
(
@project
),
method:
'post'
do
=
form_tag
apply_import_project_team_members_path
(
@project
),
method:
'post'
do
%p
.slead
Choose project you want to use as team source:
.padded
.padded
=
label_tag
:source_project_id
,
"Project"
=
label_tag
:source_project_id
,
"Project"
.input
=
select_tag
(
:source_project_id
,
options_from_collection_for_select
(
current_user
.
authorized_projects
,
:id
,
:name_with_namespace
),
prompt:
"Select project"
,
class:
"chosen xxlarge"
,
required:
true
)
.input
=
select_tag
(
:source_project_id
,
options_from_collection_for_select
(
current_user
.
authorized_projects
,
:id
,
:name_with_namespace
),
prompt:
"Select project"
,
class:
"chosen xxlarge"
,
required:
true
)
.actions
.actions
=
submit_tag
'Import
'
,
class:
"btn btn-sav
e"
=
submit_tag
'Import
project members'
,
class:
"btn btn-creat
e"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
app/views/projects/team_members/index.html.haml
View file @
0b747a0f
...
@@ -3,10 +3,10 @@
...
@@ -3,10 +3,10 @@
-
if
can?
current_user
,
:admin_team_member
,
@project
-
if
can?
current_user
,
:admin_team_member
,
@project
%span
.pull-right
%span
.pull-right
=
link_to
import_project_team_members_path
(
@project
),
class:
"btn grouped"
,
title:
"Import team from another project"
do
Import team from another project
=
link_to
new_project_team_member_path
(
@project
),
class:
"btn btn-new grouped"
,
title:
"New Team Member"
do
=
link_to
new_project_team_member_path
(
@project
),
class:
"btn btn-new grouped"
,
title:
"New Team Member"
do
New Team Member
New Team Member
=
link_to
import_project_team_members_path
(
@project
),
class:
"btn grouped"
,
title:
"Import team from another project"
do
Import members
%p
.light
%p
.light
Read more about project permissions
Read more about project permissions
...
...
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