Add visibility description tooltip to snippet and project visibility labels
This commit is contained in:
parent
085e45a81c
commit
d65647e90c
|
@ -27,16 +27,20 @@ module IconsHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def public_icon
|
def visibility_level_icon(level, fw: true)
|
||||||
icon('globe fw')
|
name =
|
||||||
end
|
case level
|
||||||
|
when Gitlab::VisibilityLevel::PRIVATE
|
||||||
|
'lock'
|
||||||
|
when Gitlab::VisibilityLevel::INTERNAL
|
||||||
|
'shield'
|
||||||
|
else # Gitlab::VisibilityLevel::PUBLIC
|
||||||
|
'globe'
|
||||||
|
end
|
||||||
|
|
||||||
def internal_icon
|
name << " fw" if fw
|
||||||
icon('shield fw')
|
|
||||||
end
|
|
||||||
|
|
||||||
def private_icon
|
icon(name)
|
||||||
icon('lock fw')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def file_type_icon_class(type, mode, name)
|
def file_type_icon_class(type, mode, name)
|
||||||
|
|
|
@ -25,48 +25,24 @@ module VisibilityLevelHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def project_visibility_level_description(level)
|
def project_visibility_level_description(level)
|
||||||
capture_haml do
|
case level
|
||||||
haml_tag :span do
|
when Gitlab::VisibilityLevel::PRIVATE
|
||||||
case level
|
"Project access must be granted explicitly for each user."
|
||||||
when Gitlab::VisibilityLevel::PRIVATE
|
when Gitlab::VisibilityLevel::INTERNAL
|
||||||
haml_concat "Project access must be granted explicitly for each user."
|
"The project can be cloned by any logged in user."
|
||||||
when Gitlab::VisibilityLevel::INTERNAL
|
when Gitlab::VisibilityLevel::PUBLIC
|
||||||
haml_concat "The project can be cloned by"
|
"The project can be cloned without any authentication."
|
||||||
haml_concat "any logged in user."
|
|
||||||
when Gitlab::VisibilityLevel::PUBLIC
|
|
||||||
haml_concat "The project can be cloned"
|
|
||||||
haml_concat "without any"
|
|
||||||
haml_concat "authentication."
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def snippet_visibility_level_description(level)
|
def snippet_visibility_level_description(level)
|
||||||
capture_haml do
|
|
||||||
haml_tag :span do
|
|
||||||
case level
|
|
||||||
when Gitlab::VisibilityLevel::PRIVATE
|
|
||||||
haml_concat "The snippet is visible only for me."
|
|
||||||
when Gitlab::VisibilityLevel::INTERNAL
|
|
||||||
haml_concat "The snippet is visible for any logged in user."
|
|
||||||
when Gitlab::VisibilityLevel::PUBLIC
|
|
||||||
haml_concat "The snippet can be accessed"
|
|
||||||
haml_concat "without any"
|
|
||||||
haml_concat "authentication."
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def visibility_level_icon(level)
|
|
||||||
case level
|
case level
|
||||||
when Gitlab::VisibilityLevel::PRIVATE
|
when Gitlab::VisibilityLevel::PRIVATE
|
||||||
private_icon
|
"The snippet is visible only for me."
|
||||||
when Gitlab::VisibilityLevel::INTERNAL
|
when Gitlab::VisibilityLevel::INTERNAL
|
||||||
internal_icon
|
"The snippet is visible for any logged in user."
|
||||||
when Gitlab::VisibilityLevel::PUBLIC
|
when Gitlab::VisibilityLevel::PUBLIC
|
||||||
public_icon
|
"The snippet can be accessed without any authentication."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
Forked from
|
Forked from
|
||||||
= link_to project_path(forked_from_project) do
|
= link_to project_path(forked_from_project) do
|
||||||
= forked_from_project.namespace.try(:name)
|
= forked_from_project.namespace.try(:name)
|
||||||
.visibility-level-label
|
|
||||||
= visibility_level_icon(@project.visibility_level)
|
|
||||||
.cover-controls.left
|
.cover-controls.left
|
||||||
|
.visibility-level-label.has_tooltip{title: project_visibility_level_description(@project.visibility_level), data: { container: 'body' } }
|
||||||
|
= visibility_level_icon(@project.visibility_level, fw: false)
|
||||||
= visibility_level_label(@project.visibility_level)
|
= visibility_level_label(@project.visibility_level)
|
||||||
|
|
||||||
.cover-controls
|
.cover-controls
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.snippet-details
|
.snippet-details
|
||||||
.page-title
|
.page-title
|
||||||
.snippet-box{class: visibility_level_color(@snippet.visibility_level)}
|
.snippet-box.has_tooltip{class: visibility_level_color(@snippet.visibility_level), title: snippet_visibility_level_description(@snippet.visibility_level), data: { container: 'body' }}
|
||||||
= visibility_level_icon(@snippet.visibility_level)
|
= visibility_level_icon(@snippet.visibility_level, fw: false)
|
||||||
= visibility_level_label(@snippet.visibility_level)
|
= visibility_level_label(@snippet.visibility_level)
|
||||||
%span.snippet-id Snippet ##{@snippet.id}
|
%span.snippet-id Snippet ##{@snippet.id}
|
||||||
%span.creator
|
%span.creator
|
||||||
|
|
Loading…
Reference in New Issue