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
564942ea
Commit
564942ea
authored
Oct 10, 2019
by
James Fargher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed group-level views to be generic
parent
b817db64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/clusters/clusters/show.html.haml
app/views/clusters/clusters/show.html.haml
+1
-1
ee/app/views/clusters/clusters/_cluster_environments.html.haml
...p/views/clusters/clusters/_cluster_environments.html.haml
+4
-4
No files found.
app/views/clusters/clusters/show.html.haml
View file @
564942ea
...
@@ -42,6 +42,6 @@
...
@@ -42,6 +42,6 @@
=
render
'banner'
=
render
'banner'
-
if
cluster_environments_path
.
present?
-
if
cluster_environments_path
.
present?
=
render_if_exists
'clusters/clusters/
group_
cluster_environments'
,
expanded:
expanded
=
render_if_exists
'clusters/clusters/cluster_environments'
,
expanded:
expanded
-
else
-
else
=
render
'configure'
,
expanded:
expanded
=
render
'configure'
,
expanded:
expanded
ee/app/views/clusters/clusters/_
group_
cluster_environments.html.haml
→
ee/app/views/clusters/clusters/_cluster_environments.html.haml
View file @
564942ea
...
@@ -6,18 +6,18 @@
...
@@ -6,18 +6,18 @@
.js-toggle-container
.js-toggle-container
%ul
.nav-links.mobile-separator.nav.nav-tabs
{
role:
'tablist'
}
%ul
.nav-links.mobile-separator.nav.nav-tabs
{
role:
'tablist'
}
%li
.nav-item
{
role:
'presentation'
}
%li
.nav-item
{
role:
'presentation'
}
%a
.nav-link
{
class:
active_when
(
is_configure_active
),
href:
clusterable
.
cluster_path
(
@cluster
.
id
,
params:
{
tab:
'configure'
}),
id:
'
group-
cluster-configure-tab'
}
%a
.nav-link
{
class:
active_when
(
is_configure_active
),
href:
clusterable
.
cluster_path
(
@cluster
.
id
,
params:
{
tab:
'configure'
}),
id:
'cluster-configure-tab'
}
%span
=
_
(
'Configuration'
)
%span
=
_
(
'Configuration'
)
%li
.nav-item
{
role:
'presentation'
}
%li
.nav-item
{
role:
'presentation'
}
%a
.nav-link
{
class:
active_when
(
!
is_configure_active
),
href:
clusterable
.
cluster_path
(
@cluster
.
id
,
params:
{
tab:
'environments'
}),
id:
'
group-
cluster-environments-tab'
}
%a
.nav-link
{
class:
active_when
(
!
is_configure_active
),
href:
clusterable
.
cluster_path
(
@cluster
.
id
,
params:
{
tab:
'environments'
}),
id:
'cluster-environments-tab'
}
%span
.js-cluster-nav-environments
=
_
(
'Environments'
)
%span
.js-cluster-nav-environments
=
_
(
'Environments'
)
.tab-content
.tab-content
-
if
is_configure_active
-
if
is_configure_active
.tab-pane.active
{
id:
'
group-
cluster-configure-pane'
,
role:
'tabpanel'
}
.tab-pane.active
{
id:
'cluster-configure-pane'
,
role:
'tabpanel'
}
=
render
'configure'
,
expanded:
expanded
=
render
'configure'
,
expanded:
expanded
-
else
-
else
.tab-pane.active
{
id:
'
group-
cluster-environments-pane'
,
role:
'tabpanel'
}
.tab-pane.active
{
id:
'cluster-environments-pane'
,
role:
'tabpanel'
}
#js-cluster-environments
#js-cluster-environments
-
else
-
else
...
...
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