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
e9c17f39
Commit
e9c17f39
authored
May 02, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gray background on disabled nodes; remove unnecessary tooltips
parent
a4eff55d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/javascripts/geo_nodes.js
app/assets/javascripts/geo_nodes.js
+0
-2
app/assets/stylesheets/pages/geo_nodes.scss
app/assets/stylesheets/pages/geo_nodes.scss
+5
-0
app/helpers/ee/geo_helper.rb
app/helpers/ee/geo_helper.rb
+1
-1
app/views/admin/geo_nodes/index.html.haml
app/views/admin/geo_nodes/index.html.haml
+1
-1
No files found.
app/assets/javascripts/geo_nodes.js
View file @
e9c17f39
...
...
@@ -55,8 +55,6 @@ class GeoNodeStatus {
.
addClass
(
unhealthyClass
+
'
'
+
unhealthyIcon
)
.
attr
(
'
title
'
,
'
Unhealthy
'
);
}
this
.
$icon
.
tooltip
(
'
fixTitle
'
);
}
setHealthStatus
(
healthy
)
{
...
...
app/assets/stylesheets/pages/geo_nodes.scss
View file @
e9c17f39
...
...
@@ -17,6 +17,11 @@
&
:hover
{
background
:
$white-light
;
}
&
.node-disabled
,
&
.node-disabled
:hover
{
background-color
:
$gray-lightest
;
}
}
}
...
...
app/helpers/ee/geo_helper.rb
View file @
e9c17f39
...
...
@@ -11,7 +11,7 @@ module EE
end
icon
"
#{
icon
}
fw"
,
class:
"js-geo-node-icon geo-node-
#{
status
}
has-tooltip
"
,
class:
"js-geo-node-icon geo-node-
#{
status
}
"
,
title:
status
.
capitalize
end
end
...
...
app/views/admin/geo_nodes/index.html.haml
View file @
e9c17f39
...
...
@@ -16,7 +16,7 @@
Geo nodes (
#{
@nodes
.
count
}
)
%ul
.well-list.geo-nodes
-
@nodes
.
each
do
|
node
|
%li
{
id:
dom_id
(
node
),
class:
(
'js-geo-secondary-node'
if
node
.
secondary?
),
data:
{
status_url:
status_admin_geo_node_path
(
node
)
}
}
%li
{
id:
dom_id
(
node
),
class:
(
'js-geo-secondary-node'
if
node
.
secondary?
;
'node-disabled'
if
node
.
enabled?
==
false
),
data:
{
status_url:
status_admin_geo_node_path
(
node
)
}
}
.node-block
=
node_status_icon
(
node
)
%strong
=
node
.
url
...
...
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