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
10f205f8
Commit
10f205f8
authored
7 years ago
by
Filipa Lacerda
Committed by
Kamil Trzcinski
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after UX review
parent
e25a8e12
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
app/assets/stylesheets/pages/clusters.scss
app/assets/stylesheets/pages/clusters.scss
+2
-0
app/views/projects/clusters/_advanced_settings.html.haml
app/views/projects/clusters/_advanced_settings.html.haml
+7
-6
app/views/projects/clusters/_dropdown.html.haml
app/views/projects/clusters/_dropdown.html.haml
+1
-1
app/views/projects/clusters/gcp/_show.html.haml
app/views/projects/clusters/gcp/_show.html.haml
+1
-1
app/views/projects/clusters/kubernetes/_show.html.haml
app/views/projects/clusters/kubernetes/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/clusters.scss
View file @
10f205f8
...
@@ -12,3 +12,5 @@
...
@@ -12,3 +12,5 @@
.clusters-dropdown-menu
{
.clusters-dropdown-menu
{
max-width
:
100%
;
max-width
:
100%
;
}
}
@include
new-style-dropdown
(
'.clusters-dropdown '
);
This diff is collapsed.
Click to expand it.
app/views/projects/clusters/_advanced_settings.html.haml
View file @
10f205f8
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
.append-bottom-20
-
if
@cluster
.
managed?
%label
.append-bottom-10
.append-bottom-20
=
s_
(
'ClusterIntegration|Google Container Engine'
)
%label
.append-bottom-10
%p
=
s_
(
'ClusterIntegration|Google Container Engine'
)
-
link_gke
=
link_to
(
s_
(
'ClusterIntegration|Google Container Engine'
),
@cluster
.
gke_cluster_url
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
%p
=
s_
(
'ClusterIntegration|Manage your cluster by visiting %{link_gke}'
).
html_safe
%
{
link_gke:
link_gke
}
-
link_gke
=
link_to
(
s_
(
'ClusterIntegration|Google Container Engine'
),
@cluster
.
gke_cluster_url
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'ClusterIntegration|Manage your cluster by visiting %{link_gke}'
).
html_safe
%
{
link_gke:
link_gke
}
.well.form-group
.well.form-group
%label
.text-danger
%label
.text-danger
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/clusters/_dropdown.html.haml
View file @
10f205f8
%h4
.prepend-top-0
=
s_
(
'ClusterIntegration|Choose how to set up cluster integration'
)
%h4
.prepend-top-0
=
s_
(
'ClusterIntegration|Choose how to set up cluster integration'
)
.dropdown
.dropdown
.clusters-dropdown
%button
.dropdown-menu-toggle.dropdown-menu-full-width
{
type:
'button'
,
data:
{
toggle:
'dropdown'
},
'aria-haspopup'
:
true
,
'aria-expanded'
:
false
}
%button
.dropdown-menu-toggle.dropdown-menu-full-width
{
type:
'button'
,
data:
{
toggle:
'dropdown'
},
'aria-haspopup'
:
true
,
'aria-expanded'
:
false
}
%span
.dropdown-toggle-text
%span
.dropdown-toggle-text
=
dropdown_text
=
dropdown_text
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/clusters/gcp/_show.html.haml
View file @
10f205f8
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
.form-group
.form-group
=
platform_kubernetes_field
.
label
:namespace
,
s_
(
'ClusterIntegration|Project namespace (optional, unique)'
)
=
platform_kubernetes_field
.
label
:namespace
,
s_
(
'ClusterIntegration|Project namespace (optional, unique)'
)
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
,
readonly:
true
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
.form-group
.form-group
=
field
.
submit
s_
(
'ClusterIntegration|Save changes'
),
class:
'btn btn-save'
=
field
.
submit
s_
(
'ClusterIntegration|Save changes'
),
class:
'btn btn-save'
This diff is collapsed.
Click to expand it.
app/views/projects/clusters/kubernetes/_show.html.haml
View file @
10f205f8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%label
.append-bottom-10
{
for:
'cluster-name'
}
%label
.append-bottom-10
{
for:
'cluster-name'
}
=
s_
(
'ClusterIntegration|Cluster name'
)
=
s_
(
'ClusterIntegration|Cluster name'
)
.input-group
.input-group
%input
.form-control.cluster-name
{
value:
@cluster
.
name
,
readonly:
true
}
%input
.form-control.cluster-name
{
value:
@cluster
.
name
}
%span
.input-group-addon.clipboard-addon
%span
.input-group-addon.clipboard-addon
=
clipboard_button
(
text:
@cluster
.
name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
))
=
clipboard_button
(
text:
@cluster
.
name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
))
...
...
This diff is collapsed.
Click to expand it.
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