From 93c6bbad544e0c99d9deff5096cade9fb9fc2c29 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Mon, 16 Sep 2024 15:55:35 +0200
Subject: [PATCH 1/2] Fix various plugin pages

---
 src/main/webapp/projects/openfire/plugins-beta.jsp | 3 ++-
 src/main/webapp/projects/openfire/plugins-dev.jsp  | 3 ++-
 src/main/webapp/projects/openfire/plugins.jsp      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/projects/openfire/plugins-beta.jsp b/src/main/webapp/projects/openfire/plugins-beta.jsp
index b49747f4..5c609a07 100644
--- a/src/main/webapp/projects/openfire/plugins-beta.jsp
+++ b/src/main/webapp/projects/openfire/plugins-beta.jsp
@@ -5,6 +5,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.stream.Collectors" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://igniterealtime.org/website/tags" prefix="ir" %>
 <%
     final String openfirePluginsPath = config.getServletContext().getInitParameter("openfire-plugins-beta-path");
@@ -123,7 +124,7 @@
                                 </td>
                                 <td class="c4" style="white-space: nowrap; text-align: center">
                                     <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                    <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- ' + plugin.priorToOpenfireVersion : '+'}"/>
+                                    <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                 </td>
                             </tr>
                         </c:forEach>
diff --git a/src/main/webapp/projects/openfire/plugins-dev.jsp b/src/main/webapp/projects/openfire/plugins-dev.jsp
index b24fc67a..bec615ab 100644
--- a/src/main/webapp/projects/openfire/plugins-dev.jsp
+++ b/src/main/webapp/projects/openfire/plugins-dev.jsp
@@ -5,6 +5,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.stream.Collectors" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://igniterealtime.org/website/tags" prefix="ir" %>
 <%
     final String openfirePluginsPath = config.getServletContext().getInitParameter("openfire-plugins-dev-path");
@@ -128,7 +129,7 @@
                                 </td>
                                 <td class="c4" style="white-space: nowrap; text-align: center">
                                     <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                    <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- ' + plugin.priorToOpenfireVersion : '+'}"/>
+                                    <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                 </td>
                             </tr>
                         </c:forEach>
diff --git a/src/main/webapp/projects/openfire/plugins.jsp b/src/main/webapp/projects/openfire/plugins.jsp
index 491aaae6..26d1883a 100644
--- a/src/main/webapp/projects/openfire/plugins.jsp
+++ b/src/main/webapp/projects/openfire/plugins.jsp
@@ -5,6 +5,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.stream.Collectors" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://igniterealtime.org/website/tags" prefix="ir" %>
 <%
     final String openfirePluginsPath = config.getServletContext().getInitParameter("openfire-plugins-path");
@@ -124,7 +125,7 @@
                                     </td>
                                     <td class="c4" style="white-space: nowrap; text-align: center">
                                         <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
+                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                     </td>
                                     <td class="c5" style="white-space: nowrap">
                                         <a href="plugin-archive.jsp?plugin=${ir:urlEncode(plugin.pluginName)}">Archive</a>

From cbb0dd3ea21b7c7afc821fcca4187c4e20bce911 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Mon, 16 Sep 2024 16:00:59 +0200
Subject: [PATCH 2/2] Re-labeled 'archive' as 'all builds' on plugin page

---
 src/main/webapp/projects/openfire/plugins.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/projects/openfire/plugins.jsp b/src/main/webapp/projects/openfire/plugins.jsp
index 26d1883a..0d6d5cda 100644
--- a/src/main/webapp/projects/openfire/plugins.jsp
+++ b/src/main/webapp/projects/openfire/plugins.jsp
@@ -58,7 +58,7 @@
                     <td style="text-align: center;">Version</td>
                     <td style="text-align: center;">Released</td>
                     <td style="text-align: center;">Openfire Version</td>
-                    <td style="text-align: center;">Archive</td>
+                    <td style="text-align: center;">All&nbsp;Builds</td>
                 </tr>
                 <tbody>
                     <c:choose>
@@ -128,7 +128,7 @@
                                         <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                     </td>
                                     <td class="c5" style="white-space: nowrap">
-                                        <a href="plugin-archive.jsp?plugin=${ir:urlEncode(plugin.pluginName)}">Archive</a>
+                                        <a href="plugin-archive.jsp?plugin=${ir:urlEncode(plugin.pluginName)}">All&nbsp;Builds</a>
                                     </td>
                                 </tr>
                             </c:forEach>