From 44953e41acea19ec9edbcc38a1b4d5adaf0792d4 Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Mon, 6 Oct 2008 14:00:42 +0000 Subject: [PATCH] fix for AMQ-1969 git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702149 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/webapp/WEB-INF/jspf/headertags.jspf | 1 + .../main/webapp/WEB-INF/tags/form/short.tag | 27 +++++++++++++++++ .../main/webapp/WEB-INF/tags/form/tooltip.tag | 29 +++++++++++++++++++ .../src/main/webapp/browse.jsp | 4 +-- .../src/main/webapp/message.jsp | 8 ++--- .../src/main/webapp/queues.jsp | 2 +- .../src/main/webapp/styles/type-settings.css | 23 +++++++++++++-- .../src/main/webapp/subscribers.jsp | 8 ++--- .../src/main/webapp/topics.jsp | 2 +- 9 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag create mode 100644 activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag diff --git a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf index 04e3bbcbe7..4b698304c4 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf +++ b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf @@ -18,3 +18,4 @@ <%@ taglib prefix="form" tagdir="/WEB-INF/tags/form" %> <%@ taglib prefix="jms" tagdir="/WEB-INF/tags/jms" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> diff --git a/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag new file mode 100644 index 0000000000..3302e44293 --- /dev/null +++ b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag @@ -0,0 +1,27 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ attribute name="text" type="java.lang.String" required="true" %> +<%@ attribute name="length" type="java.lang.Integer" required="false" %> +<% + if (length == null) + length = 20; + if (text.length() <= 20) { + out.print(text); + } else { + out.println(text.substring(0, 10) + "..." + text.substring(text.length() - 5)); + } +%> \ No newline at end of file diff --git a/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag new file mode 100644 index 0000000000..0f2d495e2d --- /dev/null +++ b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag @@ -0,0 +1,29 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ attribute name="text" type="java.lang.String" required="true" %> +<%@ attribute name="length" type="java.lang.Integer" required="false" %> +<% + text = text.replaceAll("<", "<"); + text = text.replaceAll(">", ">"); + if (length == null) + length = 23; + if (text.length() <= length) { + out.print(text); + } else { + out.println(" " + text.substring(0, length - 3) + "... " + text + ""); + } +%> \ No newline at end of file diff --git a/activemq-web-console/src/main/webapp/browse.jsp b/activemq-web-console/src/main/webapp/browse.jsp index a038d77735..598434372d 100644 --- a/activemq-web-console/src/main/webapp/browse.jsp +++ b/activemq-web-console/src/main/webapp/browse.jsp @@ -16,11 +16,11 @@ --%> -Browse ${requestContext.queueBrowser.JMSDestination} +Browse <form:short text="${requestContext.queueBrowser.JMSDestination}"/> -

Browse ${requestContext.queueBrowser.JMSDestination}

+

Browse

diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp index 70473b1b0a..2dba130746 100644 --- a/activemq-web-console/src/main/webapp/message.jsp +++ b/activemq-web-console/src/main/webapp/message.jsp @@ -51,7 +51,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID} - + @@ -87,7 +87,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID} - + @@ -130,7 +130,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID} - +
Destination${row.JMSDestination}
Correlation ID
Timestamp${row.JMSTimestamp}
Type
@@ -157,7 +157,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID} - + diff --git a/activemq-web-console/src/main/webapp/queues.jsp b/activemq-web-console/src/main/webapp/queues.jsp index 16e3ee702c..30de5815a6 100644 --- a/activemq-web-console/src/main/webapp/queues.jsp +++ b/activemq-web-console/src/main/webapp/queues.jsp @@ -49,7 +49,7 @@ -${row.name} + ${row.queueSize} ${row.consumerCount} ${row.enqueueCount} diff --git a/activemq-web-console/src/main/webapp/styles/type-settings.css b/activemq-web-console/src/main/webapp/styles/type-settings.css index 9fd616853f..8cb79415bc 100644 --- a/activemq-web-console/src/main/webapp/styles/type-settings.css +++ b/activemq-web-console/src/main/webapp/styles/type-settings.css @@ -21,7 +21,7 @@ body, p, ul, ol { font-style: normal; font-font-variant: normal; font-weight: normal; - line-height: 140% + line-height: 140%; color: #000000; } @@ -36,7 +36,7 @@ td, table, tr { font-style: normal; font-font-variant: normal; font-weight: normal; - line-height: normal% + line-height: normal; color: #000000; } @@ -75,7 +75,7 @@ pre { } hr { - color: 3c78b5; + color: #3c78b5; height: 1; } @@ -152,3 +152,20 @@ blockquote { border-left: 1px solid #3c78b5; } +.tooltip { position: relative; + text-decoration: none; +} + +.tooltip span { + display: none; +} + +.tooltip:hover span { + position: absolute; + top: 10px; + left: 25px; + display: block; + background: #ccc; + color: #880055; + border: 1px solid #880055; +} \ No newline at end of file diff --git a/activemq-web-console/src/main/webapp/subscribers.jsp b/activemq-web-console/src/main/webapp/subscribers.jsp index e67dbf3877..0dd16097c9 100644 --- a/activemq-web-console/src/main/webapp/subscribers.jsp +++ b/activemq-web-console/src/main/webapp/subscribers.jsp @@ -91,10 +91,10 @@ -${row.clientId} -${row.subscriptionName} -${row.connectionId} -${row.destinationName} + + + + ${row.selector} ${row.pendingQueueSize} ${row.dispatchedQueueSize} diff --git a/activemq-web-console/src/main/webapp/topics.jsp b/activemq-web-console/src/main/webapp/topics.jsp index 5e68821592..fc9c3c3943 100644 --- a/activemq-web-console/src/main/webapp/topics.jsp +++ b/activemq-web-console/src/main/webapp/topics.jsp @@ -46,7 +46,7 @@ -${row.name} + ${row.consumerCount} ${row.enqueueCount} ${row.dequeueCount}