Merge pull request #4468 from galaxyproject/burmese-beaver

Add tool version to tool buttons
galaxyproject · Nov 1, 2023 · c2783f2 · c2783f2
2 parents 38bdea6 + 57b2bee
commit c2783f2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/_plugins/jekyll-tool-tag.rb b/_plugins/jekyll-tool-tag.rb
@@ -22,11 +22,23 @@ def render(context)
       if m
         # check if a variable was provided for the tool id
         tool = context[m[2].tr('{}', '')] || m[2]
+        version = tool.split('/').last
 
-        "<span class=\"tool\" data-tool=\"#{tool}\" title=\"#{m[1]} tool\" aria-role=\"link\">" \
-          "<strong>#{m[1]}</strong> " \
-          '<i class="fas fa-wrench" aria-hidden="true"></i><i aria-hidden="true" class="fas fa-cog"></i>' \
-          "<span class=\"visually-hidden\">Tool: #{tool}</span></span>"
+        if tool.count('/') == 0
+          "<span class=\"tool\" data-tool=\"#{tool}\" title=\"#{m[1]} tool\" aria-role=\"button\">" \
+            '<i class="fas fa-wrench" aria-hidden="true"></i> ' \
+            "<strong>#{m[1]}</strong>" \
+          '</span>'
+        else
+          "<span class=\"tool\" data-tool=\"#{tool}\" title=\"#{m[1]} tool\" aria-role=\"button\">" \
+            '<i class="fas fa-wrench" aria-hidden="true"></i> ' \
+            "<strong>#{m[1]}</strong> " \
+            '(' \
+            '<i class="fas fa-cubes" aria-hidden="true"></i> ' \
+            "Galaxy version #{version}" \
+            ')' \
+          '</span>'
+        end
       else
         %(<span><strong>#{@text}</strong> <i class="fas fa-wrench" aria-hidden="true"></i></span>)
       end

diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -1584,6 +1584,11 @@ a[target="_blank"]::after {
   height: 1em;
 }
 
+/* Not for figures where it's duplicated */
+figure > a[target="_blank"]::after {
+	content: unset;
+}
+
 .tutorials-list {
 /* Big */
 @media (min-width:768px) {