Fix a display issue where data should be displayed in red but instead html code
linke <span style="red">..</style> is displayed. Now lines are displayed in
red, if they are prefixed with double exclamation marks (!!)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@707558 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
index 52f7d93..39d1414 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
@@ -872,7 +872,7 @@
boolean bootDel = isBootDelegated( name );
if ( bootDel )
{
- val.append( "<span style=\"color: red\">!! " );
+ val.append( "!! " );
}
val.append( name );
@@ -881,7 +881,7 @@
if ( bootDel )
{
- val.append( " -- Overwritten by Boot Delegation</span>" );
+ val.append( " -- Overwritten by Boot Delegation" );
}
val.append( "<br />" );
@@ -895,7 +895,7 @@
if ( isSpan )
{
- val.append( "<span style=\"color: red\">!! " );
+ val.append( "!! " );
}
val.append( name );
@@ -926,11 +926,6 @@
}
}
- if ( isSpan )
- {
- val.append( "</span>" );
- }
-
val.append( "<br />" );
}
diff --git a/webconsole/src/main/resources/res/ui/datatable.js b/webconsole/src/main/resources/res/ui/datatable.js
index 05fcdb6..65c981b 100644
--- a/webconsole/src/main/resources/res/ui/datatable.js
+++ b/webconsole/src/main/resources/res/ui/datatable.js
@@ -187,13 +187,22 @@
var proptd = td( "aligntop" );
trEl.appendChild( proptd );
- if (prop.value )
+ if (prop.value)
{
var values = new String( prop.value ).split( "<br />" );
for (var i=0; i < values.length; i++)
{
if (i > 0) { proptd.appendChild( createElement( "br" ) ); }
- addText( proptd, values[i] );
+
+ var span;
+ if (values[i].substring(0, 2) == "!!") {
+ span = createElement( "span", null, { style: { color: "red" } } );
+ proptd.appendChild( span );
+ } else {
+ span = proptd;
+ }
+
+ addText( span, values[i] );
}
}
else