(.+)<\/p>.*/
+
+ def render(context)
+ term_info = glossary_term_info(context)
+ description = RENDERED_DESCRIPTION_BLOCK.match(include_snippet(context))[1]
+
+ "" \
+ "#{@args[:text] || term_info["name"]}" \
+ "" \
+ ""
+ end
+ end
+ end
+end
+
+Liquid::Template.register_tag('glossary_definition', Jekyll::GlossaryTags::Definition)
+Liquid::Template.register_tag('glossary_tooltip', Jekyll::GlossaryTags::Tooltip)
+Liquid::Template.register_tag('glossary_injector', Jekyll::GlossaryTags::Injector)
diff --git a/_plugins/liquify_filter.rb b/_plugins/liquify_filter.rb
new file mode 100644
index 0000000000..8c31915699
--- /dev/null
+++ b/_plugins/liquify_filter.rb
@@ -0,0 +1,10 @@
+# Filter to force liquid parsing
+module Jekyll
+ module LiquifyFilter
+ def liquify(input)
+ Liquid::Template.parse(input).render(@context)
+ end
+ end
+end
+
+Liquid::Template.register_filter(Jekyll::LiquifyFilter)
diff --git a/css/custom-jekyll/tags.css b/css/custom-jekyll/tags.css
new file mode 100644
index 0000000000..c9b409091c
--- /dev/null
+++ b/css/custom-jekyll/tags.css
@@ -0,0 +1,56 @@
+.no-underline {
+ text-decoration: none !important;
+}
+
+.hide {
+ display: none !important;
+}
+
+/* Tooltip container */
+.glossary-tooltip {
+ position: relative;
+ display: inline-block;
+ border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
+ color: black;
+ text-decoration: none !important;
+}
+
+/* Tooltip text */
+.glossary-tooltip .tooltip-text {
+ visibility: hidden;
+ width: 300px;
+ background-color: #555;
+ color: #fff;
+ text-align: center;
+ padding: 5px 8px;
+ border-radius: 6px;
+
+ /* Position the tooltip text */
+ position: absolute;
+ z-index: 1;
+ bottom: 125%;
+ left: 50%;
+ margin-left: -150px;
+
+ /* Fade in tooltip */
+ opacity: 0;
+ transition: opacity 0.3s;
+}
+
+/* Tooltip arrow */
+.glossary-tooltip .tooltip-text::after {
+ content: "";
+ position: absolute;
+ top: 100%;
+ left: 50%;
+ margin-left: -5px;
+ border-width: 5px;
+ border-style: solid;
+ border-color: #555 transparent transparent transparent;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.glossary-tooltip:hover .tooltip-text {
+ visibility: visible;
+ opacity: 1;
+}
diff --git a/css/glossary.css b/css/glossary.css
index 67d536ccf9..2146a418e3 100644
--- a/css/glossary.css
+++ b/css/glossary.css
@@ -2,14 +2,6 @@
display: inline;
}
-.no-underline {
- text-decoration: none !important;
-}
-
-.hide {
- display: none !important;
-}
-
.permalink {
background-image: url(../images/link.png);
background-repeat: no-repeat;
diff --git a/docs/concepts/services-networking/ingress.md b/docs/concepts/services-networking/ingress.md
index a0e38c5b8d..11ba226296 100644
--- a/docs/concepts/services-networking/ingress.md
+++ b/docs/concepts/services-networking/ingress.md
@@ -5,7 +5,7 @@ title: Ingress
---
{% capture overview %}
-{% include templates/glossary/snippet.md term="ingress" length="all" %}
+{% glossary_definition term_id="ingress" length="all" %}
{% endcapture %}
{% capture body %}
diff --git a/docs/concepts/workloads/controllers/statefulset.md b/docs/concepts/workloads/controllers/statefulset.md
index 5daa83694e..7fb2431cc3 100644
--- a/docs/concepts/workloads/controllers/statefulset.md
+++ b/docs/concepts/workloads/controllers/statefulset.md
@@ -10,10 +10,10 @@ title: StatefulSets
---
{% capture overview %}
-**StatefulSet is the workload API object used to manage stateful applications.
+**StatefulSet is the workload API object used to manage stateful applications.
StatefulSets are beta in 1.8.**
-{% include templates/glossary/snippet.md term="statefulset" length="all" %}
+{% glossary_definition term_id="statefulset" length="all" %}
{% endcapture %}
{% capture body %}
diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md
index ceb1dc4dd3..4500fb5e1e 100644
--- a/docs/reference/glossary.md
+++ b/docs/reference/glossary.md
@@ -56,9 +56,10 @@ default_active_tag: fundamental
Also known as: {{ term.aka | join: ", " }}
{% endif %}
-{{ term.short-description | markdownify }} [+]
+
+{{ term.short-description | liquify | markdownify }} [+]