OF-2892: admin console Plugins pages: fix column width

igniterealtime · Oct 18, 2024 · c875de4 · c875de4
1 parent 93442de
commit c875de4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/xmppserver/src/main/webapp/available-plugins.jsp b/xmppserver/src/main/webapp/available-plugins.jsp
@@ -257,7 +257,7 @@
                             <c:otherwise>
                                 <c:forEach items="${notInstalledPlugins}" var="notInstalledPlugin">
                                     <tr id="${notInstalledPlugin.hashCode}">
-                                        <td style="width: 1%" class="line-bottom-border">
+                                        <td class="line-bottom-border" style="width: 1%">
                                             <c:choose>
                                                 <c:when test="${not empty notInstalledPlugin.icon}">
                                                     <img src="${fn:escapeXml(notInstalledPlugin.icon)}" width="16" height="16" alt="Plugin">
@@ -267,7 +267,7 @@
                                                 </c:otherwise>
                                             </c:choose>
                                         </td>
-                                        <td class="line-bottom-border">
+                                        <td class="line-bottom-border" style="width: 60%;">
                                             <c:if test="${not empty notInstalledPlugin.name}">
                                                 <b><c:out value="${notInstalledPlugin.name}"/></b><br/>
                                             </c:if>
@@ -281,7 +281,7 @@
                                                 </a>
                                             </c:if>
                                         </td>
-                                        <td style="width: 5%" nowrap class="line-bottom-border">
+                                        <td class="line-bottom-border" style="width: 10%; white-space: nowrap;">
                                             <c:if test="${not empty notInstalledPlugin.version}">
                                                 <c:out value="${notInstalledPlugin.version}"/><br/>
                                             </c:if>
@@ -295,15 +295,15 @@
                                                 </a>
                                             </c:if>
                                         </td>
-                                        <td style="width: 15%" nowrap class="line-bottom-border">
+                                        <td class="line-bottom-border" style="width: 10%;">
                                             <c:if test="${not empty notInstalledPlugin.author}">
                                                 <c:out value="${notInstalledPlugin.author}"/>
                                             </c:if>
                                         </td>
-                                        <td style="width: 15%; text-align: right" nowrap class="line-bottom-border">
+                                        <td class="line-bottom-border" style="width: 5%; white-space: nowrap; text-align: right;">
                                             <c:out value="${admin:byteFormat( notInstalledPlugin.fileSize )}"/>
                                         </td>
-                                        <td style="width: 1%; text-align: center" class="line-bottom-border">
+                                        <td class="line-bottom-border" style="width: 1%; text-align: center;">
                                             <a href="javascript:downloadPlugin('${fn:escapeXml(notInstalledPlugin.downloadURL)}', '${notInstalledPlugin.version}', '${notInstalledPlugin.hashCode}')">
                                                 <span id="${notInstalledPlugin.hashCode}-image">
                                                     <img src="images/add-16x16.gif" alt="<fmt:message key="plugin.available.download" />">

diff --git a/xmppserver/src/main/webapp/plugin-admin.jsp b/xmppserver/src/main/webapp/plugin-admin.jsp
@@ -444,7 +444,7 @@ tr.lowerhalf > td:last-child {
                     </a>
                 </c:if>
             </td>
-            <td style="width: 10%; white-space: nowrap; vertical-align: top">
+            <td style="width: 10%; white-space: nowrap;">
                 <c:if test="${not empty plugin.version}">
                     <span <c:if test="${not empty update}">id="${update.hashCode()}-version"</c:if>>
                         <c:out value="${plugin.version}"/>
@@ -457,19 +457,19 @@ tr.lowerhalf > td:last-child {
                     </a>
                 </c:if>
             </td>
-            <td style="width: 15%; white-space: nowrap; vertical-align: top">
+            <td style="width: 10%;">
                 <c:if test="${not empty plugin.author}">
                     <c:out value="${plugin.author}"/>
                 </c:if>
             </td>
-            <td style="width: 1%; text-align: center; vertical-align: top">
+            <td style="width: 1%; text-align: center;">
                 <c:if test="${pluginManager.isLoaded(plugin.canonicalName)}">
                     <a href="plugin-admin.jsp?csrf=${csrf}&reloadplugin=${admin:urlEncode( plugin.canonicalName )}"
                        title="<fmt:message key="plugin.admin.click_reload" />"
                     ><img src="images/refresh-16x16.gif" alt="<fmt:message key="global.refresh" /> ${plugin.name}"></a>
                 </c:if>
             </td>
-            <td style="width: 1%; text-align: center; vertical-align: top">
+            <td style="width: 1%; text-align: center;">
                 <a href="#" onclick="if (confirm('<fmt:message key="plugin.admin.confirm" />')) { location.replace('plugin-admin.jsp?csrf=${csrf}&deleteplugin=${admin:urlEncode( plugin.canonicalName )}'); } "
                    title="<fmt:message key="global.click_delete" />"
                         ><img src="images/delete-16x16.gif" alt="<fmt:message key="global.delete" /> ${plugin.name}"></a>
@@ -489,11 +489,7 @@ tr.lowerhalf > td:last-child {
                         </c:if>
                     </span>
                 </td>
-                <td style="${overrideStyle}">&nbsp;</td>
             </tr>
-
-            <tr><td></td></tr>
-
             <!-- End of unsupported section -->
         </c:if>