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
f71df9f5
Commit
f71df9f5
authored
Oct 06, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix margins in edit form
parent
354e2ef0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
app/assets/stylesheets/pages/clusters.scss
app/assets/stylesheets/pages/clusters.scss
+4
-0
app/views/projects/clusters/show.html.haml
app/views/projects/clusters/show.html.haml
+10
-11
No files found.
app/assets/stylesheets/pages/clusters.scss
View file @
f71df9f5
...
@@ -2,4 +2,8 @@
...
@@ -2,4 +2,8 @@
.clipboard-addon
{
.clipboard-addon
{
background-color
:
$white-light
;
background-color
:
$white-light
;
}
}
.alert-block
{
margin-bottom
:
20px
;
}
}
}
app/views/projects/clusters/show.html.haml
View file @
f71df9f5
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
.col-sm-4
.col-sm-4
=
render
'sidebar'
=
render
'sidebar'
.col-sm-8
.col-sm-8
%
h4
.prepend-top-0
%
label
.append-bottom-10
{
for:
'enable-cluster-integration'
}
=
s_
(
'ClusterIntegration|Enable cluster integration'
)
=
s_
(
'ClusterIntegration|Enable cluster integration'
)
%p
%p
-
if
@cluster
.
enabled?
-
if
@cluster
.
enabled?
...
@@ -22,8 +22,8 @@
...
@@ -22,8 +22,8 @@
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@cluster
]
do
|
field
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@cluster
]
do
|
field
|
=
form_errors
(
@cluster
)
=
form_errors
(
@cluster
)
.form-group
.form-group
.append-bottom-20
%label
.
toggle-wrapper
%label
.
append-bottom-10
=
field
.
hidden_field
:enabled
,
{
class:
'js-toggle-input'
}
=
field
.
hidden_field
:enabled
,
{
class:
'js-toggle-input'
}
%button
{
type:
'button'
,
%button
{
type:
'button'
,
...
@@ -34,34 +34,33 @@
...
@@ -34,34 +34,33 @@
-
if
can?
(
current_user
,
:update_cluster
,
@cluster
)
-
if
can?
(
current_user
,
:update_cluster
,
@cluster
)
.form-group
.form-group
=
field
.
submit
s_
(
'ClusterIntegration|Save
changes
'
),
class:
'btn btn-success'
=
field
.
submit
s_
(
'ClusterIntegration|Save'
),
class:
'btn btn-success'
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
%label
%label
.append-bottom-10
{
for:
'google-container-engine'
}
=
s_
(
'ClusterIntegration|Google Container Engine'
)
=
s_
(
'ClusterIntegration|Google Container Engine'
)
%p
%p
-
link_gke
=
link_to
(
s_
(
'ClusterIntegration|Google Container Engine'
),
@cluster
.
gke_cluster_url
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
-
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
}
=
s_
(
'ClusterIntegration|Manage your cluster by visiting %{link_gke}'
).
html_safe
%
{
link_gke:
link_gke
}
.hidden.js-cluster-error.alert.alert-danger
{
role:
'alert'
}
.hidden.js-cluster-error.alert.alert-danger
.alert-block
{
role:
'alert'
}
=
s_
(
'ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine'
)
=
s_
(
'ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine'
)
%p
.js-error-reason
%p
.js-error-reason
.hidden.js-cluster-creating.alert.alert-info
{
role:
'alert'
}
.hidden.js-cluster-creating.alert.alert-info
.alert-block
{
role:
'alert'
}
=
s_
(
'ClusterIntegration|Cluster is being created on Google Container Engine...'
)
=
s_
(
'ClusterIntegration|Cluster is being created on Google Container Engine...'
)
.hidden.js-cluster-success.alert.alert-
info
{
role:
'alert'
}
.hidden.js-cluster-success.alert.alert-
success.alert-block
{
role:
'alert'
}
=
s_
(
'ClusterIntegration|Cluster was successfully created on Google Container Engine'
)
=
s_
(
'ClusterIntegration|Cluster was successfully created on Google Container Engine'
)
.form_group
.form_group
.append-bottom-20
%label
{
for:
'cluter_
name'
}
%label
.append-bottom-10
{
for:
'cluter-
name'
}
=
s_
(
'ClusterIntegration|Cluster name'
)
=
s_
(
'ClusterIntegration|Cluster name'
)
.input-group
.input-group
%input
.form-control.cluster-name
{
value:
@cluster
.
gcp_cluster_name
,
disabled:
true
}
%input
.form-control.cluster-name
{
value:
@cluster
.
gcp_cluster_name
,
disabled:
true
}
%span
.input-group-addon.clipboard-addon
%span
.input-group-addon.clipboard-addon
=
clipboard_button
(
text:
@cluster
.
gcp_cluster_name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
))
=
clipboard_button
(
text:
@cluster
.
gcp_cluster_name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
))
%br
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
.well.form_group
.well.form_group
%label
.text-danger
%label
.text-danger
...
...
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