svn commit: r822939 - in /ofbiz/trunk/framework/webtools/webapp/webtools: service/services.ftl service/threads.ftl stats/StatsSinceStart.ftl

[buscob]

Author: buscob
Date: Wed Oct  7 22:23:16 2009
New Revision: 822939

URL: http://svn.apache.org/viewvc?rev=822939&view=rev
Log:
Fixed markup to the right screenlet pattern (all screenlet content should be contained in a screenlet-body tag)

Modified:
    ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl?rev=822939&r1=822938&r2=822939&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl Wed Oct  7 22:23:16 2009
@@ -21,28 +21,30 @@
   <div class="screenlet-title-bar">
     <h3>${uiLabelMap.PageTitleServiceList}</h3>
   </div>
-  <table class="basic-table hover-bar" cellspacing="0">
-    <tr class="header-row">
-      <td>${uiLabelMap.WebtoolsServiceName}</td>
-      <td>${uiLabelMap.WebtoolsDispatcherName}</td>
-      <td>${uiLabelMap.WebtoolsMode}</td>
-      <td>${uiLabelMap.CommonStartDateTime}</td>
-      <td>${uiLabelMap.CommonEndDateTime}</td>
-    </tr>
-    <#assign alt_row = false>
-    <#list services as service>
-      <tr<#if alt_row> class="alternate-row"</#if>>
-        <td>${service.serviceName?if_exists}</td>
-        <td>${service.localName?if_exists}</td>
-        <td>${service.modeStr?default("[none]")}</td>
-        <td>${service.startTime?if_exists}</td>
-        <td>${service.endTime?default("[running]")}</td>
+  <div class="screenlet-body">
+    <table class="basic-table hover-bar" cellspacing="0">
+      <tr class="header-row">
+        <td>${uiLabelMap.WebtoolsServiceName}</td>
+        <td>${uiLabelMap.WebtoolsDispatcherName}</td>
+        <td>${uiLabelMap.WebtoolsMode}</td>
+        <td>${uiLabelMap.CommonStartDateTime}</td>
+        <td>${uiLabelMap.CommonEndDateTime}</td>
       </tr>
-      <#if alt_row>
-        <#assign alt_row = false>
-      <#else>
-        <#assign alt_row = true>
-      </#if>
-    </#list>
-  </table>
+      <#assign alt_row = false>
+      <#list services as service>
+        <tr<#if alt_row> class="alternate-row"</#if>>
+          <td>${service.serviceName?if_exists}</td>
+          <td>${service.localName?if_exists}</td>
+          <td>${service.modeStr?default("[none]")}</td>
+          <td>${service.startTime?if_exists}</td>
+          <td>${service.endTime?default("[running]")}</td>
+        </tr>
+        <#if alt_row>
+          <#assign alt_row = false>
+        <#else>
+          <#assign alt_row = true>
+        </#if>
+      </#list>
+    </table>
+  </div>
 </div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl?rev=822939&r1=822938&r2=822939&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Wed Oct  7 22:23:16 2009
@@ -24,73 +24,76 @@
   <div class="screenlet-title-bar">
     <h3>${uiLabelMap.WebtoolsServiceEngineThreads}</h3>
   </div>
-<table class="basic-table hover-bar" cellspacing="0">
-  <tr class="header-row">
-    <td>${uiLabelMap.WebtoolsThread}</td>
-    <td>${uiLabelMap.CommonStatus}</td>
-    <td>${uiLabelMap.WebtoolsJob}</td>
-    <td>${uiLabelMap.WebtoolsService}</td>
-    <td>${uiLabelMap.WebtoolsUsage}</td>
-    <td>${uiLabelMap.WebtoolsTTL} (ms)</td>
-    <td>${uiLabelMap.CommonTime} (ms)</td>
-  </tr>
-  <#assign alt_row = false>
-  <#list threads as thread>
-  <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-    <td>${thread.threadId?if_exists} ${thread.threadName?if_exists}</td>
-    <td>${thread.status?if_exists}</td>
-    <td>${thread.jobName?default("${uiLabelMap.CommonNone}")}</td>
-    <td>${thread.serviceName?default("${uiLabelMap.CommonNone}")}</td>
-    <td>${thread.usage?if_exists}</td>
-    <td>${thread.ttl?if_exists}</td>
-    <td>${thread.runTime?if_exists}</td>
-  </tr>
-  <#-- toggle the row color -->
-  <#assign alt_row = !alt_row>
-  </#list>
-</table>
+  <div class="screenlet-body">
+    <table class="basic-table hover-bar" cellspacing="0">
+      <tr class="header-row">
+        <td>${uiLabelMap.WebtoolsThread}</td>
+        <td>${uiLabelMap.CommonStatus}</td>
+        <td>${uiLabelMap.WebtoolsJob}</td>
+        <td>${uiLabelMap.WebtoolsService}</td>
+        <td>${uiLabelMap.WebtoolsUsage}</td>
+        <td>${uiLabelMap.WebtoolsTTL} (ms)</td>
+        <td>${uiLabelMap.CommonTime} (ms)</td>
+      </tr>
+      <#assign alt_row = false>
+      <#list threads as thread>
+      <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+        <td>${thread.threadId?if_exists} ${thread.threadName?if_exists}</td>
+        <td>${thread.status?if_exists}</td>
+        <td>${thread.jobName?default("${uiLabelMap.CommonNone}")}</td>
+        <td>${thread.serviceName?default("${uiLabelMap.CommonNone}")}</td>
+        <td>${thread.usage?if_exists}</td>
+        <td>${thread.ttl?if_exists}</td>
+        <td>${thread.runTime?if_exists}</td>
+      </tr>
+      <#-- toggle the row color -->
+      <#assign alt_row = !alt_row>
+      </#list>
+    </table>
+  </div>
 </div>
-<br />
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <h3>${uiLabelMap.WebtoolsGeneralJavaThreads}</h3>
   </div>
-<br />
-<p>${uiLabelMap.WebtoolsThisThread}<b> ${Static["java.lang.Thread"].currentThread().getName()} (${Static["java.lang.Thread"].currentThread().getId()})</b>
-<p>${uiLabelMap.WebtoolsJavaVersionIs5} <#if isJava5> ${uiLabelMap.CommonYes}<#else>${uiLabelMap.CommonNo}</#if><p>
-<br />
-<table class="basic-table hover-bar" cellspacing="0">
-  <tr class="header-row">
-    <td>${uiLabelMap.WebtoolsGroup}</td>
-    <td>${uiLabelMap.WebtoolsThreadId}</td>
-    <td>${uiLabelMap.WebtoolsThread}</td>
-    <td>${uiLabelMap.CommonStatus}</td>
-    <td>${uiLabelMap.WebtoolsPriority}</td>
-    <td>${uiLabelMap.WebtoolsDaemon}</td>
-  </tr>
-  <#assign alt_row = false>
-  <#list allThreadList as javaThread>
-    <#if javaThread?exists>
-      <#if isJava5><#assign stackTraceArray = javaThread.getStackTrace()/></#if>
-      <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-        <td valign="top">${(javaThread.getThreadGroup().getName())?if_exists}</td>
-        <td valign="top"><#if isJava5>${javaThread.getId()?string}</#if></td>
-        <td valign="top">
-          <b>${javaThread.getName()?if_exists}</b>
-          <#if isJava5>
-            <#list 1..maxElements as stackIdx>
-              <#assign stackElement = stackTraceArray[stackIdx]?if_exists/>
-              <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
-            </#list>
-          </#if>
-        </td>
-        <td valign="top"><#if isJava5>${javaThread.getState().name()?if_exists}</#if>&nbsp;</td>
-        <td valign="top">${javaThread.getPriority()}</td>
-        <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td>
+  <div class="screenlet-body">
+    <br />
+    <p>${uiLabelMap.WebtoolsThisThread}<b> ${Static["java.lang.Thread"].currentThread().getName()} (${Static["java.lang.Thread"].currentThread().getId()})</b>
+    <p>${uiLabelMap.WebtoolsJavaVersionIs5} <#if isJava5> ${uiLabelMap.CommonYes}<#else>${uiLabelMap.CommonNo}</#if><p>
+    <br />
+    <table class="basic-table hover-bar" cellspacing="0">
+      <tr class="header-row">
+        <td>${uiLabelMap.WebtoolsGroup}</td>
+        <td>${uiLabelMap.WebtoolsThreadId}</td>
+        <td>${uiLabelMap.WebtoolsThread}</td>
+        <td>${uiLabelMap.CommonStatus}</td>
+        <td>${uiLabelMap.WebtoolsPriority}</td>
+        <td>${uiLabelMap.WebtoolsDaemon}</td>
       </tr>
