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
d03b205b
Commit
d03b205b
authored
Nov 08, 2017
by
Filipa Lacerda
Committed by
Kamil Trzcinski
Dec 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds dropdown
Fixed HTML
parent
cd1b1cbf
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
68 additions
and
66 deletions
+68
-66
app/views/projects/clusters/_dropdown.html.haml
app/views/projects/clusters/_dropdown.html.haml
+13
-0
app/views/projects/clusters/_form.html.haml
app/views/projects/clusters/_form.html.haml
+6
-6
app/views/projects/clusters/_header.html.haml
app/views/projects/clusters/_header.html.haml
+2
-2
app/views/projects/clusters/gcp/_form.html.haml
app/views/projects/clusters/gcp/_form.html.haml
+23
-28
app/views/projects/clusters/gcp/new.html.haml
app/views/projects/clusters/gcp/new.html.haml
+2
-2
app/views/projects/clusters/kubernetes/_form.html.haml
app/views/projects/clusters/kubernetes/_form.html.haml
+20
-26
app/views/projects/clusters/kubernetes/new.html.haml
app/views/projects/clusters/kubernetes/new.html.haml
+2
-2
No files found.
app/views/projects/clusters/_dropdown.html.haml
0 → 100644
View file @
d03b205b
%h4
.prepend-top-0
=
s_
(
'ClusterIntegration|Choose how to set up cluster integration'
)
.dropdown
%button
.dropdown-toggle.form-control
{
type:
'button'
,
data:
{
toggle:
'dropdown'
},
"aria-haspopup"
:
true
,
"aria-expanded"
:
false
}
=
dropdown_text
%span
.caret
%ul
.dropdown-menu
%li
%a
{
href:
providers_gcp_new_namespace_project_clusters_path
(
@project
.
namespace
,
@project
)
}
=
s_
(
'ClusterIntegration| Create cluster on Google Engine'
)
%li
%a
{
href:
platforms_kubernetes_new_namespace_project_clusters_path
(
@project
.
namespace
,
@project
)}
=
s_
(
'ClusterIntegration| Add existing cluster'
)
app/views/projects/clusters/_form.html.haml
View file @
d03b205b
app/views/projects/clusters/_header.html.haml
View file @
d03b205b
%h4
.prepend-top-0
%h4
=
s_
(
'ClusterIntegration|
Create new cluster on Google Container Engine
'
)
=
s_
(
'ClusterIntegration|
Enter the details for your cluster
'
)
%p
%p
=
s_
(
'ClusterIntegration|Please make sure that your Google account meets the following requirements:'
)
=
s_
(
'ClusterIntegration|Please make sure that your Google account meets the following requirements:'
)
%ul
%ul
...
...
app/views/projects/clusters/gcp/_form.html.haml
View file @
d03b205b
.row
.col-sm-8.col-sm-offset-4
%p
-
link_to_help_page
=
link_to
(
s_
(
'ClusterIntegration|help page'
),
help_page_path
(
'user/project/clusters/index'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'ClusterIntegration|Read our %{link_to_help_page} on cluster integration.'
).
html_safe
%
{
link_to_help_page:
link_to_help_page
}
=
form_for
@cluster
,
url:
providers_gcp_namespace_project_clusters_path
(
@project
.
namespace
,
@project
),
as: :cluster
do
|
field
|
=
form_for
@cluster
,
url:
providers_gcp_namespace_project_clusters_path
(
@project
.
namespace
,
@project
),
as: :cluster
do
|
field
|
=
form_errors
(
@cluster
)
=
form_errors
(
@cluster
)
.form-group
.form-group
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Cluster name'
)
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Cluster name'
)
...
...
app/views/projects/clusters/gcp/new.html.haml
View file @
d03b205b
...
@@ -5,6 +5,6 @@
...
@@ -5,6 +5,6 @@
.col-sm-4
.col-sm-4
=
render
'projects/clusters/sidebar'
=
render
'projects/clusters/sidebar'
.col-sm-8
.col-sm-8
=
render
'projects/clusters/dropdown'
,
dropdown_text:
s_
(
'ClusterIntegration|Create cluster on Google Container Engine'
)
=
render
'projects/clusters/header'
=
render
'projects/clusters/header'
=
render
'form'
=
render
'form'
app/views/projects/clusters/kubernetes/_form.html.haml
View file @
d03b205b
.row
=
form_for
@cluster
,
url:
platforms_kubernetes_namespace_project_clusters_path
(
@project
.
namespace
,
@project
),
as: :cluster
do
|
field
|
.col-sm-8.col-sm-offset-4
%p
-
link_to_help_page
=
link_to
(
s_
(
'ClusterIntegration|help page'
),
help_page_path
(
'user/project/clusters/index'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'ClusterIntegration|Read our %{link_to_help_page} on cluster integration.'
).
html_safe
%
{
link_to_help_page:
link_to_help_page
}
=
form_for
@cluster
,
url:
platforms_kubernetes_namespace_project_clusters_path
(
@project
.
namespace
,
@project
),
as: :cluster
do
|
field
|
=
form_errors
(
@cluster
)
=
form_errors
(
@cluster
)
.form-group
.form-group
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Cluster name'
)
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Cluster name'
)
...
...
app/views/projects/clusters/kubernetes/new.html.haml
View file @
d03b205b
...
@@ -5,6 +5,6 @@
...
@@ -5,6 +5,6 @@
.col-sm-4
.col-sm-4
=
render
'projects/clusters/sidebar'
=
render
'projects/clusters/sidebar'
.col-sm-8
.col-sm-8
=
render
'projects/clusters/dropdown'
,
dropdown_text:
s_
(
'ClusterIntegration|Add existing cluster'
)
=
render
'projects/clusters/header'
=
render
'projects/clusters/header'
=
render
'form'
=
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