Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl Mon Feb 18 09:09:33 2008 @@ -16,30 +16,35 @@ specific language governing permissions and limitations under the License. --> - -<form method="post" action="<@ofbizUrl>saveServiceResultsToSession</@ofbizUrl>" -<table class="basic-table dark-grid" cellspacing="0"> - <tr class="header-row"> - <td>parameter</td> - <td>value</td> - <td>save value?</td> - </tr> - - <#list serviceResultList as srl> - <tr> - <#if srl.hasChild=="Y"> - <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td> - <#else> - <td>${srl.key?if_exists}</td> - </#if> - <td>${srl.value?if_exists}</td> - <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td> - </tr> - </#list> - - <tr> - <td> </td> - <td>Clear previous params? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></td> - <td><input type="submit" value="submit" /></td> - </tr> -</table> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PageTitleScheduleJob}</h3> + </div> + <div class="screenlet-body" align="center"> + <form method="post" action="<@ofbizUrl>saveServiceResultsToSession</@ofbizUrl>" + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsParameterName}</td> + <td>${uiLabelMap.WebtoolsParameterValue}</td> + <td>${uiLabelMap.WebtoolsServiceSaveValue} ?</td> + </tr> + <#list serviceResultList as srl> + <tr> + <#if srl.hasChild=="Y"> + <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td> + <#else> + <td>${srl.key?if_exists}</td> + </#if> + <td>${srl.value?if_exists}</td> + <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td> + </tr> + </#list> + <tr> + <td> </td> + <td class="label">${uiLabelMap.WebtoolsServiceClearPreviousParams} ? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></td> + <td><input type="submit" value="${uiLabelMap.CommonSubmit}"/></td> + </tr> + </table> + </form> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl Mon Feb 18 09:09:33 2008 @@ -16,10 +16,9 @@ specific language governing permissions and limitations under the License. --> - <form name="scheduleForm" method="POST" action="<@ofbizUrl>scheduleService</@ofbizUrl>"> <#list scheduleOptions as scheduleOption> - <input type="hidden" name="${scheduleOption.name}" value="${scheduleOption.value}"/> + <input type="hidden" name="${scheduleOption.name}" value="${scheduleOption.value}"/> </#list> <table class="basic-table" cellspacing="0"> @@ -28,9 +27,9 @@ <tr> <td class="label">${serviceParameter.name} (${serviceParameter.type})</td> <td> - <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}"/> - <#if serviceParameter.optional == "N">(required)<#else>(optional)</#if> - <#if serviceParameter.defaultValue?has_content> (default: [${serviceParameter.defaultValue}])</#if> + <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" <#if serviceParameter.optional == "N">class="required"</#if>/> + <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if> + <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue}</#if> </td> </tr> </#list> @@ -38,4 +37,4 @@ <td colspan="2" align="center"><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> </tr> </table> -</form> +</form> \ No newline at end of file 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=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Mon Feb 18 09:09:33 2008 @@ -24,7 +24,7 @@ <div class="screenlet-title-bar"> <h3>${uiLabelMap.WebtoolsServiceEngineThreads}</h3> </div> -<table class="basic-table" cellspacing="0"> +<table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.WebtoolsThread}</td> <td>${uiLabelMap.CommonStatus}</td> @@ -34,16 +34,19 @@ <td>${uiLabelMap.WebtoolsTTL} (ms)</td> <td>${uiLabelMap.CommonTime} (ms)</td> </tr> + <#assign alt_row = false> <#list threads as thread> - <tr> - <td>[${thread.threadId?if_exists}] ${thread.threadName?if_exists}</td> + <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.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> @@ -53,10 +56,10 @@ <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.WebtoolsThisThread}<b> ${Static["java.lang.Thread"].currentThread().getName()} (${Static["java.lang.Thread"].currentThread().getId()})</b> <p>${uiLabelMap.WebtoolsNote4} ${javaVer}; ${uiLabelMap.WebtoolsNote5}? ${isJava5?string}}<p> <br /> -<table class="basic-table" cellspacing="0"> +<table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.WebtoolsGroup}</td> <td>${uiLabelMap.WebtoolsThreadId}</td> @@ -65,10 +68,11 @@ <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> + <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"> @@ -85,6 +89,8 @@ <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/StatBinsHistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl Mon Feb 18 09:09:33 2008 @@ -16,13 +16,14 @@ specific language governing permissions and limitations under the License. --> - -<h1>${uiLabelMap.WebtoolsStatsBinsPageTitle}</h1> -<br /> -<div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsMainPageTitle}</a> -<a href="<@ofbizUrl>StatBinsHistory?statsId=${parameters.statsId}&type=${parameters.type}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div> -<p>${uiLabelMap.WebtoolsStatsCurrentTime}: ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p> -<br /> +<div id="stats-bins-history" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsStatsBinsPageTitle}</h3> + </div> + <div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsMainPageTitle}</a> + <a href="<@ofbizUrl>StatBinsHistory?statsId=${parameters.statsId}&type=${parameters.type}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div> + <p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span> ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p> +</div> <#if security.hasPermission("SERVER_STATS_VIEW", session)> <div id="stats-bins-history" class="screenlet"> @@ -73,4 +74,4 @@ <#else> <h3>${uiLabelMap.WebtoolsStatsPermissionMsg}</h3> </#if> -<!-- end StatsBinsHistory.ftl --> +<!-- end StatsBinsHistory.ftl --> \ 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=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Mon Feb 18 09:09:33 2008 @@ -16,13 +16,14 @@ specific language governing permissions and limitations under the License. --> - -<h1>${uiLabelMap.WebtoolsStatsMainPageTitle}</h1> -<br /> -<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>${uiLabelMap.WebtoolsStatsCurrentTime}: ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p> -<br /> +<div id="stats-bins-history" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsStatsMainPageTitle}</h3> + </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> ${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p> +</div> <#if security.hasPermission("SERVER_STATS_VIEW", session)> <#-- Request Table --> <div id="request-statistics" class="screenlet"> @@ -33,7 +34,7 @@ <#if (requestList?size > 2)> <table class="basic-table light-grid hover-bar" cellspacing="0"> <#else> - <table class="basic-table light-grid" cellspacing="0"> + <table class="basic-table hover-bar" cellspacing="0"> </#if> <tr class="header-row"> <td>${uiLabelMap.WebtoolsStatsRequestId}</td> @@ -72,7 +73,7 @@ <div class="screenlet-body">${uiLabelMap.WebtoolsStatsNoRequests}</div> </#if> </div> - <br /> + <br/> <#-- Event Table --> <div id="event-statistics" class="screenlet"> <div class="screenlet-title-bar"> @@ -173,4 +174,4 @@ <#else> <h3>${uiLabelMap.WebtoolsStatsPermissionMsg}</h3> </#if> -<!-- end StatsSinceStart.ftl --> +<!-- end StatsSinceStart.ftl --> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml Mon Feb 18 09:09:33 2008 @@ -23,6 +23,7 @@ <screen name="AvailableServicesList"> <section> <actions> + <set field="titleProperty" value="WebtoolsServiceReference"/> <set field="appButtonItem" value="service"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh"/> Modified: ofbiz/trunk/framework/webtools/widget/CacheScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Mon Feb 18 09:09:33 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -112,4 +112,4 @@ </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Mon Feb 18 09:09:33 2008 @@ -52,6 +52,7 @@ <screen name="main"> <section> <actions> + <set field="titleProperty" value="WebtoolsMainPage"/> <set field="headerItem" value="main"/> </actions> <widgets> Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Mon Feb 18 09:09:33 2008 @@ -26,7 +26,6 @@ <if-has-permission permission="ENTITY_MAINT"/> </condition> <actions> - <set field="title" value="Entity SQL Processor"/> <set field="titleProperty" value="PageTitleEntitySQLProcessor"/> <set field="labelTitleProperty" value="PageTitleEntitySQLProcessor"/> <set field="sqlCommand" from-field="parameters.sqlCommand"/> Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Mon Feb 18 09:09:33 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -47,74 +47,102 @@ </screen> <screen name="LogConfiguration"> - <section> - <actions> - <set field="titleProperty" value="PageTitleLogConfiguration"/> - <set field="logMenuItem" value="logConfiguration"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogConfiguration.bsh"/> - </actions> - <widgets> - <decorator-screen name="log-decorator"> - <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="h3">${uiLabelMap.WebtoolsDebuggingLevelFormDescription}</label> - </container> - <container style="screenlet-body"> - <include-form name="LevelSwitch" location="component://webtools/webapp/webtools/log/LogForms.xml"/> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="h3">${uiLabelMap.WebtoolsAddLoggerFormDescription}</label> - </container> - <container style="screenlet-body"> - <include-form name="AddLogger" location="component://webtools/webapp/webtools/log/LogForms.xml"/> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="h3">${uiLabelMap.WebtoolsLoggerListFormDescription}</label> - </container> - <container> - <include-form name="LoggerList" location="component://webtools/webapp/webtools/log/LogForms.xml"/> - </container> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="LogView"> - <section> - <actions> - <set field="titleProperty" value="PageTitleLogView"/> - <set field="logMenuItem" value="viewLog"/> - <!-- TODO: the following command is not really working (and the default value is always used); - my guess is that the base/config/debug.properties file is not found in the classpath --> - <property-to-field resource="debug" property="log4j.appender.css.File" field="logFileName" default="runtime/logs/ofbiz.html" no-locale="true"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogView.bsh"/> - </actions> - <widgets> - <decorator-screen name="log-decorator"> - <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.WebtoolsViewLog}</label> - </container> - <container style="button-bar"> - <link target="LogView" text="${uiLabelMap.CommonRefresh}" style="buttontext"/> - </container> - <container style="button-bar"> - <label style="label">${uiLabelMap.WebtoolsLogFileName}:</label> - <label>${logFileName}</label> - </container> - <platform-specific> - <html><html-template location="component://webtools/webapp/webtools/log/logContent.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> -</screens> + <section> + <actions> + <set field="titleProperty" value="PageTitleLogConfiguration"/> + <set field="logMenuItem" value="logConfiguration"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogConfiguration.bsh"/> + </actions> + <widgets> + <decorator-screen name="log-decorator"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.WebtoolsDebuggingLevelFormDescription}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LevelSwitch" location="component://webtools/webapp/webtools/log/LogForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.WebtoolsAddLoggerFormDescription}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddLogger" location="component://webtools/webapp/webtools/log/LogForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.WebtoolsLoggerListFormDescription}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LoggerList" location="component://webtools/webapp/webtools/log/LogForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="LogView"> + <section> + <actions> + <set field="titleProperty" value="PageTitleLogView"/> + <set field="logMenuItem" value="viewLog"/> + <!-- TODO: the following command is not really working (and the default value is always used); + my guess is that the base/config/debug.properties file is not found in the classpath --> + <property-to-field resource="debug" property="log4j.appender.css.File" field="logFileName" default="runtime/logs/ofbiz.html" no-locale="true"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogView.bsh"/> + </actions> + <widgets> + <decorator-screen name="log-decorator"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.WebtoolsViewLog}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"> + <link target="LogView" text="${uiLabelMap.CommonRefresh}" style="buttontext"/> + </container> + <container style="button-bar"> + <label style="label">${uiLabelMap.WebtoolsLogFileName}:</label> + <label>${logFileName}</label> + </container> + <platform-specific> + <html><html-template location="component://webtools/webapp/webtools/log/logContent.ftl"/></html> + </platform-specific> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + </screens> Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Mon Feb 18 09:09:33 2008 @@ -128,8 +128,21 @@ <widgets> <decorator-screen name="CommonServiceDecorator"> <decorator-section name="body"> - <label style="h1">${uiLabelMap.WebtoolsMessage11}</label> - <include-form name="scheduleJob" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.WebtoolsMessage11}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="scheduleJob" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> </decorator-screen> </widgets> @@ -145,7 +158,14 @@ <widgets> <decorator-screen name="CommonServiceDecorator"> <decorator-section name="body"> - <include-form name="runService" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <label style="head3">${uiLabelMap.PageTitleRunService}</label> + </container> + <container style="screenlet-body"> + <include-form name="runService" location="component://webtools/webapp/webtools/service/ServiceForms.xml"/> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -161,10 +181,16 @@ <widgets> <decorator-screen name="CommonServiceDecorator"> <decorator-section name="body"> - <label style="h1">${uiLabelMap.WebtoolsMessage12}</label> - <platform-specific> - <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <label style="head3">${uiLabelMap.WebtoolsMessage12}</label> + </container> + <container style="screenlet-body"> + <platform-specific> + <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html> + </platform-specific> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -181,9 +207,16 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <label style="head3">${uiLabelMap.PageTitleScheduleJob}</label> + </container> + <container style="screenlet-body"> + <platform-specific> + <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html> + </platform-specific> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -208,5 +241,4 @@ </widgets> </section> </screen> - </screens> Modified: ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml (original) +++ ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml Mon Feb 18 09:09:33 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="WebtoolsAppBar" default-menu-item-name="main" default-selected-style="selected" selected-menuitem-context-field-name="appButtonItem" - menu-id="app-navigation" type="simple"> + id="app-navigation" type="simple"> <menu-item name="main" title="Main"><link target="main"/></menu-item> <menu-item name="cache" title="Cache"><link target="FindUtilCache"/></menu-item> <menu-item name="entity" title="Entity"><link target="entitymaint"/></menu-item> @@ -63,6 +63,4 @@ <link target="LogConfiguration"/> </menu-item> </menu> - -</menus> - +</menus> \ No newline at end of file |
Free forum by Nabble | Edit this page |