-    </#if>
-    <#-- toggle the row color -->
-    <#assign alt_row = !alt_row>
-  </#list>
-</table>
+      <#assign alt_row = false>
+      <#list allThreadList as javaThread>
+      <#if javaThread?exists>
+        <#if isJava5><#assign stackTraceArray = javaThread.getStackTrace()/></#if>
+        <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+          <td valign="top">${(javaThread.getThreadGroup().getName())?if_exists}</td>
+          <td valign="top"><#if isJava5>${javaThread.getId()?string}</#if></td>
+          <td valign="top">
+            <b>${javaThread.getName()?if_exists}</b>
+            <#if isJava5>
+              <#list 1..maxElements as stackIdx>
+                <#assign stackElement = stackTraceArray[stackIdx]?if_exists/>
+                <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
+              </#list>
+            </#if>
+          </td>
+          <td valign="top"><#if isJava5>${javaThread.getState().name()?if_exists}</#if>&nbsp;</td>
+          <td valign="top">${javaThread.getPriority()}</td>
+          <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td>
+        </tr>
+      </#if>
+      <#-- toggle the row color -->
+      <#assign alt_row = !alt_row>
+      </#list>
+    </table>
+  </div>
 </div>
\ No newline at end of file

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl?rev=822939&r1=822938&r2=822939&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Wed Oct  7 22:23:16 2009
@@ -18,19 +18,22 @@
 -->
 <div id="stats-bins-history" class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsStatsMainPageTitle}</h3>
+      <div class="h3">${uiLabelMap.WebtoolsStatsMainPageTitle}</div>
+    </div>
+    <div class="screenlet-body">
+      <div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart?clear=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsClearSince}</a>
+      <a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
+      <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${nowTimestamp}</p>
     </div>
-    <div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart?clear=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsClearSince}</a>
-    <a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
-    <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${nowTimestamp}</p>
 </div>
 <#if security.hasPermission("SERVER_STATS_VIEW", session)>
   <#-- Request Table -->
   <div id="request-statistics" class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsStatsRequestStats}</h3>
+      <div class="h3">${uiLabelMap.WebtoolsStatsRequestStats}</div>
     </div>
     <#if requestList?has_content>
+    <div class="screenlet-body">
       <#if (requestList?size > 2)>
         <table class="basic-table light-grid hover-bar" cellspacing="0">
       <#else>
@@ -69,6 +72,7 @@
           </#if>
         </#list>
       </table>
+    </div>  
     <#else>
       <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoRequests}</div>
     </#if>
@@ -77,9 +81,10 @@
   <#-- Event Table -->
   <div id="event-statistics" class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsStatsEventStats}</h3>
+      <div class="h3">${uiLabelMap.WebtoolsStatsEventStats}</div>
     </div>
     <#if eventList?has_content>
+    <div class="screenlet-body">
       <#if (eventList?size > 2)>
         <table class="basic-table light-grid hover-bar" cellspacing="0">
       <#else>
@@ -118,6 +123,7 @@
           </#if>
         </#list>
       </table>
+    </div>
     <#else>
       <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoEvents}</div>
     </#if>
@@ -126,9 +132,10 @@
   <#-- View Table -->
   <div id="view-statistics" class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsStatsViewStats}</h3>
+      <div class="h3">${uiLabelMap.WebtoolsStatsViewStats}</div>
     </div>
     <#if viewList?has_content>
+    <div class="screenlet-body">
       <#if (viewList?size > 2)>
         <table class="basic-table light-grid hover-bar" cellspacing="0">
       <#else>
@@ -167,6 +174,7 @@
           </#if>
         </#list>
       </table>
+    </div>
     <#else>
       <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoViews}</div>
     </#if>