svn commit: r628818 [1/2] - in /ofbiz/trunk/framework: common/config/ webtools/config/ webtools/webapp/webtools/ webtools/webapp/webtools/cache
Locked
svn commit: r628818 [1/2] - in /ofbiz/trunk/framework: common/config/ webtools/config/ webtools/webapp/webtools/ webtools/webapp/webtools/cache
 
|
Author: chrisg
Date: Mon Feb 18 09:09:33 2008 New Revision: 628818 URL: http://svn.apache.org/viewvc?rev=628818&view=rev Log: New Styles For Framework applications Apply the new CSS styles to all the forms into the Framework applications (Example, Example Ext, Webtools) and we will have the same look and feel on the ftl screens and screen widgets Submitted by Marco Risaliti See OFBIZ-1619 Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.properties ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml ofbiz/trunk/framework/webtools/widget/CacheScreens.xml ofbiz/trunk/framework/webtools/widget/CommonScreens.xml ofbiz/trunk/framework/webtools/widget/EntityScreens.xml ofbiz/trunk/framework/webtools/widget/LogScreens.xml ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original) +++ ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Mon Feb 18 09:09:33 2008 @@ -125,6 +125,7 @@ StatusItem.description.RETURN_ACCEPTED=Accepted StatusItem.description.RETURN_RECEIVED=Received StatusItem.description.RETURN_COMPLETED=Completed +StatusItem.description.RETURN_MAN_REFUND=Manual Refund Required StatusItem.description.RETURN_CANCELLED=Cancelled # Communication events statuses Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties (original) +++ ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties Mon Feb 18 09:09:33 2008 @@ -125,6 +125,7 @@ StatusItem.description.RETURN_ACCEPTED=Accettato StatusItem.description.RETURN_RECEIVED=Ricevuto StatusItem.description.RETURN_COMPLETED=Completato +StatusItem.description.RETURN_MAN_REFUND=Richiesto Reso Manuale StatusItem.description.RETURN_CANCELLED=Cancellato # Communication events statuses Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original) +++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Mon Feb 18 09:09:33 2008 @@ -152,8 +152,9 @@ WebtoolsFindAllRecords=Find All Records WebtoolsFindRecord=Find Record WebtoolsFindValues=Find Values +WebtoolsFindValuesResults=Results of Search WebtoolsRunningStatus=Running status -WebtoolsPendingStatus=Pending status +WebtoolsPendingStatus=Pending status WebtoolsFinishedStatus=Finished status WebtoolsFkIdx=Fk-Idx WebtoolsFKName=FK Name @@ -275,6 +276,7 @@ WebtoolsOutputDirectory=Output Directory WebtoolsOutToBrowser=OR Out to Browser WebtoolsParameterName=Parameter Name +WebtoolsParameterValue=Parameter Value WebtoolsParent=Parent Id WebtoolsPause=Pause (secs) between files WebtoolsPerformanceTests=Performance Tests @@ -336,6 +338,8 @@ WebtoolsSelectDispatcher=Select Dispatcher WebtoolsServerHitStatisticsTools=Server Hit Statistics Tools WebtoolsService=Service +WebtoolsServiceClearPreviousParams=Clear previous params +WebtoolsServiceDefault=Default WebtoolsServiceECA=Service ECAs WebtoolsServiceEngineThreads=Service Engine Threads WebtoolsServiceEngineTools=Service Engine Tools @@ -345,6 +349,7 @@ WebtoolsServicesListFor=Services list for WebtoolsServiceName=Service Name WebtoolsServiceReference=Service Reference +WebtoolsServiceSaveValue=Save Value WebtoolsServiceWSDL=WSDL Service definition WebtoolsSetAsCurrent=Set As Current WebtoolsShowShowWSDL=Show wsdl Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties (original) +++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties Mon Feb 18 09:09:33 2008 @@ -30,11 +30,12 @@ PageTitleEntitySQLProcessor=Processore SQL Entit\u00e0 PageTitleFindUtilCache=Pagina Manutenzione Cache PageTitleFindUtilCacheElements=Pagina Manutenzione Elementi Cache +PageTitleFindJob=Ricerca Lavori PageTitleLogConfiguration=Livello di Debugging PageTitleLogView=Mostra Log PageTitleJobList=Lista Lavori PageTitleScheduleJob=Schedula Lavori -PageTitleRunService=Servizi in Esecuzione +PageTitleRunService=Esegui Servizio PageTitleServiceList=Lista Servizi PageTitleThreadList=Lista Thread @@ -109,6 +110,7 @@ WebtoolsEnable=Abilita WebtoolsEngineName=Nome Engine WebtoolsEntities=entit\u00e0 +WebtoolsEntitiesAlpha=Entit\u00e0 - Ordine Alfabetico WebtoolsEntity=ENTITA' WebtoolsEntityCurrentValue=Valori Attuali Entit\u00e0 WebtoolsEntityDataMaintenance=Manutenzione Dati Entit\u00e0 @@ -119,9 +121,11 @@ WebtoolsEntityEngineTools=Strumenti per Engine Entit\u00e0 WebtoolsEntityName=Nome Entit\u00e0 WebtoolsEntityNames=Nomi Entit\u00e0 +WebtoolsEntityPackages=Pacchetti Entit\u00e0 WebtoolsEntityReference=Riferimenti Entit\u00e0 WebtoolsEntityReferenceChart=Tabella Riferimenti Entit\u00e0 WebtoolsEntityReferenceMainPage=Pagina Principale Riferimenti Entit\u00e0 +WebtoolsEntityReferencePdf=Riferimenti Entit\u00e0 - PDF WebtoolsEntityReferenceStaticVersion=Versione Statica WebtoolsEntitySyncDump=Dump Sincronizzazioni Entit\u00e0 WebtoolsEntitySyncStatus=Stato Sincronizzazioni Entit\u00e0 @@ -143,6 +147,10 @@ WebtoolsFindAllRecords=Ricerca Tutti i Records WebtoolsFindRecord=Ricerca Record WebtoolsFindValues=Ricerca Valori +WebtoolsFindValuesResults=Risultati della Ricerca +WebtoolsRunningStatus=stato di esecuzione +WebtoolsPendingStatus=stato di atteso +WebtoolsFinishedStatus=stato completato WebtoolsFkIdx=Indice-Chiave Esterna WebtoolsFKName=Nome Chiave Esterna WebtoolsFks=Chiave Esterne @@ -175,6 +183,7 @@ WebtoolsJavaName=Nome Java WebtoolsJavaType=Tipo Java WebtoolsJob=Lavoro +WebtoolsJobFilterOn=Filtra i lavori in WebtoolsJobList=Lista Lavori WebtoolsLeaveAllEntriesBlank=lasciare tutte le voci vuote WebtoolsLHSMapName=Nome mappa LHS @@ -187,6 +196,7 @@ WebtoolsLoggerLevel=Livello WebtoolsLoggerListFormDescription=Questa form mostra tutti i logger abilitati. WebtoolsLoggerName=Nome +WebtoolsLogging=Log WebtoolsMainPage=Pagina Principale WebtoolsMaintainTimestamps=Mantieni Timestamps? WebtoolsMaxMemory=MASSIMA @@ -259,6 +269,7 @@ WebtoolsOutputDirectory=Directory di Output WebtoolsOutToBrowser=O Output al Browser WebtoolsParameterName=Nome Parametro +WebtoolsParameterValue=Valore Parametro WebtoolsParent=Padre WebtoolsPause=Pausa (secondi) fra i files WebtoolsPermissionError=Errore Permesso Strumenti Web @@ -312,6 +323,8 @@ WebtoolsSelectDispatcher=Seleziona Dispatcher WebtoolsServerHitStatisticsTools=Strumenti per Statistiche Server Hit WebtoolsService=Servizio +WebtoolsServiceClearPreviousParams=Azzera parametri precedenti +WebtoolsServiceDefault=Default WebtoolsServiceECA=Servizio ECA's WebtoolsServiceEngineThreads=Engine Servizi Threads WebtoolsServiceEngineTools=Strumenti per Engine Servizi @@ -320,6 +333,7 @@ WebtoolsServicesListFor=Lista servizi per WebtoolsServiceName=Nome Servizio WebtoolsServiceReference=Riferimenti Servizi +WebtoolsServiceSaveValue=Salva Valore WebtoolsServiceWSDL=Definizione Servizio WSDL WebtoolsSetAsCurrent=Imposta Come Attuale WebtoolsShowShowWSDL=Mostra wsdl Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl Mon Feb 18 09:09:33 2008 @@ -23,85 +23,91 @@ <a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a> </div> </#macro> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleEditUtilCache}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <br/> + <@displayButtonBar/> -<h1>${uiLabelMap.PageTitleEditUtilCache}</h1> -<br /> - -<@displayButtonBar/> - -<#if cache?has_content> - <form method="post" action="<@ofbizUrl>EditUtilCacheUpdate?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>"> - <table class="basic-table light-grid" cellspacing="0"> - <tr> - <td>${uiLabelMap.WebtoolsCacheName}</td> - <td colspan="2">${cache.cacheName?if_exists}</td> - </tr> - <tr class="alternate-row"> - <td>${uiLabelMap.WebtoolsSize}</td> - <td colspan="2">${cache.cacheSize?if_exists}</td> - </tr> - <tr> - <td>${uiLabelMap.WebtoolsHits}</td> - <td colspan="2">${cache.hitCount?if_exists}</td> - </tr> - <tr class="alternate-row"> - <td>${uiLabelMap.WebtoolsMissesTotal}</td> - <td colspan="2">${cache.missCountTot?if_exists}</td> - </tr> - <tr> - <td>${uiLabelMap.WebtoolsMissesNotFound}</td> - <td colspan="2">${cache.missCountNotFound?if_exists}</td> - </tr> - <tr class="alternate-row"> - <td>${uiLabelMap.WebtoolsMissesExpire}</td> - <td colspan="2">${cache.missCountExpired?if_exists}</td> - </tr> - <tr> - <td>${uiLabelMap.WebtoolsMissesSoftReference}</td> - <td colspan="2">${cache.missCountSoftRef?if_exists}</td> - </tr> - <tr class="alternate-row"> - <td>${uiLabelMap.WebtoolsRemovesHit}</td> - <td colspan="2">${cache.removeHitCount?if_exists}</td> - </tr> - <tr> - <td>${uiLabelMap.WebtoolsRemovesMisses}</td> - <td colspan="2">${cache.removeMissCount?if_exists}</td> - </tr> - <tr class="alternate-row"> - <td>${uiLabelMap.WebtoolsMaxSize}</td> - <td>${cache.maxSize?if_exists}</td> - <td><input type="text" size="15" maxlength="15" name="UTIL_CACHE_MAX_SIZE" value="${cache.maxSize?if_exists}" /></td> - </tr> - <tr> - <td>${uiLabelMap.WebtoolsExpireTime}</td> - <td>${cache.expireTime?if_exists} (${cache.hrs?if_exists}:${cache.mins?if_exists}:${cache.secs?if_exists})</td> - <td><input type="text" size="15" maxlength="15" name="UTIL_CACHE_EXPIRE_TIME" value="${cache.expireTime?if_exists}" /></td> - </tr> - <tr class="alternate-row"> - <td>${uiLabelMap.WebtoolsUseSoftRef}</td> - <td>${cache.useSoftReference?if_exists}</td> - <td> - <select name="UTIL_CACHE_USE_SOFT_REFERENCE"> - <option value="true" <#if cache.useSoftReference?default('false') == 'true'>selected="selected"</#if>>${uiLabelMap.CommonTrue}</option> - <option value="false" <#if cache.useSoftReference?default('true') == 'false'>selected="selected"</#if>>${uiLabelMap.CommonFalse}</option> - </select> - </td> - </tr> - <tr> - <td>${uiLabelMap.WebtoolsUseFileStore}</td> - <td colspan="2">${cache.useFileSystemStore?if_exists}</td> - </tr> - <tr> - <td colspan="3" align="center"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" /> - </td> - </tr> - </table> - </form> -<#else> - ${uiLabelMap.WebtoolsNoUtilCacheSpecified} -</#if> - -<@displayButtonBar/> + <#if cache?has_content> + <form method="post" action="<@ofbizUrl>EditUtilCacheUpdate?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>"> + <table class="basic-table" cellspacing="0"> + <tr> + <td class="label">${uiLabelMap.WebtoolsCacheName}</td> + <td colspan="2">${cache.cacheName?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsSize}</td> + <td colspan="2">${cache.cacheSize?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsHits}</td> + <td colspan="2">${cache.hitCount?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsMissesTotal}</td> + <td colspan="2">${cache.missCountTot?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsMissesNotFound}</td> + <td colspan="2">${cache.missCountNotFound?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsMissesExpire}</td> + <td colspan="2">${cache.missCountExpired?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsMissesSoftReference}</td> + <td colspan="2">${cache.missCountSoftRef?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsRemovesHit}</td> + <td colspan="2">${cache.removeHitCount?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsRemovesMisses}</td> + <td colspan="2">${cache.removeMissCount?if_exists}</td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsMaxSize}</td> + <td>${cache.maxSize?if_exists}</td> + <td><input type="text" size="15" maxlength="15" name="UTIL_CACHE_MAX_SIZE" value="${cache.maxSize?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsExpireTime}</td> + <td>${cache.expireTime?if_exists} (${cache.hrs?if_exists}:${cache.mins?if_exists}:${cache.secs?if_exists})</td> + <td><input type="text" size="15" maxlength="15" name="UTIL_CACHE_EXPIRE_TIME" value="${cache.expireTime?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsUseSoftRef}</td> + <td>${cache.useSoftReference?if_exists}</td> + <td> + <select name="UTIL_CACHE_USE_SOFT_REFERENCE"> + <option value="true" <#if cache.useSoftReference?default('false') == 'true'>selected="selected"</#if>>${uiLabelMap.CommonTrue}</option> + <option value="false" <#if cache.useSoftReference?default('true') == 'false'>selected="selected"</#if>>${uiLabelMap.CommonFalse}</option> + </select> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsUseFileStore}</td> + <td colspan="2">${cache.useFileSystemStore?if_exists}</td> + </tr> + <tr> + <td colspan="3" align="center"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" /> + </td> + </tr> + </table> + </form> + <#else> + ${uiLabelMap.WebtoolsNoUtilCacheSpecified} + </#if> + <@displayButtonBar/> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl Mon Feb 18 09:09:33 2008 @@ -25,63 +25,69 @@ <a href="<@ofbizUrl>ForceGarbageCollection</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsRunGC}</a> </div> </#macro> - -<h1>${uiLabelMap.PageTitleFindUtilCache}</h1> -<br /> - -<p> - <u><b>${uiLabelMap.WebtoolsMemory}:</b></u> - [<b>${uiLabelMap.WebtoolsTotalMemory}:</b> ${memory}] - [<b>${uiLabelMap.WebtoolsFreeMemory}:</b> ${freeMemory}] - [<b>${uiLabelMap.WebtoolsUsedMemory}:</b> ${usedMemory}] - [<b>${uiLabelMap.WebtoolsMaxMemory}:</b> ${maxMemory}] -</p> -<br /> - -<@displayButtonBar/> - -<#if cacheList?has_content> - <table class="basic-table light-grid hover-bar" cellspacing="0"> - <tr class="header-row"> - <td>${uiLabelMap.WebtoolsCacheName}</td> - <td>${uiLabelMap.WebtoolsSize}</td> - <td>${uiLabelMap.WebtoolsHits}</td> - <td>${uiLabelMap.WebtoolsMisses}</td> - <td>${uiLabelMap.WebtoolsRemoves}</td> - <td>${uiLabelMap.WebtoolsMaxSize}</td> - <td>${uiLabelMap.WebtoolsExpireTime}</td> - <td align="center">${uiLabelMap.WebtoolsUseSoftRef}</td> - <td align="center">${uiLabelMap.WebtoolsUseFileStore}</td> - <td align="center">${uiLabelMap.WebtoolsAdministration}</td> - </tr> - <#assign alt_row = false> - <#list cacheList as cache> - <tr<#if alt_row> class="alternate-row"</#if>> - <td>${cache.cacheName?if_exists}</td> - <td>${cache.cacheSize?if_exists}</td> - <td>${cache.hitCount?if_exists}</td> - <td>${cache.missCountTot?if_exists}/${cache.missCountNotFound?if_exists}/${cache.missCountExpired?if_exists}/${cache.missCountSoftRef?if_exists}</td> - <td>${cache.removeHitCount?if_exists}/${cache.removeMissCount?if_exists}</td> - <td>${cache.maxSize?if_exists}</td> - <td>${cache.expireTime?if_exists}</td> - <td align="center">${cache.useSoftReference?if_exists}</td> - <td align="center">${cache.useFileSystemStore?if_exists}</td> - <td class="button-col"> - <a href="<@ofbizUrl>FindUtilCacheElements?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>">${uiLabelMap.WebtoolsElements}</a> - <#if hasUtilCacheEdit> - <a href="<@ofbizUrl>EditUtilCache?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> - </#if> - <#if hasUtilCacheEdit> - <a href="<@ofbizUrl>FindUtilCacheClear?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>">${uiLabelMap.CommonClear}</a> - </#if> - </td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleFindUtilCache}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <br/> + <p> + <u><b>${uiLabelMap.WebtoolsMemory}</b></u> + <b>${uiLabelMap.WebtoolsTotalMemory}</b> ${memory} + <b>${uiLabelMap.WebtoolsFreeMemory}</b> ${freeMemory} + <b>${uiLabelMap.WebtoolsUsedMemory}</b> ${usedMemory} + <b>${uiLabelMap.WebtoolsMaxMemory}</b> ${maxMemory} + </p> + <br/> + + <@displayButtonBar/> + + <#if cacheList?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsCacheName}</td> + <td>${uiLabelMap.WebtoolsSize}</td> + <td>${uiLabelMap.WebtoolsHits}</td> + <td>${uiLabelMap.WebtoolsMisses}</td> + <td>${uiLabelMap.WebtoolsRemoves}</td> + <td>${uiLabelMap.WebtoolsMaxSize}</td> + <td>${uiLabelMap.WebtoolsExpireTime}</td> + <td align="center">${uiLabelMap.WebtoolsUseSoftRef}</td> + <td align="center">${uiLabelMap.WebtoolsUseFileStore}</td> + <td align="center">${uiLabelMap.WebtoolsAdministration}</td> </tr> - <#assign alt_row = !alt_row> - </#list> - </table> -<#else> - ${uiLabelMap.WebtoolsNoUtilCacheFound} -</#if> - -<@displayButtonBar/> - + <#assign alt_row = false> + <#list cacheList as cache> + <tr<#if alt_row> class="alternate-row"</#if>> + <td>${cache.cacheName?if_exists}</td> + <td>${cache.cacheSize?if_exists}</td> + <td>${cache.hitCount?if_exists}</td> + <td>${cache.missCountTot?if_exists}/${cache.missCountNotFound?if_exists}/${cache.missCountExpired?if_exists}/${cache.missCountSoftRef?if_exists}</td> + <td>${cache.removeHitCount?if_exists}/${cache.removeMissCount?if_exists}</td> + <td>${cache.maxSize?if_exists}</td> + <td>${cache.expireTime?if_exists}</td> + <td align="center">${cache.useSoftReference?if_exists}</td> + <td align="center">${cache.useFileSystemStore?if_exists}</td> + <td class="button-col"> + <a href="<@ofbizUrl>FindUtilCacheElements?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>">${uiLabelMap.WebtoolsElements}</a> + <#if hasUtilCacheEdit> + <a href="<@ofbizUrl>EditUtilCache?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> + </#if> + <#if hasUtilCacheEdit> + <a href="<@ofbizUrl>FindUtilCacheClear?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>">${uiLabelMap.CommonClear}</a> + </#if> + </td> + </tr> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.WebtoolsNoUtilCacheFound} + </#if> + + <@displayButtonBar/> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl Mon Feb 18 09:09:33 2008 @@ -23,47 +23,54 @@ </div> </#macro> -<h1>${uiLabelMap.PageTitleFindUtilCacheElements}</h1> -<br /> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleFindUtilCacheElements}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <br/> + <p> + <b>${uiLabelMap.WebtoolsCacheName}</b> ${cacheName?if_exists} (${now}) + <b>${uiLabelMap.WebtoolsSizeTotal}</b> ${totalSize} ${uiLabelMap.WebtoolsBytes} + </p> + <br/> -<p> - <b>${uiLabelMap.WebtoolsCacheName}:</b> ${cacheName?if_exists} (${now}) - <b>${uiLabelMap.WebtoolsSizeTotal}:</b> ${totalSize} ${uiLabelMap.WebtoolsBytes} -</p> -<br /> + <@displayButtonBar/> -<@displayButtonBar/> - -<#if cacheName?has_content> - <#if cacheElementsList?has_content> - <table class="basic-table light-grid hover-bar" cellspacing="0"> - <tr class="header-row"> - <td>${uiLabelMap.WebtoolsCacheElementKey}</td> - <td>${uiLabelMap.WebtoolsExpireTime}</td> - <td>${uiLabelMap.WebtoolsBytes}</td> - <td> </td> - </tr> - <#assign alt_row = false> - <#list cacheElementsList as cacheElement> - <tr<#if alt_row> class="alternate-row"</#if>> - <td>${cacheElement.elementKey?if_exists}</td> - <td nowrap="nowrap">${cacheElement.expireTime?if_exists}</td> - <td>${cacheElement.lineSize?if_exists}</td> - <td class="button-col"> - <#if hasUtilCacheEdit> - <a href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a> - </#if> - </td> + <#if cacheName?has_content> + <#if cacheElementsList?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsCacheElementKey}</td> + <td>${uiLabelMap.WebtoolsExpireTime}</td> + <td>${uiLabelMap.WebtoolsBytes}</td> + <td> </td> </tr> - <#assign alt_row = !alt_row> - </#list> - </table> + <#assign alt_row = false> + <#list cacheElementsList as cacheElement> + <tr<#if alt_row> class="alternate-row"</#if>> + <td>${cacheElement.elementKey?if_exists}</td> + <td nowrap="nowrap">${cacheElement.expireTime?if_exists}</td> + <td>${cacheElement.lineSize?if_exists}</td> + <td class="button-col"> + <#if hasUtilCacheEdit> + <a href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a> + </#if> + </td> + </tr> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.WebtoolsNoUtilCacheElementsFound} + </#if> <#else> - ${uiLabelMap.WebtoolsNoUtilCacheElementsFound} + ${uiLabelMap.WebtoolsNoUtilCacheSpecified} </#if> -<#else> - ${uiLabelMap.WebtoolsNoUtilCacheSpecified} -</#if> - -<@displayButtonBar/> + <@displayButtonBar/> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl Mon Feb 18 09:09:33 2008 @@ -34,8 +34,8 @@ <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)?if_exists> <#if (certString?has_content)> <tr> - <td class="label">${uiLabelMap.WebtoolsCertsCert}:</td> - <td>${cert.getType()} : ${cert.getSubjectX500Principal()}</td> + <td class="label">${uiLabelMap.WebtoolsCertsCert}</td> + <td>${cert.getType()} ${cert.getSubjectX500Principal()}</td> </tr> <tr> <td class="label">${uiLabelMap.WebtoolsCertsSerialNum}:</td> @@ -63,4 +63,4 @@ <#else> <div class="screenlet-body">${uiLabelMap.WebtoolsCertsRequiresSSL}.</div> </#if> -</div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl Mon Feb 18 09:09:33 2008 @@ -20,20 +20,25 @@ <#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/> <div id="stats-bins-history" class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.WebtoolsComponentsLoaded}</h3> - </div> + <ul> + <li class="head3">${uiLabelMap.WebtoolsComponentsLoaded}</li> + </ul> + <br class="clear"/> + </div> <#if (components?has_content)> - <table class="basic-table" cellspacing="0"> + <div class="screenlet-body"> + <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.CommonName}</td> <td>${uiLabelMap.WebtoolsComponentsPath}</td> <td>${uiLabelMap.CommonEnabled}</td> <td colspan="3">${uiLabelMap.WebtoolsComponentsWebApps}</td> </tr> + <#assign alt_row = false> <#list components as component> <#assign webinfos = component.getWebappInfos()?if_exists/> <#assign firstRow = true> - <tr> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${component.getComponentName()?if_exists}</td> <td>${component.getRootLocation()?if_exists}</td> <td>${component.enabled()?string?if_exists}</td> @@ -58,9 +63,12 @@ <td> </td> </tr> </#if> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> </#list> </table> + </div> <#else> - <div class="screenlet-body">${uiLabelMap.WebtoolsComponentsNoComponents}.</div> + <div class="screenlet-body">${uiLabelMap.WebtoolsComponentsNoComponents}.</div> </#if> -</div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Mon Feb 18 09:09:33 2008 @@ -16,140 +16,148 @@ specific language governing permissions and limitations under the License. --> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsDataFileMainTitle}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <br/> + <p>${uiLabelMap.WebtoolsDataFileMessage1}.</p> + <br/> + <#if security.hasPermission("DATAFILE_MAINT", session)> + <form method="post" action="<@ofbizUrl>viewdatafile</@ofbizUrl>"> + <table class="basic-table" cellspacing="0"> + <tr> + <td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td> + <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION?if_exists}"></td> + <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if>></td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td> + <td> + <#if definitionNames?has_content> + <select name="DEFINITION_NAME"> + <option value=""></option> + <#list definitionNames as oneDefinitionName> + boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName); + <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected </#if>>${oneDefinitionName}</option> + </#list> + </select> + <#else> + <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName?if_exists}"> + </#if> + </td> + <td> </td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsDataFileName}</td> + <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION?if_exists}"></td> + <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if>></td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td> + <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE?if_exists}"/></td> + <td> </td> + </tr> + <tr> + <td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td> + <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE?if_exists}"></td> + <td> </td> + </tr> + <tr> + <td> </td> + <td><input type="submit" value="${uiLabelMap.CommonRun}"></td> + <td> </td> + </tr> + </table> + </form> -<h1>${uiLabelMap.WebtoolsDataFileMainTitle}</h1> -<br /> -<p>${uiLabelMap.WebtoolsDataFileMessage1}.</p> -<hr/> -<#if security.hasPermission("DATAFILE_MAINT", session)> - <form method="post" action="<@ofbizUrl>viewdatafile</@ofbizUrl>"> - <table class="basic-table form-widget-table"> - <tr> - <td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td> - <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION?if_exists}"></td> - <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if>></td> - </tr> - <tr> - <td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td> - <td> - <#if definitionNames?has_content> - <select name="DEFINITION_NAME"> - <option value=""></option> - <#list definitionNames as oneDefinitionName> - boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName); - <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected </#if>>${oneDefinitionName}</option> - </#list> - </select> - <#else> - <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName?if_exists}"> - </#if> - </td> - <td> </td> - </tr> - <tr> - <td class="label">${uiLabelMap.WebtoolsDataFileName}</td> - <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION?if_exists}"></td> - <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if>></td> - </tr> - <tr> - <td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td> - <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE?if_exists}"/></td> - <td> </td> - </tr> - <tr> - <td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td> - <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE?if_exists}"></td> - <td> </td> - </tr> - <tr> - <td> </td> - <td><input type="submit" value="${uiLabelMap.CommonRun}"></td> - <td> </td> - </tr> - </table> - </form> - - <#if messages?has_content> - <hr/> - <h1>${uiLabelMap.CommonFollowingOccurred}:</h1> - <div> - <#list messages as message> - <p>${message}</p> - </#list> - </div> - </#if> + <#if messages?has_content> + <hr/> + <h1>${uiLabelMap.CommonFollowingOccurred}:</h1> + <div> + <#list messages as message> + <p>${message}</p> + </#list> + </div> + </#if> -<#macro displayrecords records> - <#assign lastRecordName = null> - <#list records as record> - <#assign modelRecord = record.getModelRecord()> - <#-- if record is different than the last displayed, make a new table and header row --> - <#if !modelRecord.name.equals(lastRecordName)> - <#if lastRecordName != null> - </table><br /> - </#if> - <table class="dark-grid" cellspacing="0"> - <tr> - <td><b>Record: ${modelRecord.name}</b></td> - <#if (modelRecord.parentName)?has_content> - <td><b>Parent: ${modelRecord.parentName}</b></td> + <#macro displayrecords records> + <#assign lastRecordName = null> + <#list records as record> + <#assign modelRecord = record.getModelRecord()> + <#-- if record is different than the last displayed, make a new table and header row --> + <#if !modelRecord.name.equals(lastRecordName)> + <#if lastRecordName != null> + </table><br/> </#if> - <td>${modelRecord.description}</td> - </tr> - </table> - <table class="dark-grid" cellspacing='0'> + <table class="basic-table hover-bar" cellspacing="0"> + <tr> + <td><b>Record: ${modelRecord.name}</b></td> + <#if (modelRecord.parentName)?has_content> + <td><b>Parent: ${modelRecord.parentName}</b></td> + </#if> + <td>${modelRecord.description}</td> + </tr> + </table> + <table class="dark-grid" cellspacing='0'> + <tr> + <#list modelRecord.fields as modelField> + <td><b>${modelField.name}</b></td> + </#list> + </tr> + <#assign lastRecordName = modelRecord.name> + </#if> + <tr> <#list modelRecord.fields as modelField> - <td><b>${modelField.name}</b></td> + <#assign value = record.get(modelField.name)> + <#if value?has_content> + <td>${value}</td> + <#else> + <td>${modelField.defaultValue}</td> + </#if> </#list> </tr> - <#assign lastRecordName = modelRecord.name> - </#if> - - <tr> - <#list modelRecord.fields as modelField> - <#assign value = record.get(modelField.name)> - <#if value?has_content> - <td>${value}</td> - <#else> - <td>${modelField.defaultValue}</td> + <#if record.getChildRecords() != null && (record.getChildRecords().size() > 0)> + <@displayrecords records = record.getChildRecords()/> </#if> </#list> - </tr> - <#if record.getChildRecords() != null && (record.getChildRecords().size() > 0)> - <@displayrecords records = record.getChildRecords()/> - </#if> - </#list> - </table> -</#macro> + </table> + </#macro> - <#if dataFile?has_content && modelDataFile?has_content && (!parameters.ENTITYXML_FILE_SAVE?has_content || parameters.ENTITYXML_FILE_SAVE.length() == 0) && (parameters.DATAFILE_SAVE == null || parameters.DATAFILE_SAVE.length() == 0)> - <hr/> - <table class="basic-table" cellspacing="0"> - <tr class="header-row"> - <td>Name</td> - <td>Type-Code</td> - <td>Sender</td> - <td>Receiver</td> - <td>Record Length</td> - <td>Separator Style</td> - </tr> - <tr> - <td>${modelDataFile.name}</td> - <td>${modelDataFile.typeCode}</td> - <td>${modelDataFile.sender}</td> - <td>${modelDataFile.receiver}</td> - <td>${modelDataFile.recordLength}</td> - <td>${modelDataFile.separatorStyle}</td> - </tr> - <tr> - <td class="label">Description</td> - <td colspan="">${modelDataFile.description}</td> - </tr> - </table> - <br/> - <@displayrecords records = dataFile.getRecords()/> - </#if> -<#else> - <h3>You do not have permission to use this page (DATAFILE_MAINT needed)</h3> -</#if> + <#if dataFile?has_content && modelDataFile?has_content && (!parameters.ENTITYXML_FILE_SAVE?has_content || parameters.ENTITYXML_FILE_SAVE.length() == 0) && (parameters.DATAFILE_SAVE == null || parameters.DATAFILE_SAVE.length() == 0)> + <hr/> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>Name</td> + <td>Type-Code</td> + <td>Sender</td> + <td>Receiver</td> + <td>Record Length</td> + <td>Separator Style</td> + </tr> + <tr> + <td>${modelDataFile.name}</td> + <td>${modelDataFile.typeCode}</td> + <td>${modelDataFile.sender}</td> + <td>${modelDataFile.receiver}</td> + <td>${modelDataFile.recordLength}</td> + <td>${modelDataFile.separatorStyle}</td> + </tr> + <tr> + <td class="label">Description</td> + <td colspan="">${modelDataFile.description}</td> + </tr> + </table> + <br/> + <@displayrecords records = dataFile.getRecords()/> + </#if> + <#else> + <h3>You do not have permission to use this page (DATAFILE_MAINT needed)</h3> + </#if> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Mon Feb 18 09:09:33 2008 @@ -16,81 +16,99 @@ specific language governing permissions and limitations under the License. --> - -<h1>${uiLabelMap.WebtoolsEntityDataMaintenance}</h1> -<br /> -<p><b>${uiLabelMap.CommonNote}:</b></p> -<p>${uiLabelMap.WebtoolsCreate} :- ${uiLabelMap.CommonCreateNew}</p> -<p>${uiLabelMap.WebtoolsReln} :- ${uiLabelMap.WebtoolsViewRelations}</p> -<p>${uiLabelMap.WebtoolsFind} :- ${uiLabelMap.WebtoolsFindRecord}</p> -<p>${uiLabelMap.WebtoolsAll} :- ${uiLabelMap.WebtoolsFindAllRecords}</p> -<br /> -<#assign firstChar = "x"> -<#assign anchor=""> -<#assign alt_row = false> -<#assign right_col = false> - -<#list entitiesList as entity> - <#if entity.entityName?substring(0, 1) != firstChar> - <#assign firstChar = entity.entityName?substring(0, 1)> - <a href="#Entity_${firstChar}">${firstChar}</a> - </#if> -</#list> -<br/><br/> - -<#assign firstChar = "*"> -<table class="basic-table light-grid hover-bar" cellspacing='0'> - <tr class="header-row"> - <td>${uiLabelMap.WebtoolsEntityName}</td> - <td> </td> - <td>${uiLabelMap.WebtoolsEntityName}</td> - <td> </td> - </tr> - <#list entitiesList as entity> - <#if entity.entityName?substring(0, 1) != firstChar> - <#if right_col> - <td> </td><td> </td></tr> - <#assign right_col = false> - <#assign alt_row = !alt_row> - </#if> - <#if firstChar != "*"> - <tr<#if alt_row> class="alternate-row"</#if>><td colspan="4"> </td></tr> - <#assign alt_row = !alt_row> - </#if> - <#assign firstChar = entity.entityName?substring(0, 1)> - <#assign anchor="id=\"Entity_${firstChar}\""> - </#if> - <#if !right_col> - <tr<#if alt_row> class="alternate-row"</#if>> - </#if> - - <td<#if anchor?has_content> ${anchor}</#if>>${entity.entityName}<#if entity.viewEntity == 'Y'> (${uiLabelMap.WebtoolsEntityView})</#if></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsEntityDataMaintenance}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <p><b><u>${uiLabelMap.CommonNote}</u></b></p> + <p> + <b>${uiLabelMap.WebtoolsCreate}</b> = ${uiLabelMap.CommonCreateNew} + <b>${uiLabelMap.WebtoolsReln}</b> = ${uiLabelMap.WebtoolsViewRelations} + <b>${uiLabelMap.WebtoolsFind}</b> = ${uiLabelMap.WebtoolsFindRecord} + <b>${uiLabelMap.WebtoolsAll}</b> = ${uiLabelMap.WebtoolsFindAllRecords} + </p> + <br /> + <#assign firstChar = "x"> <#assign anchor=""> - <td class="button-col"> - <#if entity.viewEntity == 'Y'> - <#if entity.entityPermissionView == 'Y'> - <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a> - <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a> - <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a> + <#assign alt_row = false> + <#assign right_col = false> + + <#list entitiesList as entity> + <#if entity.entityName?substring(0, 1) != firstChar> + <#assign firstChar = entity.entityName?substring(0, 1)> + <a href="#Entity_${firstChar}">${firstChar}</a> </#if> - <#else> - <#if entity.entityPermissionCreate == 'Y'> - <a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsCreate}</a> - </#if> - <#if entity.entityPermissionView == 'Y'> - <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a> - <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a> - <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a> - </#if> - </#if> - </td> - <#if right_col> - </tr> - <#assign alt_row = !alt_row> - </#if> - <#assign right_col = !right_col> - </#list> - <#if right_col> - <td> </td><td> </td></tr> - </#if> -</table> + </#list> + <br/><br/> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsEntitiesAlpha}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#assign firstChar = "*"> + <table class="basic-table hover-bar" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsEntityName}</td> + <td> </td> + <td>${uiLabelMap.WebtoolsEntityName}</td> + <td> </td> + </tr> + <#list entitiesList as entity> + <#if entity.entityName?substring(0, 1) != firstChar> + <#if right_col> + <td> </td><td> </td></tr> + <#assign right_col = false> + <#assign alt_row = !alt_row> + </#if> + <#if firstChar != "*"> + <tr<#if alt_row> class="alternate-row"</#if>><td colspan="4"> </td></tr> + <#assign alt_row = !alt_row> + </#if> + <#assign firstChar = entity.entityName?substring(0, 1)> + <#assign anchor="id=\"Entity_${firstChar}\""> + </#if> + <#if !right_col> + <tr<#if alt_row> class="alternate-row"</#if>> + </#if> + + <td<#if anchor?has_content> ${anchor}</#if>>${entity.entityName}<#if entity.viewEntity == 'Y'> (${uiLabelMap.WebtoolsEntityView})</#if></td> + <#assign anchor=""> + <td class="button-col"> + <#if entity.viewEntity == 'Y'> + <#if entity.entityPermissionView == 'Y'> + <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a> + </#if> + <#else> + <#if entity.entityPermissionCreate == 'Y'> + <a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsCreate}</a> + </#if> + <#if entity.entityPermissionView == 'Y'> + <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a> + </#if> + </#if> + </td> + <#if right_col> + </tr> + <#assign alt_row = !alt_row> + </#if> + <#assign right_col = !right_col> + </#list> + <#if right_col> + <td> </td><td> </td></tr> + </#if> + </table> + </div> + </div> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl Mon Feb 18 09:09:33 2008 @@ -16,73 +16,86 @@ specific language governing permissions and limitations under the License. --> -<h1>${uiLabelMap.WebtoolsSqlProcessor}</h1> -<br/> -<form method="post" action="EntitySQLProcessor" name="EntitySQLCommand"> -<table class="basic-table" cellspacing="0"> - <tr> - <td class="label"> - ${uiLabelMap.CommonGroup} - </td> - <td> - <select name="group"> - <#list groups as group> - <option value="${group}" <#if selGroup?exists><#if group = selGroup>selected</#if></#if>>${group}</option> - </#list> - </select> - </td> - </tr> - <tr> - <td class="label"> - ${uiLabelMap.WebtoolsSqlCommand} - </td> - <td> - <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand?if_exists}</textarea> - </td> - </tr> - <tr> - <td class="label"> - ${uiLabelMap.WebtoolsLimitRowsTo} - </td> - <td> - <input name="rowLimit" type="text" size="5" value="${rowLimit?default(200)}"/> - </td> - </tr> - <tr> - <td> </td> - <td> - <input type="submit" name="submitButton" value="${uiLabelMap.CommonSubmit}"/> - </td> - </tr> -</table> -</form> - -<br /> -<h1>${uiLabelMap.WebtoolsResults}</h1> -<br /> - -<#if resultMessage?has_content> - ${resultMessage} - <br /> -</#if> - -<#if columns?has_content> - <table class="basic-table dark-grid hover-bar" cellspacing="0"> - <tr class="header-row"> - <#list columns as column> - <td>${column}</td> - </#list> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsSqlProcessor}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <form method="post" action="EntitySQLProcessor" name="EntitySQLCommand"> + <table class="basic-table" cellspacing="0"> + <tr> + <td class="label"> + ${uiLabelMap.CommonGroup} + </td> + <td> + <select name="group"> + <#list groups as group> + <option value="${group}" <#if selGroup?exists><#if group = selGroup>selected</#if></#if>>${group}</option> + </#list> + </select> + </td> + </tr> + <tr> + <td class="label"> + ${uiLabelMap.WebtoolsSqlCommand} + </td> + <td> + <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand?if_exists}</textarea> + </td> + </tr> + <tr> + <td class="label"> + ${uiLabelMap.WebtoolsLimitRowsTo} + </td> + <td> + <input name="rowLimit" type="text" size="5" value="${rowLimit?default(200)}"/> + </td> </tr> - <#if records?has_content> - <#assign alt_row = false> - <#list records as record> - <tr <#if alt_row> class="alternate-row"</#if> > - <#list record as field> - <td>${field?if_exists}</td> + <tr> + <td> </td> + <td> + <input type="submit" name="submitButton" value="${uiLabelMap.CommonSubmit}"/> + </td> + </tr> + </table> + </form> + </div> +</div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsResults}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if resultMessage?has_content> + ${resultMessage} + <br /> + </#if> + + <#if columns?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <#list columns as column> + <td>${column}</td> </#list> </tr> - <#assign alt_row = !alt_row> - </#list> - </#if> - </table> -</#if> + <#if records?has_content> + <#assign alt_row = false> + <#list records as record> + <tr <#if alt_row> class="alternate-row"</#if> > + <#list record as field> + <td>${field?if_exists}</td> + </#list> + </tr> + <#assign alt_row = !alt_row> + </#list> + </#if> + </table> + </#if> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Mon Feb 18 09:09:33 2008 @@ -16,39 +16,48 @@ specific language governing permissions and limitations under the License. --> -<#if hasViewPermission> - <h1>${uiLabelMap.WebtoolsRelations}</h1> - <br /> - <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> - <br /> - <div class="button-bar"> - <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> - </div> - <br /> - <table class="basic-table light-grid hover-bar" cellspacing="0"> - <tr class="header-row"> - <td>${uiLabelMap.WebtoolsTitle}</td> - <td>${uiLabelMap.WebtoolsRelatedEntity}</td> - <td>${uiLabelMap.WebtoolsRelationType}</td> - <td>${uiLabelMap.WebtoolsFKName}</td> - <td>${uiLabelMap.WebtoolsFieldsList}</td> - </tr> - <#assign alt_row = false> - <#list relations as relation> - <tr<#if alt_row> class="alternate-row"</#if>> - <td>${relation.title}</td> - <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td> - <td>${relation.type}</td> - <td>${relation.fkName}</td> - <td> - <#list relation.relFields as field> - ${field.fieldName} -> ${field.relFieldName}<br/> - </#list> - </td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsRelations}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if hasViewPermission> + <br/> + <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> + <br/> + <div class="button-bar"> + <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> + </div> + <br/> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsTitle}</td> + <td>${uiLabelMap.WebtoolsRelatedEntity}</td> + <td>${uiLabelMap.WebtoolsRelationType}</td> + <td>${uiLabelMap.WebtoolsFKName}</td> + <td>${uiLabelMap.WebtoolsFieldsList}</td> </tr> - <#assign alt_row = !alt_row> - </#list> - </table> -<#else> - <h3>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</h3> -</#if> + <#assign alt_row = false> + <#list relations as relation> + <tr<#if alt_row> class="alternate-row"</#if>> + <td>${relation.title}</td> + <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td> + <td>${relation.type}</td> + <td>${relation.fkName}</td> + <td> + <#list relation.relFields as field> + ${field.fieldName} -> ${field.relFieldName}<br/> + </#list> + </td> + </tr> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + <h3>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</h3> + </#if> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.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 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="LevelSwitch" type="single" target="AdjustDebugLevels" default-map-name="activeDebugLevel"> + <form name="LevelSwitch" type="single" target="AdjustDebugLevels" default-map-name="activeDebugLevel" + header-row-style="header-row" default-table-style="basic-table"> <field name="fatal" title="${uiLabelMap.WebtoolsFatalLogLevel}" tooltip="${uiLabelMap.WebtoolsFatalLogLevelTooltip}"><check/></field> <field name="error" title="${uiLabelMap.WebtoolsErrorLogLevel}" tooltip="${uiLabelMap.WebtoolsErrorLogLevelTooltip}"><check/></field> <field name="warning" title="${uiLabelMap.WebtoolsWarningLogLevel}" tooltip="${uiLabelMap.WebtoolsWarningLogLevelTooltip}"><check/></field> @@ -31,7 +32,8 @@ <field name="submit" title="${uiLabelMap.CommonUpdate}"><submit/></field> </form> - <form name="AddLogger" type="single" default-map-name="defaultLogger" target="AddLogger"> + <form name="AddLogger" type="single" default-map-name="defaultLogger" target="AddLogger" + header-row-style="header-row" default-table-style="basic-table"> <field name="name" title="${uiLabelMap.WebtoolsLoggerName}"><text size="50"/></field> <field name="level" title="${uiLabelMap.WebtoolsLoggerLevel}"> <drop-down> @@ -50,7 +52,7 @@ </form> <form name="LoggerList" type="multi" target="UpdateLogger" list-name="loggerList" separate-columns="true" - paginate="false"> + paginate="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="name" title="${uiLabelMap.WebtoolsLoggerName}"><display/></field> <field name="level" title="${uiLabelMap.WebtoolsLoggerLevel}"> <drop-down> @@ -69,4 +71,4 @@ </field> <field name="submit" title="${uiLabelMap.CommonUpdate}"><submit/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Mon Feb 18 09:09:33 2008 @@ -70,7 +70,7 @@ <#if security.hasPermission("ENTITY_MAINT", session)> <li><h3>${uiLabelMap.WebtoolsEntityEngineTools}</h3></li> <li><a href="<@ofbizUrl>entitymaint</@ofbizUrl>">${uiLabelMap.WebtoolsEntityDataMaintenance}</a></li> - <li><a href="<@ofbizUrl>view/entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference}</a> <a href="<@ofbizUrl>view/entityref?forstatic=true</@ofbizUrl>" target="_blank">[${uiLabelMap.WebtoolsEntityReferenceStaticVersion}]</a></li> + <li><a href="<@ofbizUrl>view/entityref</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReference}</a> <a href="<@ofbizUrl>view/entityref?forstatic=true</@ofbizUrl>" target="_blank">- ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}</a></li> <li><a href="<@ofbizUrl>view/entityrefReport</@ofbizUrl>" target="_blank">${uiLabelMap.WebtoolsEntityReferencePdf}</a></li> <li><a href="<@ofbizUrl>EntitySQLProcessor</@ofbizUrl>">${uiLabelMap.PageTitleEntitySQLProcessor}</a></li> <li><a href="<@ofbizUrl>EntitySyncStatus</@ofbizUrl>">${uiLabelMap.WebtoolsEntitySyncStatus}</a></li> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl Mon Feb 18 09:09:33 2008 @@ -17,11 +17,9 @@ under the License. --> -<h1>${uiLabelMap.WebtoolsEntityEnginePerformanceTests}</h1> -<br /> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.WebtoolsTestResults}</h3> + <h3>${uiLabelMap.WebtoolsEntityEnginePerformanceTests} - ${uiLabelMap.WebtoolsTestResults}</h3> </div> <div class="screenlet-body"> <#if security.hasPermission("ENTITY_MAINT", session)> @@ -32,7 +30,7 @@ </p> <br/> <#if performanceList?has_content> - <table class="basic-table" cellspacing="0"> + <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.WebtoolsPerformanceOperation}</td> <td>${uiLabelMap.WebtoolsEntity}</td> @@ -41,9 +39,9 @@ <td>${uiLabelMap.WebtoolsPerformanceSecondsCall}</td> <td>${uiLabelMap.WebtoolsPerformanceCallsSecond}</td> </tr> - <#assign rowNum = "2"> + <#assign alt_row = false> <#list performanceList as perfRow> - <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${perfRow.operation}</td> <td>${perfRow.entity}</td> <td>${perfRow.calls}</td> @@ -51,6 +49,8 @@ <td>${perfRow.secsPerCall}</td> <td>${perfRow.callsPerSecond}</td> </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> </#list> </table> <#else> @@ -60,4 +60,4 @@ ${uiLabelMap.WebtoolsPermissionMaint} </#if> </div> -</div> +</div> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl Mon Feb 18 09:09:33 2008 @@ -22,14 +22,21 @@ <h1>${uiLabelMap.WebtoolsEditCustomTimePeriods}</h1> <br /> <#if security.hasPermission("PERIOD_MAINT", session)> - <form method="post" action="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" name="setOrganizationPartyIdForm"> - <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> - <span class="label">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</span> - <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> - <input type="submit" value='${uiLabelMap.CommonUpdate}'> - </form> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</li> + </ul> + <br class="clear"/> + </div> + <form method="post" action="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" name="setOrganizationPartyIdForm"> + <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}"> + <span class="label">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</span> + <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}"> + <input type="submit" value='${uiLabelMap.CommonUpdate}'> + </form> + </div> - <br/> <div class="screenlet"> <div class="screenlet-title-bar"> <#if currentCustomTimePeriod?has_content> @@ -37,7 +44,6 @@ <li class="h3">${uiLabelMap.WebtoolsCurrentCustomTimePeriod}</li> <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">${uiLabelMap.WebtoolsClearCurrent}</a></li> </ul> - <br class="clear" /> <#else> <h3>${uiLabelMap.WebtoolsCurrentCustomTimePeriod}</h3> </#if> @@ -81,8 +87,8 @@ </select> <#if (currentCustomTimePeriod.parentPeriodId)?exists> <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'> - ${uiLabelMap.WebtoolsSetAsCurrent}</a> - </#if> + ${uiLabelMap.WebtoolsSetAsCurrent}</a> + </#if> </td> <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId?if_exists}"></td> <td> @@ -130,8 +136,6 @@ <div class="screenlet-body">${uiLabelMap.WebtoolsMessage27}</div> </#if> </div> - <br/> - <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.WebtoolsChildPeriods}</h3> @@ -226,8 +230,6 @@ <div class="screenlet-body">${uiLabelMap.WebtoolsMessage28}</div> </#if> </div> - <br/> - <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.WebtoolsAddCustomTimePeriod}</h3> @@ -242,7 +244,7 @@ <select name="parentPeriodId"> <option value=''> </option> <#list allCustomTimePeriods as allCustomTimePeriod> - <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> + <#assign allPeriodType = allCustomTimePeriod.getRelatedOneCache("PeriodType")> <#assign isDefault = false> <#if currentCustomTimePeriod?exists> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> @@ -291,4 +293,4 @@ </div> <#else> <h3>${uiLabelMap.WebtoolsPermissionPeriod}.</h3> -</#if> +</#if> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml Mon Feb 18 09:09:33 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?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 @@ -21,7 +21,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="scheduleJob" type="single" target="setServiceParameters"> + <form name="scheduleJob" type="single" target="setServiceParameters" + header-row-style="header-row" default-table-style="basic-table"> <field name="JOB_NAME" title="${uiLabelMap.WebtoolsJob}"><text/></field> <field name="SERVICE_NAME" title="${uiLabelMap.WebtoolsService}"><text/></field> <field name="POOL_NAME" title="${uiLabelMap.WebtoolsPool}"><text/></field> @@ -45,14 +46,16 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - <form name="runService" type="single" target="setSyncServiceParameters"> + <form name="runService" type="single" target="setSyncServiceParameters" + header-row-style="header-row" default-table-style="basic-table"> <field name="SERVICE_NAME" title="${uiLabelMap.WebtoolsService}"><text/></field> <field name="POOL_NAME" title="${uiLabelMap.WebtoolsPool}"><text/></field> <field name="_RUN_SYNC_"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> - - <form name="findJob" type="single" target="jobList?hideFields=Y&lookupFlag=Y" list-name="jobs"> + + <form name="findJob" title="" type="single" target="jobList?hideFields=Y&lookupFlag=Y" list-name="jobs" + header-row-style="header-row" default-table-style="basic-table"> <!--field name="lookupFlag"><hidden value="Y"/></field--> <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text/></field> <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}" use-when=""${parameters.hideFields}".equals("Y")"><ignored/></field> @@ -69,9 +72,10 @@ </field> <field name="" widget-style="buttontext" use-when=""${parameters.hideFields}".equals("Y")"><ignored/></field> </form> - + <form name="JobList" title="" target="" type="list" list-name="jobs" - paginate-target="jobList" override-list-size="${jobListSize}"> + paginate-target="jobList" override-list-size="${jobListSize}" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><display/></field> <field name="jobId" title="${uiLabelMap.CommonId}"><display/></field> <field name="poolId" title="${uiLabelMap.WebtoolsPool}"><display/></field> @@ -82,8 +86,8 @@ </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="cancelDateTime" title="${uiLabelMap.CommonEndDateTime}"><display/></field> - <field name="cancelButton" title="" use-when="startDateTime==null&&finishDateTime==null&&cancelDateTime==null" widget-style="buttontext"> + <field name="cancelButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="startDateTime==null&&finishDateTime==null&&cancelDateTime==null" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob?jobId=${jobId}"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=628818&r1=628817&r2=628818&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Mon Feb 18 09:09:33 2008 @@ -27,7 +27,7 @@ <#if showWsdl?exists && showWsdl = true> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.WebtoolsServiceWSDL} - ${uiLabelMap.WebtoolsService}: ${selectedServiceMap.serviceName}</h3> + <h3>${uiLabelMap.WebtoolsServiceWSDL} - ${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</h3> </div> <div class="screenlet-body" align="center"> <form><textarea rows="20" cols="85" name="wsdloutput">${selectedServiceMap.wsdl}</textarea></form> @@ -39,7 +39,7 @@ <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.WebtoolsService}: ${selectedServiceMap.serviceName}</li> + <li class="h3">${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</li> <li><a href='<@ofbizUrl>${url}</@ofbizUrl>'>${uiLabelMap.CommonListAll}</a></li> <li><a href='<@ofbizUrl>/scheduleJob?SERVICE_NAME=${selectedServiceMap.serviceName}</@ofbizUrl>'>${uiLabelMap.WebtoolsSchedule}</a></li> <li><a href='<@ofbizUrl>/setSyncServiceParameters?SERVICE_NAME=${selectedServiceMap.serviceName}&POOL_NAME=pool&_RUN_SYNC_=Y</@ofbizUrl>'>${uiLabelMap.PageTitleRunService}</a></li> @@ -49,41 +49,41 @@ <div class="screenlet-body"> <table class="basic-table" cellspacing='0'> <tr> - <td class="label">${uiLabelMap.WebtoolsServiceName}:</td> + <td class="label">${uiLabelMap.WebtoolsServiceName}</td> <td>${selectedServiceMap.serviceName}</td> - <td class="label">${uiLabelMap.WebtoolsEngineName}:</td> + <td class="label">${uiLabelMap.WebtoolsEngineName}</td> <td><a href='<@ofbizUrl>${url}?constraint=engine_name@${selectedServiceMap.engineName}</@ofbizUrl>'>${selectedServiceMap.engineName}</a></td> </tr> <tr> - <td class="label">${uiLabelMap.CommonDescription}:</td> + <td class="label">${uiLabelMap.CommonDescription}</td> <td>${selectedServiceMap.description}</td> - <td class="label">${uiLabelMap.WebtoolsInvoke}:</td> + <td class="label">${uiLabelMap.WebtoolsInvoke}</td> <td>${selectedServiceMap.invoke}</td> </tr> <tr> - <td class="label">${uiLabelMap.WebtoolsExportable}:</td> + <td class="label">${uiLabelMap.WebtoolsExportable}</td> <td>${selectedServiceMap.export}<#if selectedServiceMap.export = "True"> (<a href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}&show_wsdl=true</@ofbizUrl>'>${uiLabelMap.WebtoolsShowShowWSDL}</a>)</#if></td> - <td class="label">${uiLabelMap.WebtoolsLocation}:</td> + <td class="label">${uiLabelMap.WebtoolsLocation}</td> <td><a href='<@ofbizUrl>${url}?constraint=location@${selectedServiceMap.location}</@ofbizUrl>'>${selectedServiceMap.location}</a></td> </tr> <tr> <td colspan="2"> </td> - <td class="label">${uiLabelMap.WebtoolsDefaultEntityName}:</td> + <td class="label">${uiLabelMap.WebtoolsDefaultEntityName}</td> <td><a href='<@ofbizUrl>${url}?constraint=default_entity_name@${selectedServiceMap.defaultEntityName}</@ofbizUrl>'>${selectedServiceMap.defaultEntityName}</a></td> </tr> <tr> <td colspan="2"> </td> - <td class="label">${uiLabelMap.WebtoolsRequireNewTransaction}:</td> + <td class="label">${uiLabelMap.WebtoolsRequireNewTransaction}</td> <td>${selectedServiceMap.requireNewTransaction}</td> </tr> <tr> <td colspan="2"> </td> - <td class="label">${uiLabelMap.WebtoolsUseTransaction}:</td> + <td class="label">${uiLabelMap.WebtoolsUseTransaction}</td> <td>${selectedServiceMap.useTrans}</td> </tr> <tr> <td colspan="2"> </td> - <td class="label">${uiLabelMap.WebtoolsMaxRetries}:</td> + <td class="label">${uiLabelMap.WebtoolsMaxRetries}</td> <td>${selectedServiceMap.maxRetry}</td> </tr> </table> @@ -168,19 +168,19 @@ <td colspan="2"><a href='<@ofbizUrl>${url}?sel_service_name=${action.serviceName}</@ofbizUrl>'>${action.serviceName?default(uiLabelMap.CommonNA)}</a></td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsSecasIgnoreError}:</b> ${action.ignoreError?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsSecasIgnoreFailure}:</b> ${action.ignoreFailure?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasIgnoreError}</b> ${action.ignoreError?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasIgnoreFailure}</b> ${action.ignoreFailure?default(uiLabelMap.CommonNA)}</td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsSecasPersist}:</b> ${action.persist?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsSecasResultMapName}:</b> ${action.resultMapName?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasPersist}</b> ${action.persist?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasResultMapName}</b> ${action.resultMapName?default(uiLabelMap.CommonNA)}</td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsSecasResultToContext}:</b> ${action.resultToContext?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsSecasResultToResult}:</b> ${action.resultToResult?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasResultToContext}</b> ${action.resultToContext?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasResultToResult}</b> ${action.resultToResult?default(uiLabelMap.CommonNA)}</td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsSecasServiceMode}:</b> ${action.serviceMode?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsSecasServiceMode}</b> ${action.serviceMode?default(uiLabelMap.CommonNA)}</td> <td colspan="2"> </td> </tr> </table> @@ -192,30 +192,30 @@ <#list ecaMap.conditions as condition> <table class='basic-table' cellspacing='0'> <tr> - <td><b>${uiLabelMap.WebtoolsCompareType}:</b> ${condition.compareType?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsCompareType}</b> ${condition.compareType?default(uiLabelMap.CommonNA)}</td> <td> - <b>${uiLabelMap.WebtoolsConditionService}:</b> + <b>${uiLabelMap.WebtoolsConditionService}</b> <#if condition.conditionService?exists && condition.conditionService?has_content> <a href='<@ofbizUrl>${url}?sel_service_name=${condition.conditionService}</@ofbizUrl>'>${condition.conditionService?default(uiLabelMap.CommonNA)}</a> <#else> ${condition.conditionService?default(uiLabelMap.CommonNA)} </#if> </td> - <td><b>${uiLabelMap.WebtoolsFormat}:</b> ${condition.format?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsFormat}</b> ${condition.format?default(uiLabelMap.CommonNA)}</td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsIsService}:</b> ${condition.isService?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsIsConstant}:</b> ${condition.isConstant?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsOperator}:</b> ${condition.operator?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsIsService}</b> ${condition.isService?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsIsConstant}</b> ${condition.isConstant?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsOperator}</b> ${condition.operator?default(uiLabelMap.CommonNA)}</td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsLHSMapName}:</b> ${condition.lhsMapName?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsLHSValueName}:</b> ${condition.lhsValueName?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsLHSMapName}</b> ${condition.lhsMapName?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsLHSValueName}</b> ${condition.lhsValueName?default(uiLabelMap.CommonNA)}</td> <td> </td> </tr> <tr> - <td><b>${uiLabelMap.WebtoolsRHSMapName}:</b> ${condition.rhsMapName?default(uiLabelMap.CommonNA)}</td> - <td><b>${uiLabelMap.WebtoolsRHSValueName}:</b> ${condition.rhsValueName?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsRHSMapName}</b> ${condition.rhsMapName?default(uiLabelMap.CommonNA)}</td> + <td><b>${uiLabelMap.WebtoolsRHSValueName}</b> ${condition.rhsValueName?default(uiLabelMap.CommonNA)}</td> <td> </td> </tr> </table><br/> @@ -339,4 +339,4 @@ <#else> ${uiLabelMap.WebtoolsNoServicesFound}. <a href='<@ofbizUrl>${url}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonListAll}</a> -</#if> +</#if> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |