Author: musachy
Date: Mon May 5 10:42:22 2008
New Revision: 653536
URL: http://svn.apache.org/viewvc?rev=653536&view=rev
Log:
* css changes to tables
* Fix FreeMarker tmeplates (handle null values)
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/viewBundle.ftl
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/main.css
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/viewBundle.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/viewBundle.ftl?rev=653536&r1=653535&r2=653536&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/viewBundle.ftl
(original)
+++
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/viewBundle.ftl
Mon May 5 10:42:22 2008
@@ -15,15 +15,15 @@
<table class="bundleDetails" style="clear:both">
<tr class="detailRow">
<td class="rowTitle">Id</td>
- <td class="rowValue">${bundle.bundleId}</td>
+ <td class="rowValue">${bundle.bundleId!}</td>
</tr>
<tr class="detailRow">
<td class="rowTitle">Name</td>
- <td class="rowValue">${bundle.symbolicName}</td>
+ <td class="rowValue">${bundle.symbolicName!}</td>
</tr>
<tr class="detailRow">
<td class="rowTitle">Location</td>
- <td class="rowValue">${bundle.location}</td>
+ <td class="rowValue">${bundle.location!}</td>
</tr>
<tr class="detailRow">
<td class="rowTitle">State</td>
@@ -32,9 +32,9 @@
<tr class="detailRow">
<td class="rowTitle">Registered Services</td>
<td class="rowValue">
- <#list bundle.registeredServices as service>
+ <#list (bundle.registeredServices)! as service>
<table class="properties">
- <#list $service.propertyKeys as key >
+ <#list (service.propertyKeys)! as key >
<tr>
<td class="name">${key}</td>
<td>${action.displayProperty(service.getProperty(key))}</td>
@@ -48,12 +48,12 @@
<tr class="detailRow">
<td class="rowTitle">Services in Use</td>
<td class="rowValue">
- <#list bundle.servicesInUse as service>
+ <#list (bundle.servicesInUse)! as service>
<table class="properties">
- <#list $service.propertyKeys as key >
+ <#list (service.propertyKeys)! as key >
<tr>
<td class="name">${key}</td>
-
<td>${action.displayProperty(service.getProperty(key))}</td>
+
<td>${action.displayProperty(service.getProperty(key))!}</td>
</tr>
</#list>
</table>
@@ -64,7 +64,7 @@
<tr class="detailRow">
<td class="rowTitle">Packages</td>
<td class="rowValue">
- <#list packages as pkg>
+ <#list packages! as pkg>
<table class="properties">
<tr>
<td class="name">Name</td>
@@ -74,7 +74,7 @@
<td class="name">Actions</td>
<td>
<ul>
- <#list pkg.actionConfigs.keySet() as name >
+ <#list (pkg.actionConfigs.keySet())! as name >
<li>${name}</li>
</#list>
</ul>
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/main.css
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/main.css?rev=653536&r1=653535&r2=653536&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/main.css
(original)
+++
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/main.css
Mon May 5 10:42:22 2008
@@ -15,6 +15,7 @@
.rowTitle {
width: 141px;
font-weight: bold;
+ vertical-align: top;
}
@@ -32,6 +33,7 @@
table.properties td.name {
background-color: #C3D9FF;
+ vertical-align: top;
}
table.properties th {