Simplify badge selection in jelly and allow all text to be HTML

Author: strangelookingnerd

src/main/resources/com/jenkinsci/plugins/badge/action/BadgeAction/badge.jelly

@@ -23,32 +23,44 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<?jelly escape-by-default='true'?>
+<?jelly escape-by-default='false'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-    <!-- icon without link -->
-    <j:if test="${it.icon != null &amp;&amp; it.icon != '' &amp;&amp; (it.link == null || it.link == '')}">
-        <span class="${it.cssClass}" style="${it.style}">
-            <l:icon class="icon-sm" src="${it.icon}" alt="${it.text}" htmlTooltip="${it.text}"/>
-        </span>
-    </j:if>
-    <!-- icon with link -->
-    <j:if test="${it.icon != null &amp;&amp; it.icon != '' &amp;&amp; it.link != null &amp;&amp; it.link != ''}">
-        <span class="${it.cssClass}" style="${it.style}">
-            <a href="${it.link}">
-                <l:icon class="icon-sm" src="${it.icon}" alt="${it.text}" htmlTooltip="${it.text}"/>
-            </a>
-        </span>
-    </j:if>
-    <!-- text without link -->
-    <j:if test="${(it.icon == null || it.icon == '') &amp;&amp; (it.link == null || it.link == '')}">
-        <span class="${it.cssClass}" style="${it.style}">
-            ${it.text}
-        </span>
-    </j:if>
-    <!-- text with link -->
-    <j:if test="${(it.icon == null || it.icon == '') &amp;&amp; it.link != null &amp;&amp; it.link != ''}">
-        <span class="${it.cssClass}" style="${it.style}">
-            <a href="${it.link}">${it.text}</a>
-        </span>
-    </j:if>
+    <j:choose>
+        <!-- icon -->
+        <j:when test="${it.icon != null &amp;&amp; it.icon != ''}">
+            <span class="${it.cssClass}" style="${it.style}">
+                <j:choose>
+                    <!-- icon with link -->
+                    <j:when test="${it.link != null &amp;&amp; it.link != ''}">
+                        <a href="${it.link}">
+                            <l:icon class="icon-sm" src="${it.icon}" alt="${it.text}" htmlTooltip="${it.text}"/>
+                        </a>
+                    </j:when>
+                    <!-- icon without link -->
+                    <j:otherwise>
+                        <l:icon class="icon-sm" src="${it.icon}" alt="${it.text}" htmlTooltip="${it.text}"/>
+                    </j:otherwise>
+                </j:choose>
+            </span>
+        </j:when>
+        <j:otherwise>
+            <!-- text -->
+            <j:if test="${it.text != null &amp;&amp; it.text != ''}">
+                <span class="${it.cssClass}" style="${it.style}">
+                    <j:choose>
+                        <!-- text with link -->
+                        <j:when test="${it.link != null &amp;&amp; it.link != ''}">
+                            <a href="${it.link}">
+                                ${it.text}
+                            </a>
+                        </j:when>
+                        <!-- text without link -->
+                        <j:otherwise>
+                            ${it.text}
+                        </j:otherwise>
+                    </j:choose>
+                </span>
+            </j:if>
+        </j:otherwise>
+    </j:choose>
 </j:jelly>