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?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Fri Mar 30 23:51:14 2007 @@ -24,398 +24,298 @@ <#-- Selected Service is available --> <#if selectedServiceMap?exists> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td align='left'><div class='boxhead'> - ${uiLabelMap.WebtoolsService}: ${selectedServiceMap.serviceName}</div> - </td> - <td align='right'> - <a href='<@ofbizUrl>/scheduleJob?SERVICE_NAME=${selectedServiceMap.serviceName}</@ofbizUrl>' class='submenutext'>${uiLabelMap.WebtoolsSchedule}</a> - <a href='<@ofbizUrl>${url}</@ofbizUrl>' class='submenutextright'>${uiLabelMap.CommonListAll}</a> - </td> - </tr> - </table> - - <#if showWsdl?exists && showWsdl = true> - <br> - <table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td><div class='boxhead'>${uiLabelMap.WebtoolsServiceWSDL}</div></td> - </tr> + <#if showWsdl?exists && showWsdl = true> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <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> + <br /> + <a href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}</@ofbizUrl>' class='smallSubmit'>${uiLabelMap.CommonBack}</a> + </div> + </div> + <#else> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.WebtoolsService}: ${selectedServiceMap.serviceName}</h3> + <li><a href='<@ofbizUrl>${url}</@ofbizUrl>'>${uiLabelMap.CommonListAll}</a></li> + <li><a href='<@ofbizUrl>/scheduleJob?SERVICE_NAME=${selectedServiceMap.serviceName}</@ofbizUrl>'>${uiLabelMap.WebtoolsSchedule}</a></li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing='0'> + <tr> + <td class="label">${uiLabelMap.WebtoolsServiceName}:</td> + <td>${selectedServiceMap.serviceName}</td> + <td class="label">${uiLabelMap.WebtoolsEngineName}:</td> + <td><a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>'>${selectedServiceMap.engineName}</a></td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonDescription}:</td> + <td>${selectedServiceMap.description}</td> + <td class="label">${uiLabelMap.WebtoolsInvoke}:</td> + <td>${selectedServiceMap.invoke}</td> + </tr> + <tr> + <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><a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>'>${selectedServiceMap.location}</a></td> + </tr> + <tr> + <td colspan="2"> </td> + <td class="label">${uiLabelMap.WebtoolsDefaultEntityName}:</td> + <td><a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>'>${selectedServiceMap.defaultEntityName}</a></td> + </tr> + <tr> + <td colspan="2"> </td> + <td class="label">${uiLabelMap.WebtoolsRequireNewTransaction}:</td> + <td>${selectedServiceMap.requireNewTransaction}</td> + </tr> + <tr> + <td colspan="2"> </td> + <td class="label">${uiLabelMap.WebtoolsUseTransaction}:</td> + <td>${selectedServiceMap.useTrans}</td> + </tr> + <tr> + <td colspan="2"> </td> + <td class="label">${uiLabelMap.WebtoolsMaxRetries}:</td> + <td>${selectedServiceMap.maxRetry}</td> + </tr> </table> - <table border=0 width='100%' cellspacing='0' cellpadding='5' class='boxoutside'> - <tr> - <td align="center"><form><textarea class="textAreaBox" rows="20" cols="85" name="wsdloutput">${selectedServiceMap.wsdl}</textarea></form></td> - </tr> + </div> + </div> + + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PartySecurityGroups}</h3> + </div> + <#if selectedServiceMap.permissionGroups != 'NA'> + <table class="basic-table" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsNameOrRole}</td> + <td>${uiLabelMap.WebtoolsPermissionType}</td> + <td>${uiLabelMap.WebtoolsAction}</td> + </tr> + <#list selectedServiceMap.permissionGroups as permGrp> <tr> - <td align="center"><a href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}</@ofbizUrl>' class='linktext'>${uiLabelMap.CommonBack}</a></td> + <td>${permGrp.nameOrRole?default("NA")}</td> + <td>${permGrp.permType?default("NA")}</td> + <td>${permGrp.action?default("NA")}</td> </tr> + </#list> </table> - <#else> + <#else> + <div class="screenlet-body"> + <b>${selectedServiceMap.permissionGroups}</b> + </div> + </#if> + </div> - - <table border=0 width='100%' cellspacing='5' cellpadding='5' class='tabletext'> - <tr> - <td width='10%'> </td> - <td align='left' valign='top'><br> - <b>${uiLabelMap.WebtoolsServiceName}:</b> ${selectedServiceMap.serviceName}<br> - <b>${uiLabelMap.CommonDescription}:</b> ${selectedServiceMap.description}<br> - <b>${uiLabelMap.WebtoolsExportable}:</b> ${selectedServiceMap.export}<#if selectedServiceMap.export = "True"> (<a href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}&show_wsdl=true</@ofbizUrl>' class='linktext'>${uiLabelMap.WebtoolsShowShowWSDL}</a>)</#if><br> - <td width='10' align='left'> </td> - <td align='left' valign='top'><br> - <b>${uiLabelMap.WebtoolsEngineName}:</b> <a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>' class='linktext'>${selectedServiceMap.engineName}</a><br> - <b>${uiLabelMap.WebtoolsInvoke}:</b> ${selectedServiceMap.invoke}<br> - <b>${uiLabelMap.WebtoolsLocation}:</b> </b><a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>' class='linktext'>${selectedServiceMap.location}</a><br> - <b>${uiLabelMap.WebtoolsDefaultEntityName}:</b> <a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>' class='linktext'>${selectedServiceMap.defaultEntityName}</a><br> - <b>${uiLabelMap.WebtoolsRequireNewTransaction}:</b> ${selectedServiceMap.requireNewTransaction}<br> - <b>${uiLabelMap.WebtoolsUseTransaction}:</b> ${selectedServiceMap.useTrans}<br> - <b>${uiLabelMap.WebtoolsMaxRetries}:</b> ${selectedServiceMap.maxRetry} - </td> - </tr> - </table> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsImplementedServices}</h3> + </div> + <div class="screenlet-body"> + <#if selectedServiceMap.implServices == 'NA'> + <b>${selectedServiceMap.implServices}</b> + <#elseif selectedServiceMap.implServices?has_content> + <#list selectedServiceMap.implServices as implSrv> + <a href='<@ofbizUrl>${url}?sel_service_name=${implSrv}</@ofbizUrl>'>${implSrv}</a><br> + </#list> + </#if> + </div> + </div> - <table border=0 width='100%' cellspacing='5' cellpadding='1'> - <tr> - <#-- Permission Groups --> - <td valign='top' width='50%'> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td class='tabletext'><div class='boxhead'>${uiLabelMap.PartySecurityGroups}</div></td> - </tr> - </table> - <table border=0 width='100%' cellspacing='5' cellpadding='1' class='boxoutside'> - <tr> - <td class='tabletext'> - <#if selectedServiceMap.permissionGroups!='NA'> - <table border=0 width='100%' cellspacing='5' cellpadding='1'> - <tr> - <td class='tableheadtext'>${uiLabelMap.WebtoolsNameOrRole}</td> - <td class='tableheadtext'>${uiLabelMap.WebtoolsPermissionType}</td> - <td class='tableheadtext'>${uiLabelMap.WebtoolsAction}</td> - </tr> - <tr> - <td class='sepbar' colspan='3'><hr class='sepbar'></td> - </tr> - <#list selectedServiceMap.permissionGroups as permGrp> - <tr> - <td class='tabletext'>${permGrp.nameOrRole?default("NA")}</b></td> - <td class='tabletext'>${permGrp.permType?default("NA")}</td> - <td class='tabletext'>${permGrp.action?default("NA")}</td> - </tr> - </#list> - </table> - <#else> - <b>${selectedServiceMap.permissionGroups}</b> - </#if> - </td> - </tr> - </table> - </td> - <#-- Impl Services --> - <td valign='top' width='50%'> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td class='tabletext'><div class='boxhead'>${uiLabelMap.WebtoolsImplementedServices}</div></td> - </tr> - </table> - <table border=0 width='100%' cellspacing='5' cellpadding='1' class='boxoutside'> - <tr> - <td class='tabletext'> - <#if selectedServiceMap.implServices=='NA'> - <b>${selectedServiceMap.implServices}</b> - <#elseif selectedServiceMap.implServices?has_content> - <#list selectedServiceMap.implServices as implSrv> - <a href='<@ofbizUrl>${url}?sel_service_name=${implSrv}</@ofbizUrl>' class='linktext'>${implSrv}</a><br> - </#list> - </#if> - </td> - </tr> - </table> - </td> - </tr> - </table> - <!-- If service has ECA's --> + <#-- If service has ECA's --> <#if ecaMapList?exists && ecaMapList?has_content> - <#-- add the javascript for modalpopup's --> - <script language='javascript' type='text/javascript'> - function detailsPopup(viewName){ - var lookupWinSettings = 'top=50,left=50,width=600,height=300,scrollbars=auto,status=no,resizable=no,dependent=yes,alwaysRaised=yes'; - var params = ''; - var lookupWin = window.open(viewName, params, lookupWinSettings); - if(lookupWin.opener == null) lookupWin.opener = self; - lookupWin.focus(); - } - </script> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxtop'> + <#-- add the javascript for modalpopup's --> + <script language='javascript' type='text/javascript'> + function detailsPopup(viewName){ + var lookupWinSettings = 'top=50,left=50,width=600,height=300,scrollbars=auto,status=no,resizable=no,dependent=yes,alwaysRaised=yes'; + var params = ''; + var lookupWin = window.open(viewName, params, lookupWinSettings); + if(lookupWin.opener == null) lookupWin.opener = self; + lookupWin.focus(); + } + </script> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsServiceECA}</h3> + </div> + <table class="basic-table" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsEventName}</td> + <td>${uiLabelMap.WebtoolsRunOnError}</td> + <td>${uiLabelMap.WebtoolsRunOnFailure}</td> + <td>${uiLabelMap.WebtoolsActions}</td> + <td>${uiLabelMap.WebtoolsConditions}</td> + </tr> + <#list ecaMapList as ecaMap> <tr> - <td><div class='boxhead'>${uiLabelMap.WebtoolsServiceECA}</div></td> - </tr> - </table> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td width='50%' align='left'> - <table border=0 width='100%' cellspacing='0' cellpadding='2'> - <tr> - <td align='left' valign='top'><div class='tableheadtext'>${uiLabelMap.WebtoolsEventName}</div></td> - <td align='left' valign='top'><div class='tableheadtext'>${uiLabelMap.WebtoolsRunOnError}</div></td> - <td align='left' valign='top'><div class='tableheadtext'>${uiLabelMap.WebtoolsRunOnFailure}</div></td> - <td align='left' valign='top'><div class='tableheadtext'>${uiLabelMap.WebtoolsActions}</div></td> - <td align='left' valign='top'><div class='tableheadtext'>${uiLabelMap.WebtoolsConditions}</div></td> - </tr> - <tr><td colspan='5'><hr class='sepbar'></td></tr> - <#list ecaMapList as ecaMap> - <tr> - <td align='left' valign='top'><div class='tableheadtext'>${ecaMap.eventName?if_exists}</div></td> - <td align='left' valign='top'><div class='tableheadtext'>${ecaMap.runOnError?if_exists}</div></td> - <td align='left' valign='top'><div class='tableheadtext'>${ecaMap.runOnFailure?if_exists}</div></td> - <td align='left' valign='top'> - <#if ecaMap.actions?exists && ecaMap.actions?has_content> - <#list ecaMap.actions as action> - <a href='<@ofbizUrl>${url}?sel_service_name=${action.serviceName}</@ofbizUrl>' class='linktext'>${action.serviceName?default("NA")}</a> - <a href='javascript:detailsPopup("<@ofbizUrl>${popupUrl}?detail_type=action&prt_srv=${selectedServiceMap.serviceName}<#if ecaMap.eventName?exists>&prt_evt_name=${ecaMap.eventName}</#if><#if ecaMap.runOnError?exists>&prt_run_on_err=${ecaMap.runOnError}</#if><#if ecaMap.runOnFailure?exists>&prt_run_on_fail=${ecaMap.runOnFailure}</#if>&acx_srv=${action.serviceName}<#if action.eventName?exists>&acx_evt_name=${action.eventName}</#if><#if action.ignoreError?exists>&acx_ig_err=${action.ignoreError}</#if><#if action.ignoreFailure?exists>&acx_ig_fail=${action.ignoreFailure}</#if><#if action.persist?exists>&acx_pers=${action.persist}</#if><#if action.resultToContext?exists>&acx_res_to_ctx=${action.resultToContext}</#if><#if action.serviceMode?exists>&acx_srv_mode=${action.serviceMode}</#if><#if action.resultMapName?exists>&acx_res_map_name=${action.resultMapName}</#if></@ofbizUrl>")' class='linktext'> - [${uiLabelMap.CommonDetail}] - </a> - </#list> - </#if> - </td> - <td valign='top'> - <#if ecaMap.conditions?exists && ecaMap.conditions?has_content> - <#list ecaMap.conditions as condition> - <table class='boxoutside' width='100%'> - <tr> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsCompareType}:</b> ${condition.compareType?default("NA")} - </td> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsConditionService}:</b> - <#if condition.conditionService?exists && condition.conditionService?has_content> - <a href='<@ofbizUrl>${url}?sel_service_name=${condition.conditionService}</@ofbizUrl>' class='linktext'>${condition.conditionService?default("NA")}</a> - <#else> - ${condition.conditionService?default("NA")} - </#if> - </td> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsFormat}:</b> ${condition.format?default("NA")} - </td> - </tr> - <tr> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsIsService}:</b> ${condition.isService?default("NA")} - </td> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsIsConstant}:</b> ${condition.isConstant?default("NA")} - </td> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsOperator}:</b> ${condition.operator?default("NA")} - </td> - </tr> - <tr> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsLHSMapName}:</b> ${condition.lhsMapName?default("NA")} - </td> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsLHSValueName}:</b> ${condition.lhsValueName?default("NA")} - </td> - <td></td> - </tr> - <tr> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsRHSMapName}:</b> ${condition.rhsMapName?default("NA")} - </td> - <td class='tabletext'> - <b>${uiLabelMap.WebtoolsRHSValueName}:</b> ${condition.rhsValueName?default("NA")} - </td> - <td></td> - </tr> - </table><br> - </#list> - </#if> - </td> - </tr> - <tr><td colspan='5'><hr class='sepbar'></td></tr> - </#list> - </table> - </td> + <td>${ecaMap.eventName?if_exists}</td> + <td>${ecaMap.runOnError?if_exists}</div></td> + <td>${ecaMap.runOnFailure?if_exists}</div></td> + <td> + <#if ecaMap.actions?exists && ecaMap.actions?has_content> + <#list ecaMap.actions as action> + <a href='<@ofbizUrl>${url}?sel_service_name=${action.serviceName}</@ofbizUrl>'>${action.serviceName?default("NA")}</a> + <a href='javascript:detailsPopup("<@ofbizUrl>${popupUrl}?detail_type=action&prt_srv=${selectedServiceMap.serviceName}<#if ecaMap.eventName?exists>&prt_evt_name=${ecaMap.eventName}</#if><#if ecaMap.runOnError?exists>&prt_run_on_err=${ecaMap.runOnError}</#if><#if ecaMap.runOnFailure?exists>&prt_run_on_fail=${ecaMap.runOnFailure}</#if>&acx_srv=${action.serviceName}<#if action.eventName?exists>&acx_evt_name=${action.eventName}</#if><#if action.ignoreError?exists>&acx_ig_err=${action.ignoreError}</#if><#if action.ignoreFailure?exists>&acx_ig_fail=${action.ignoreFailure}</#if><#if action.persist?exists>&acx_pers=${action.persist}</#if><#if action.resultToContext?exists>&acx_res_to_ctx=${action.resultToContext}</#if><#if action.serviceMode?exists>&acx_srv_mode=${action.serviceMode}</#if><#if action.resultMapName?exists>&acx_res_map_name=${action.resultMapName}</#if></@ofbizUrl>")'> + [${uiLabelMap.CommonDetail}]</a> + </#list> + </#if> + </td> + <td> + <#if ecaMap.conditions?exists && ecaMap.conditions?has_content> + <#list ecaMap.conditions as condition> + <table class='basic-table' cellspacing='0'> + <tr> + <td><b>${uiLabelMap.WebtoolsCompareType}:</b> ${condition.compareType?default("NA")}</td> + <td> + <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("NA")}</a> + <#else> + ${condition.conditionService?default("NA")} + </#if> + </td> + <td><b>${uiLabelMap.WebtoolsFormat}:</b> ${condition.format?default("NA")}</td> + </tr> + <tr> + <td><b>${uiLabelMap.WebtoolsIsService}:</b> ${condition.isService?default("NA")}</td> + <td><b>${uiLabelMap.WebtoolsIsConstant}:</b> ${condition.isConstant?default("NA")}</td> + <td><b>${uiLabelMap.WebtoolsOperator}:</b> ${condition.operator?default("NA")}</td> + </tr> + <tr> + <td><b>${uiLabelMap.WebtoolsLHSMapName}:</b> ${condition.lhsMapName?default("NA")}</td> + <td><b>${uiLabelMap.WebtoolsLHSValueName}:</b> ${condition.lhsValueName?default("NA")}</td> + <td> </td> + </tr> + <tr> + <td><b>${uiLabelMap.WebtoolsRHSMapName}:</b> ${condition.rhsMapName?default("NA")}</td> + <td><b>${uiLabelMap.WebtoolsRHSValueName}:</b> ${condition.rhsValueName?default("NA")}</td> + <td> </td> + </tr> + </table><br/> + </#list> + </#if> + </td> </tr> + <tr><td colspan='5'><hr></td></tr> + </#list> </table> - <br> + </div> </#if> - <!-- End if service has ECA's --> + <#-- End if service has ECA's --> <#list selectedServiceMap.allParamsList?if_exists as paramList> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td><div class='boxhead'>${paramList.title}</div></td> - </tr> - </table> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td width='50%' align='left'> - <table border=0 width='100%' cellspacing='0' cellpadding='2'> - <#if paramList.paramList?exists && paramList.paramList?has_content> - <tr> - <td align='left'><div class='tableheadtext'>${uiLabelMap.WebtoolsParameterName}</div></td> - <td align='left'><div class='tableheadtext'>${uiLabelMap.WebtoolsOptional}</div></td> - <td align='left'><div class='tableheadtext'>${uiLabelMap.CommonType}</div></td> - <td align='left'><div class='tableheadtext'>${uiLabelMap.WebtoolsMode}</div></td> - <td align='left'><div class='tableheadtext'>${uiLabelMap.WebtoolsIsSetInternally}</div></td> - <td align='left'><div class='tableheadtext'>${uiLabelMap.WebtoolsEntityName}</div></td> - <td align='left'><div class='tableheadtext'>${uiLabelMap.WebtoolsFieldName}</div></td> - <tr> - <tr> - <td align='left' colspan='7'><hr class='sepbar'></td> - </tr> - <#list paramList.paramList as params> - <tr> - <td align='left'><div class='tabletext'>${params.name?if_exists}</div></td> - <td align='left'><div class='tabletext'>${params.optional?if_exists}</div></td> - <td align='left'><div class='tabletext'>${params.type?if_exists}</div></td> - <td align='left'><div class='tabletext'>${params.mode?if_exists}</div></td> - <td align='left'><div class='tabletext'>${params.internal?if_exists}</div></td> - <td align='left'> - <#if params.entityName?exists> - <a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>' class='linktext'>${params.entityName?if_exists}</a> - </#if> - </td> - <td align='left'><div class='tabletext'>${params.fieldName?if_exists}</div></td> - </tr> - </#list> - <#else> - ${uiLabelMap.WebtoolsNoParametersDefined} - </#if> - </table> - </td> - </tr> - </table> - <br> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${paramList.title}</h3> + </div> + <#if paramList.paramList?exists && paramList.paramList?has_content> + <table class="basic-table" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsParameterName}</td> + <td>${uiLabelMap.WebtoolsOptional}</td> + <td>${uiLabelMap.CommonType}</td> + <td>${uiLabelMap.WebtoolsMode}</td> + <td>${uiLabelMap.WebtoolsIsSetInternally}</td> + <td>${uiLabelMap.WebtoolsEntityName}</td> + <td>${uiLabelMap.WebtoolsFieldName}</td> + </tr> + <#list paramList.paramList as params> + <tr> + <td>${params.name?if_exists}</td> + <td>${params.optional?if_exists}</td> + <td>${params.type?if_exists}</td> + <td>${params.mode?if_exists}</td> + <td>${params.internal?if_exists}</td> + <td> + <#if params.entityName?exists> + <a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>'>${params.entityName?if_exists}</a> + </#if> + </td> + <td>${params.fieldName?if_exists}</td> + </tr> + </#list> + </table> + <#else> + <div class="screenlet-body"> + ${uiLabelMap.WebtoolsNoParametersDefined} + </div> + </#if> + </div> </#list> - </#if> - + </#if> <#-- No Service selected , we list all--> <#elseif servicesList?exists && servicesList?has_content> - <#-- Show alphabetical index --> - <#if serviceNamesAlphaList?exists && serviceNamesAlphaList?has_content> - <table border='0' width='100%' cellspacing='0' cellpadding='0'> - <tr> - <td align='center'> - <#if dispArrList?exists && dispArrList?has_content> - <script language='javascript' type='text/javascript'> - function submitDispForm(){ - selObj = document.getElementById('sd'); - var dispVar = selObj.options[selObj.selectedIndex].value; - if(dispVar != ''){ - document.getElementById('dispForm').submit(); - } - } - </script> - <form id='dispForm' method='post' action='<@ofbizUrl>${url}</@ofbizUrl>'> - </#if> - <#assign isfirst=true> - <#list serviceNamesAlphaList as alpha> - <#if !isfirst> - | - </#if> - <a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>' class='linktext'>${alpha}</a> - <#assign isfirst=false> - </#list> - - <#if dispArrList?exists && dispArrList?has_content> - <select id='sd' name='selDisp' onChange='submitDispForm();' class='selectBox'> - <option value='' selected>${uiLabelMap.WebtoolsSelectDispatcher}</option> - <option value='' ></option> - <#list dispArrList as disp> - <option value='${disp}'>${disp}</option> - </#list> - </select> - </form> - </#if> - </td> - </tr> - </table> - </#if> - -<br> - - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td align='left'><div class='boxhead'> - ${uiLabelMap.WebtoolsServicesListFor} ${dispatcherName?default("NA")}(${servicesFoundCount} ${uiLabelMap.CommonFound})</div> - </td> - <td align='right'> - <a href='<@ofbizUrl>${url}</@ofbizUrl>' class='submenutextright'>${uiLabelMap.CommonListAll}</a> - </td> - </tr> - </table> - - <#assign rowClass='viewManyTR1'> - <table border=0 width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td align='left'><div class='tableheadtext'> - ${uiLabelMap.WebtoolsServiceName}</div> - </td> - <td> </td> - <td align='left'><div class='tableheadtext'> - ${uiLabelMap.WebtoolsEngineName}</div> - </td> - <td> </td> - <td align='left'><div class='tableheadtext'> - ${uiLabelMap.WebtoolsDefaultEntityName}</div> - </td> - <td> </td> - <td align='left'><div class='tableheadtext'> - ${uiLabelMap.WebtoolsInvoke}</div> - </td> - <td> </td> - <td align='left'><div class='tableheadtext'> - ${uiLabelMap.WebtoolsLocation}</div> - </td> - </tr> + <#-- Show alphabetical index --> + <#if serviceNamesAlphaList?exists && serviceNamesAlphaList?has_content> + <form id='dispForm' method='post' action='<@ofbizUrl>${url}</@ofbizUrl>'> + <div class="button-bar"> + <#assign isfirst=true> + <#list serviceNamesAlphaList as alpha> + <#if !isfirst> + | + </#if> + <a href='<@ofbizUrl>[EMAIL PROTECTED]</@ofbizUrl>'>${alpha}</a> + <#assign isfirst=false> + </#list> + <#if dispArrList?exists && dispArrList?has_content> + + <script language='javascript' type='text/javascript'> + function submitDispForm(){ + selObj = document.getElementById('sd'); + var dispVar = selObj.options[selObj.selectedIndex].value; + if(dispVar != ''){ + document.getElementById('dispForm').submit(); + } + } + </script> + <select id='sd' name='selDisp' onChange='submitDispForm();'> + <option value='' selected="selected">${uiLabelMap.WebtoolsSelectDispatcher}</option> + <option value='' ></option> + <#list dispArrList as disp> + <option value='${disp}'>${disp}</option> + </#list> + </select> + </#if> + </div> + </form> + <br /> + </#if> - <tr> - <td align='left' colspan='9'> - <hr class='sepbar'> - </td> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsServicesListFor} ${dispatcherName?default("NA")} (${servicesFoundCount} ${uiLabelMap.CommonFound})</h3> + </div> + <table class="basic-table hover-bar" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsServiceName}</td> + <td>${uiLabelMap.WebtoolsEngineName}</td> + <td>${uiLabelMap.WebtoolsDefaultEntityName}</td> + <td>${uiLabelMap.WebtoolsInvoke}</td> + <td>${uiLabelMap.WebtoolsLocation}</td> + </tr> + <#assign alt_row = false> + <#list servicesList as service> + <tr<#if alt_row> class="alternate-row"</#if>> + <td><a href='<@ofbizUrl>${url}?sel_service_name=${service.serviceName}</@ofbizUrl>'>${service.serviceName}</a></td> + <td><a href='<@ofbizUrl>[EMAIL PROTECTED]("NA")}</@ofbizUrl>'>${service.engineName}</a></td> + <td><a href='<@ofbizUrl>[EMAIL PROTECTED]("NA")}</@ofbizUrl>'>${service.defaultEntityName}</a></td> + <td>${service.invoke}</td> + <td><a href='<@ofbizUrl>[EMAIL PROTECTED]("NA")}</@ofbizUrl>'>${service.location}</a></td> </tr> - - <#list servicesList as service> - <tr class='${rowClass}'> - <td align='left'> - <a href='<@ofbizUrl>${url}?sel_service_name=${service.serviceName}</@ofbizUrl>' class='linktext'>${service.serviceName}</a> - </td> - <td> </td> - <td align='left'> - <a href='<@ofbizUrl>[EMAIL PROTECTED]("NA")}</@ofbizUrl>' class='linktext'>${service.engineName}</a> - </td> - <td> </td> - <td align='left'> - <a href='<@ofbizUrl>[EMAIL PROTECTED]("NA")}</@ofbizUrl>' class='linktext'>${service.defaultEntityName}</a> - </td> - <td> </td> - <td align='left'> - <div class='tabletext'>${service.invoke}</div> - </td> - <td> </td> - <td align='left'> - <a href='<@ofbizUrl>[EMAIL PROTECTED]("NA")}</@ofbizUrl>' class='linktext'>${service.location} - </td> - </tr> - <#if rowClass=='viewManyTR1'> - <#assign rowClass='viewManyTR2'> - <#else> - <#assign rowClass='viewManyTR1'> - </#if> - </#list> + <#assign alt_row = !alt_row> + </#list> </table> + </div> <#else> - <table border=0 width='100%' cellspacing='2' cellpadding='5' class='boxoutside'> - <tr> - <td align='left' class='tableheadtext'> - ${uiLabelMap.WebtoolsNoServicesFound}... - <td> - <td align='right'> - <a href='<@ofbizUrl>${url}</@ofbizUrl>' class='linktext'>${uiLabelMap.CommonListAll}</a> - </td> - </tr> - </table> + ${uiLabelMap.WebtoolsNoServicesFound}. + <a href='<@ofbizUrl>${url}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonListAll}</a> </#if>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl Fri Mar 30 23:51:14 2007 @@ -32,9 +32,9 @@ <td>${uiLabelMap.CommonEndDateTime}</td> <td> </td> </tr> - <#assign rowNum = "2"> + <#assign alt_row = false> <#list jobs as job> - <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <tr<#if alt_row> class="alternate-row"</#if>> <td>${job.jobName?if_exists} </td> <td>${job.jobId?if_exists} </td> <td>${job.poolId?if_exists} </td> @@ -53,11 +53,7 @@ </#if> </td> </tr> - <#if rowNum == "2"> - <#assign rowNum = "1"> - <#else> - <#assign rowNum = "2"> - </#if> + <#assign alt_row = !alt_row> </#list> </table> </div> 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?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl Fri Mar 30 23:51:14 2007 @@ -18,28 +18,28 @@ --> <form method="post" action="<@ofbizUrl>saveServiceResultsToSession</@ofbizUrl>" -<table cellpadding="2" cellspacing="0" border="1" width="100%"> - <tr> - <td><div class="tableheadtext">parameter</div></td> - <td><div class="tableheadtext">value</div></td> - <td><div class="tableheadtext">save value?</div></td> +<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> + <tr> <#if srl.hasChild=="Y"> - <td><div class="tabletext"><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></div></td> + <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><div class="tabletext">${srl.key?if_exists}</div></td> + <td>${srl.key?if_exists}</td> </#if> - <td><div class="tabletext">${srl.value?if_exists}</div></td> - <td><div class="tabletext"><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></div></td> - </tr> + <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><div class="tabletext"> </div></td> - <td><div class="tabletext">Clear previous params? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></div></td> - <td><div class="tabletext"><input type="submit" value="submit" /></div></td> + <td> </td> + <td>Clear previous params? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></td> + <td><input type="submit" value="submit" /></td> </tr> </table> 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?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl Fri Mar 30 23:51:14 2007 @@ -19,22 +19,22 @@ <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 border="0"> + <table class="basic-table" cellspacing="0"> <#list serviceParameters as serviceParameter> <tr> - <td align="right"><div class="tabletext">${serviceParameter.name} (${serviceParameter.type})</div></td> + <td class="label">${serviceParameter.name} (${serviceParameter.type})</td> <td> - <input type="text" class="inputBox" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" /> - <span class="tabletext"><#if serviceParameter.optional == "N">(required)<#else>(optional)</#if></span> + <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" /> + <#if serviceParameter.optional == "N">(required)<#else>(optional)</#if> </td> </tr> </#list> <tr> - <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonSubmit}"></td> + <td colspan="2" align="center"><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> </tr> </table> </form> 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?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl Fri Mar 30 23:51:14 2007 @@ -17,7 +17,6 @@ under the License. --> -<!-- begin StatsBinsHistory.ftl --> <h1>${uiLabelMap.WebtoolsStatsBinsPageTitle}</h1> <br /> <div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsMainPageTitle}</a> 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?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl Fri Mar 30 23:51:14 2007 @@ -17,7 +17,6 @@ under the License. --> -<!-- begin StatsSinceStart.ftl --> <h1>${uiLabelMap.WebtoolsStatsMainPageTitle}</h1> <br /> <div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart?clear=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsStatsClearSince}</a> Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml Fri Mar 30 23:51:14 2007 @@ -21,7 +21,6 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd";> <form name="EntitySyncStatus" type="list" list-name="entitySyncList" target="" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" paginate-target="EntitySyncStatus" view-size="20"> <actions> <entity-condition entity-name="EntitySync" list-name="entitySyncList" use-cache="false"> @@ -51,8 +50,7 @@ </form> <form name="EntitySyncLoadOffline" type="single" target="loadOfflineEntitySyncData" title="" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"> <auto-fields-service service-name="loadOfflineEntitySyncData"/> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> </forms> Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Fri Mar 30 23:51:14 2007 @@ -79,8 +79,8 @@ <link target="LogView" text="${uiLabelMap.CommonRefresh}" style="buttontext"/> </container> <container> - <label style="tableheadtext">${uiLabelMap.WebtoolsLogFileName}:</label> - <label style="tabletext">${logFileName}</label> + <label style="label">${uiLabelMap.WebtoolsLogFileName}:</label> + <label>${logFileName}</label> </container> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/log/logContent.ftl"/></html> Modified: ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml (original) +++ ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml Fri Mar 30 23:51:14 2007 @@ -21,9 +21,8 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd";> - <menu name="WebtoolsAppBar" default-menu-item-name="main" default-selected-style="headerButtonLeftSelected" selected-menuitem-context-field-name="appButtonItem" - default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="headerButtonLeft" - default-align-style="col" menu-container-style="row" fill-style="col-fill" orientation="horizontal" type="simple"> + <menu name="WebtoolsAppBar" default-menu-item-name="main" default-selected-style="selected" selected-menuitem-context-field-name="appButtonItem" + menu-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>
