Author: dejanb Date: Mon Oct 6 07:00:42 2008 New Revision: 702149 URL: http://svn.apache.org/viewvc?rev=702149&view=rev Log: fix for AMQ-1969 Added: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp activemq/trunk/activemq-web-console/src/main/webapp/message.jsp activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp activemq/trunk/activemq-web-console/src/main/webapp/styles/type-settings.css activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf Mon Oct 6 07:00:42 2008 @@ -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"%> Added: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag?rev=702149&view=auto ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag (added) +++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag Mon Oct 6 07:00:42 2008 @@ -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 Added: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag?rev=702149&view=auto ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag (added) +++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag Mon Oct 6 07:00:42 2008 @@ -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 Modified: activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/browse.jsp Mon Oct 6 07:00:42 2008 @@ -16,11 +16,11 @@ --%> -Browse ${requestContext.queueBrowser.JMSDestination} +Browse <form:short text="${requestContext.queueBrowser.JMSDestination}"/> -

Browse ${requestContext.queueBrowser.JMSDestination}

+

Browse

Modified: activemq/trunk/activemq-web-console/src/main/webapp/message.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/message.jsp?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/message.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/message.jsp Mon Oct 6 07:00:42 2008 @@ -51,7 +51,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -130,7 +130,7 @@ - +
Destination${row.JMSDestination}
Correlation ID
Timestamp${row.JMSTimestamp}
Type
@@ -157,7 +157,7 @@ - + Modified: activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp Mon Oct 6 07:00:42 2008 @@ -49,7 +49,7 @@ -${row.name} + ${row.queueSize} ${row.consumerCount} ${row.enqueueCount} Modified: activemq/trunk/activemq-web-console/src/main/webapp/styles/type-settings.css URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/styles/type-settings.css?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/styles/type-settings.css (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/styles/type-settings.css Mon Oct 6 07:00:42 2008 @@ -21,7 +21,7 @@ font-style: normal; font-font-variant: normal; font-weight: normal; - line-height: 140% + line-height: 140%; color: #000000; } @@ -36,7 +36,7 @@ font-style: normal; font-font-variant: normal; font-weight: normal; - line-height: normal% + line-height: normal; color: #000000; } @@ -75,7 +75,7 @@ } hr { - color: 3c78b5; + color: #3c78b5; height: 1; } @@ -152,3 +152,20 @@ 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 Modified: activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp Mon Oct 6 07:00:42 2008 @@ -91,10 +91,10 @@ -${row.clientId} -${row.subscriptionName} -${row.connectionId} -${row.destinationName} + + + + ${row.selector} ${row.pendingQueueSize} ${row.dispatchedQueueSize} Modified: activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp?rev=702149&r1=702148&r2=702149&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp (original) +++ activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp Mon Oct 6 07:00:42 2008 @@ -46,7 +46,7 @@ -${row.name} + ${row.consumerCount} ${row.enqueueCount} ${row.dequeueCount}