Author: mrisaliti
Date: Fri Jan 25 13:57:56 2008 New Revision: 615366 URL: http://svn.apache.org/viewvc?rev=615366&view=rev Log: Find/Request/WorkEffort forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1596) Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Fri Jan 25 13:57:56 2008 @@ -232,6 +232,7 @@ WorkEffortKeywordAnyWordMatches=any word matches WorkEffortKeywords=Keywords WorkEffortKeywordWhere=where +WorkEffortLastUpdatedDateFilter=Last Updated Date Filter WorkEffortLastModified=Last Modified WorkEffortLocation=Location WorkEffortLookup=Lookup Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties Fri Jan 25 13:57:56 2008 @@ -229,6 +229,7 @@ WorkEffortKeywordAnyWordMatches=qualciasi parola corrispondente WorkEffortKeywords=Chiavi WorkEffortKeywordWhere=dove +WorkEffortLastUpdatedDateFilter=Ultima Data Aggiornamento Filtro WorkEffortLastModified=Ultima Modifica WorkEffortLocation=Posizione WorkEffortLookup=Ricerca Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Fri Jan 25 13:57:56 2008 @@ -16,173 +16,155 @@ specific language governing permissions and limitations under the License. --> -<h1>${uiLabelMap.ProductAdvancedSearch}</h1> -<br/> -<form name="advToKeyWordSearchForm" method="post" action="<@ofbizUrl>WorkEffortSearchResults</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="VIEW_SIZE" value="25"/> - <table border="0" wdith="100%"> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.WorkEffortKeywords}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <input type="text" class="inputBox" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/> - ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>/> - ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>/> - </div> - </td> - </tr> - - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.WorkEffortReviews}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <input type="text" class="inputBox" name="SEARCH_STRING_REVIEW_TEXT" size="40" value="${requestParameters.SEARCH_STRING_REVIEW_TEXT?if_exists}"/> - </div> - </td> - </tr> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.FormFieldTitle_workEffortId}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <input type="text" class="inputBox" name="SEARCH_WORK_EFFORT_ID" size="40" value="${requestParameters.SEARCH_WORK_EFFORT_ID?if_exists}"/> - <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.SEARCH_WORK_EFFORT_ID,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - </div> - </td> - </tr> - <tr> - <td align="right" valign="middle" nowrap> - <div class="tabletext">${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}:</div> - </td> - <td valign="middle" nowrap> - <div class="tabletext"> - <select class="selectBox" name="workEffortAssocTypeId"> - <option value="">- ${uiLabelMap.WorkEffortAnyAssocType} -</option> - <#list workEffortAssocTypes as workEffortAssocType> - <option value="${workEffortAssocType.workEffortAssocTypeId}">${workEffortAssocType.description}</option> - </#list> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductAdvancedSearch}</h3> + </div> + <div class="screenlet-body"> + <form name="advToKeyWordSearchForm" method="post" action="<@ofbizUrl>WorkEffortSearchResults</@ofbizUrl>" style="margin: 0;"> + <input type="hidden" name="VIEW_SIZE" value="25"/> + <table class="basic-table" cellspacing="0"> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortKeywords}</td> + <td valign="middle"> + <div> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/> + ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>/> + ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>/> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortReviews}</td> + <td valign="middle"> + <div> + <input type="text" name="SEARCH_STRING_REVIEW_TEXT" size="40" value="${requestParameters.SEARCH_STRING_REVIEW_TEXT?if_exists}"/> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.FormFieldTitle_workEffortId}</td> + <td valign="middle"> + <div> + <input type="text" name="SEARCH_WORK_EFFORT_ID" size="40" value="${requestParameters.SEARCH_WORK_EFFORT_ID?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.SEARCH_WORK_EFFORT_ID,'LookupWorkEffort');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" nowrap class="label">${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}</td> + <td valign="middle" nowrap> + <div> + <select name="workEffortAssocTypeId"> + <option value="">- ${uiLabelMap.WorkEffortAnyAssocType} -</option> + <#list workEffortAssocTypes as workEffortAssocType> + <option value="${workEffortAssocType.workEffortAssocTypeId}">${workEffortAssocType.description}</option> + </#list> + </select> + ${uiLabelMap.WorkEffortIncludeAllSubWorkEfforts}? + ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_WORK_EFFORTS" value="Y" checked/> + ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_WORK_EFFORTS" value="N"/> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.PartyPartyId}</td> + <td valign="middle"> + <div> + <input type="text" name="partyId" size="40" value="${requestParameters.partyId?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.PartyRoleTypeId}</td> + <td valign="middle"> + <div> + <select name="partyRoleTypeId"> + <option value="">- ${uiLabelMap.CommonAnyRoleType} -</option> + <#list roleTypes as roleType> + <option value="${roleType.roleTypeId}">${roleType.description}</option> + </#list> </select> - ${uiLabelMap.WorkEffortIncludeAllSubWorkEfforts}? - ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_WORK_EFFORTS" value="Y" checked/> - ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_WORK_EFFORTS" value="N"/> - </div> - </td> - </tr> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.PartyPartyId}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <input type="text" class="inputBox" name="partyId" size="40" value="${requestParameters.partyId?if_exists}"/> - <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - </div> - </td> - </tr> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.PartyRoleTypeId}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <select class="selectBox" name="partyRoleTypeId"> - <option value="">- ${uiLabelMap.CommonAnyRoleType} -</option> - <#list roleTypes as roleType> - <option value="${roleType.roleTypeId}">${roleType.description}</option> - </#list> - </select> - </div> - </td> - </tr> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.WorkEffortProductId1}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <input type="text" class="inputBox" name="productId_1" size="40" value="${requestParameters.productId_1?if_exists}"/> - <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.productId_1,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - </div> - </td> - </tr> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.WorkEffortProductId2}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <input type="text" class="inputBox" name="productId_2" size="40" value="${requestParameters.productId_2?if_exists}"/> - <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.productId_2,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> - </div> - </td> - </tr> - <tr> - <td width='25%' align='right'> - <div class='tableheadtext'>Last Updated Date Filter</div> - </td> - <td> - <table border='0' cellspacing='0' cellpadding='0'> - <tr> - <td nowrap> - <input type='text' size='25' class='inputBox' name='fromDate' value='${requestParameters.fromDate?if_exists}'/> - <a href="javascript:call_cal(document.advToKeyWordSearchForm.fromDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> - <span class='tabletext'>${uiLabelMap.CommonFrom}</span> - </td> - </tr> - <tr> - <td nowrap> - <input type='text' size='25' class='inputBox' name='thruDate' value='${requestParameters.thruDate?if_exists}'/> - <a href="javascript:call_cal(document.advToKeyWordSearchForm.thruDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> - <span class='tabletext'>${uiLabelMap.CommonThru}</span> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.CommonSortedBy}:</div> - </td> - <td valign="middle"> - <div class="tabletext"> - <select name="sortOrder" class="selectBox"> - <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevency}</option> - <option value="SortWorkEffortField:workEffortName">${uiLabelMap.WorkEffortName}</option> - </select> - ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked/> - ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N"/> - </div> - </td> - </tr> - <#if searchConstraintStrings?has_content> - <tr> - <td align="right" valign="top"> - <div class="tabletext">${uiLabelMap.ProductLastSearch}</div> - </td> - <td valign="top"> - <#list searchConstraintStrings as searchConstraintString> - <div class="tabletext"> - ${searchConstraintString}</div> - </#list> - <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> - <div class="tabletext"> - ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked/> - ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N"/> - </div> - </td> - </tr> - </#if> - <tr> - <td> - <div class="tabletext"> - <a href="javascript:document.advToKeyWordSearchForm.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> - </div> - </td> - </tr> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.advToKeyWordSearchForm.submit();"/> - </table> -</form> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId1}</td> + <td valign="middle"> + <div> + <input type="text" name="productId_1" size="40" value="${requestParameters.productId_1?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.productId_1,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + </div> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId2}</td> + <td valign="middle"> + <div> + <input type="text" name="productId_2" size="40" value="${requestParameters.productId_2?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.advToKeyWordSearchForm.productId_2,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + </div> + </td> + </tr> + <tr> + <td width='25%' align='right' class='label'>${uiLabelMap.WorkEffortLastUpdatedDateFilter}</td> + <td> + <table class="basic-table" cellspacing="0"> + <tr> + <td nowrap> + <input type='text' size='25' name='fromDate' value='${requestParameters.fromDate?if_exists}'/> + <a href="javascript:call_cal(document.advToKeyWordSearchForm.fromDate,'${fromDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <span>${uiLabelMap.CommonFrom}</span> + </td> + </tr> + <tr> + <td nowrap> + <input type='text' size='25' name='thruDate' value='${requestParameters.thruDate?if_exists}'/> + <a href="javascript:call_cal(document.advToKeyWordSearchForm.thruDate,'${thruDateStr}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> + <span>${uiLabelMap.CommonThru}</span> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td align="right" valign="middle" class="label">${uiLabelMap.CommonSortedBy}</td> + <td valign="middle"> + <div> + <select name="sortOrder"> + <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevency}</option> + <option value="SortWorkEffortField:workEffortName">${uiLabelMap.WorkEffortName}</option> + </select> + ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked/> + ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N"/> + </div> + </td> + </tr> + <#if searchConstraintStrings?has_content> + <tr> + <td align="right" valign="top" class="label">${uiLabelMap.ProductLastSearch}</td> + <td valign="top"> + <#list searchConstraintStrings as searchConstraintString> + <div> - ${searchConstraintString}</div> + </#list> + <div class="label">${uiLabelMap.CommonSortedBy} ${searchSortOrderString}</div> + <div> + ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked/> + ${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N"/> + </div> + </td> + </tr> + </#if> + <tr> + <td colspan="2" align="center"> + <div> + <a href="javascript:document.advToKeyWordSearchForm.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> + </div> + </td> + </tr> + <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.advToKeyWordSearchForm.submit();"/> + </table> + </form> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl Fri Jan 25 13:57:56 2008 @@ -16,73 +16,72 @@ specific language governing permissions and limitations under the License. --> - -<h1>${uiLabelMap.WorkEffortSearchWorkEfforts}, <span class="head2">${uiLabelMap.ProductSearchFor}:</span></h1> -<#list searchConstraintStrings as searchConstraintString> - <div class="tabletext"> <a href="<@ofbizUrl>WorkEffortSearchResults?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> -</#list> -<div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> -<div class="tabletext"><a href="<@ofbizUrl>WorkEffortSearchOptions</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}</a></div> - -<#if !workEffortIds?has_content> - <br/><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> -</#if> - -<#if workEffortIds?has_content> -<table border="0" width="100%" cellpadding="2"> - <tr> - <td align="right"> - <b> - <#if 0 < viewIndex?int> - <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | - </#if> - <#if 0 < listSize?int> - <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> - </#if> - <#if highIndex?int < listSize?int> - | <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> - </#if> - </b> - </td> - </tr> -</table> -</#if> - -<#if workEffortIds?has_content> - -<center> - <table width="100%" cellpadding="0" cellspacing="0"> - <#assign listIndex = lowIndex> - <#list workEffortIds as workEffortId><#-- note that there is no boundary range because that is being done before the list is put in the content --> - <#assign workEffort = delegator.findByPrimaryKey("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortId))> - <tr> - <td> - <a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffortId}</@ofbizUrl>" class="buttontext">${workEffortId} ${(workEffort.workEffortName)?if_exists}</a> - </td> - </tr> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WorkEffortSearchWorkEfforts}, ${uiLabelMap.ProductSearchFor}:</h3> + </div> + <div class="screenlet-body"> + <#list searchConstraintStrings as searchConstraintString> + <div> <a href="<@ofbizUrl>WorkEffortSearchResults?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#list> - </table> -</center> -</#if> - -<#if workEffortIds?has_content> -<table border="0" width="100%" cellpadding="2"> - <tr> - <td align="right"> - <b> - <#if 0 < viewIndex?int> - <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | - </#if> - <#if 0 < listSize?int> - <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> - </#if> - <#if highIndex?int < listSize?int> - | <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> - </#if> - </b> - </td> - </tr> -</table> + <div><span class="label">${uiLabelMap.CommonSortedBy}</span> ${searchSortOrderString}</div> + <div><a href="<@ofbizUrl>WorkEffortSearchOptions</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}</a></div> -<hr class="sepbar"/> -</#if> + <#if !workEffortIds?has_content> + <br/><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> + </#if> + + <#if workEffortIds?has_content> + <table class="basic-table" cellspacing="0"> + <tr> + <td align="right" class="label"> + <#if 0 < viewIndex?int> + <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> + </#if> + <#if 0 < listSize?int> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} + </#if> + <#if highIndex?int < listSize?int> + | <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + </#if> + </td> + </tr> + </table> + </#if> + + <#if workEffortIds?has_content> + + <center> + <table width="100%" cellpadding="0" cellspacing="0"> + <#assign listIndex = lowIndex> + <#list workEffortIds as workEffortId><#-- note that there is no boundary range because that is being done before the list is put in the content --> + <#assign workEffort = delegator.findByPrimaryKey("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortId))> + <tr> + <td> + <a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffortId}</@ofbizUrl>" class="buttontext">${workEffortId} ${(workEffort.workEffortName)?if_exists}</a> + </td> + </tr> + </#list> + </table> + </center> + </#if> + + <#if workEffortIds?has_content> + <table class="basic-table" cellspacing="0"> + <tr> + <td align="right" class="label"> + <#if 0 < viewIndex?int> + <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + </#if> + <#if 0 < listSize?int> + ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} + </#if> + <#if highIndex?int < listSize?int> + | <a href="<@ofbizUrl>WorkEffortSearchResults/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + </#if> + </td> + </tr> + </table> + </#if> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml Fri Jan 25 13:57:56 2008 @@ -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="ListRequests" type="list" use-row-submit="true" title="" list-name="custRequestAndRoles" paginate-target="requestlist"> + <form name="ListRequests" type="list" use-row-submit="true" title="" list-name="custRequestAndRoles" paginate-target="requestlist" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="custRequestId" widget-style="buttontext"> <hyperlink description="${custRequestId}" target-type="inter-app" target="/ordermgr/control/ViewRequest?custRequestId=${custRequestId}"/> </field> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl Fri Jan 25 13:57:56 2008 @@ -16,28 +16,24 @@ specific language governing permissions and limitations under the License. --> - <hr class="sepbar"/> - <h2>${uiLabelMap.WorkEffortDuplicateWorkEffort}</h2> - <form action="<@ofbizUrl>DuplicateWorkEffort</@ofbizUrl>" method="post" style="margin: 0;"> + <form action="<@ofbizUrl>DuplicateWorkEffort</@ofbizUrl>" method="post"> <input type="hidden" name="oldWorkEffortId" value="${workEffortId?if_exists}"/> <div> - <span class="tabletext">${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}:</span> - <input type="text" class="inputBox" size="20" maxlength="20" name="workEffortId"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonDuplicate}!"/> + <span class="label">${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}</span> + <input type="text" size="20" maxlength="20" name="workEffortId"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonDuplicate}!"/> </div> - <div class="tabletext"> - <b>${uiLabelMap.CommonDuplicate}:</b> + <div> + <span class="label">${uiLabelMap.CommonDuplicate}</span> ${uiLabelMap.FormFieldTitle_rate} <input type="checkbox" class="checkBox" name="duplicateWorkEffortAssignmentRates" value="Y" checked="checked"/> ${uiLabelMap.WorkEffortAssoc} <input type="checkbox" class="checkBox" name="duplicateWorkEffortAssocs" value="Y" checked="checked"/> ${uiLabelMap.ProductContent} <input type="checkbox" class="checkBox" name="duplicateWorkEffortContents" value="Y" checked="checked"/> ${uiLabelMap.WorkEffortNotes} <input type="checkbox" class="checkBox" name="duplicateWorkEffortNotes" value="Y" checked="checked"/> </div> - <div class="tabletext"> - <b>${uiLabelMap.CommonRemove}:</b> + <div> + <span class="label">${uiLabelMap.CommonRemove}</span> ${uiLabelMap.FormFieldTitle_rate} <input type="checkbox" class="checkBox" name="removeWorkEffortAssignmentRates" value="Y"/> ${uiLabelMap.WorkEffortAssoc} <input type="checkbox" class="checkBox" name="removeWorkEffortAssocs" value="Y"/> ${uiLabelMap.ProductContent} <input type="checkbox" class="checkBox" name="removeWorkEffortContents" value="Y"/> ${uiLabelMap.WorkEffortNotes} <input type="checkbox" class="checkBox" name="removeWorkEffortNotes" value="Y"/> - </div> - </form> - <hr class="sepbar"/> + </form> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Jan 25 13:57:56 2008 @@ -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="FilterUserJobs" title="" type="single"> + <form name="FilterUserJobs" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="statusId"> <drop-down no-current-selected-key="SERVICE_RUNNING"> <entity-options description="${description}" entity-name="StatusItem"> @@ -31,7 +32,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="UserJobsList" list-name="userJobs" title="" type="list"> + <form name="UserJobsList" list-name="userJobs" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/> <field name="statusId"> <display-entity entity-name="StatusItem" description="${description}"></display-entity> @@ -47,7 +49,8 @@ <field name="recurrenceInfoId"><hidden/></field> </form> - <form name="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffort" title="" type="single"> + <form name="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffort" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffort" use-when="workEffort==null"/> <auto-fields-service service-name="updateWorkEffort"/> @@ -170,7 +173,8 @@ </sort-order> </form> - <form name="FindWorkEffort" default-map-name="workEffort" target="ListWorkEfforts" title="" type="single"> + <form name="FindWorkEffort" default-map-name="workEffort" target="ListWorkEfforts" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="WorkEffort" default-field-type="find"/> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}"><text-find/></field> <field name="workEffortParentId"><text-find/></field> @@ -237,7 +241,8 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListLookupWorkEffort" target="" title="" list-name="listIt" type="list"> + <form name="ListLookupWorkEffort" target="" title="" list-name="listIt" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map field-name="inputFields" env-name="parameters"/> @@ -253,7 +258,8 @@ <field name="marketingCampaignId"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field> </form> - <form name="AddWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="createWorkEffortAndAssoc" title="" type="single"> + <form name="AddWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="createWorkEffortAndAssoc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <!-- Commenting this field for now as the form widget cannot override useWhen fields from the form it is extending (results in two workEffortId fields in the form) <field name="workEffortId"><hidden value=""/></field> @@ -284,7 +290,8 @@ </sort-order> </form> - <form name="AddWorkEffortAssoc" target="createWorkEffortAssoc" title="" type="single"> + <form name="AddWorkEffortAssoc" target="createWorkEffortAssoc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortIdFrom" widget-style="tabletext"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} [${workEffortId}]"/></field> <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field> <field name="workEffortAssocTypeId"> @@ -301,7 +308,8 @@ <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - <form name="EditWorkEffortAssoc" target="updateWorkEffortAssoc" title="" type="single"> + <form name="EditWorkEffortAssoc" target="updateWorkEffortAssoc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortIdFrom" map-name="workEffortAssoc" widget-style="tabletext"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> <sub-hyperlink description="${workEffortIdFrom}" target="EditWorkEffort?workEffortId=${workEffortIdFrom}" link-style="buttontext"/> @@ -322,7 +330,8 @@ <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - <form name="EditWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffortAndAssoc" title="" type="single"> + <form name="EditWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffortAndAssoc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffortAndAssoc" use-when="workEffortAssoc==null"/> <field name="workEffortIdFrom" map-name="workEffortAssoc" widget-style="tabletext"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"> @@ -353,7 +362,8 @@ </sort-order> </form> - <form name="ListWorkEfforts" target="ListWorkEfforts" title="" type="list" list-name="listIt"> + <form name="ListWorkEfforts" target="ListWorkEfforts" title="" type="list" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map field-name="inputFields" env-name="parameters"/> @@ -376,11 +386,12 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail} + ${uiLabelMap.WorkEffortChildren}" target="EditListWorkEfforts?trail=${workEffortId}&DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/> </field> --> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="linktext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffort?workEffortId=${workEffortId}"/> </field> </form> - <form name="WorkEffortTreeLine" hide-header="true" target="ListWorkEfforts" title="" type="list" list-name="listIt"> + <form name="WorkEffortTreeLine" hide-header="true" target="ListWorkEfforts" title="" type="list" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort?workEffortId=${workEffortId}"/> </field> @@ -395,6 +406,7 @@ </form> <form name="EditWorkEffortParty" default-map-name="workEffortParty" target="updateWorkEffortParty" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <alt-target target="createWorkEffortParty" use-when="workEffortParty==null"/> <field name="workEffortId"><hidden/></field> @@ -412,7 +424,8 @@ <field name="preferredContactMechId"><lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="FindWorkEffortParties" target="ListWorkEffortParties" title="" type="single"> + <form name="FindWorkEffortParties" target="ListWorkEffortParties" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><text-find/></field> <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate"><date-find/></field> @@ -426,7 +439,8 @@ <field name="preferredContactMechId"><lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListWorkEffortParties" list-name="listIt" title="" type="list"> + <form name="ListWorkEffortParties" list-name="listIt" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="parameters" field-name="inputFields"/> @@ -443,7 +457,8 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffortParty?workEffortId=${workEffortId}&partyId=${partyId}&fromDate=${fromDate}"/> </field> </form> - <form name="EditWorkEffortCommEvent" default-map-name="workEffortCommEvent" target="updateWorkEffortCommEvent" title="" type="single"> + <form name="EditWorkEffortCommEvent" default-map-name="workEffortCommEvent" target="updateWorkEffortCommEvent" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffortCommEvent" use-when="communicationEvent==null"/> <field name="communicationEventId" use-when="communicationEvent!=null"><display/></field> <field name="communicationEventTypeId"> @@ -529,14 +544,16 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - <form name="FindWorkEffortCommEvents" default-map-name="workEffortCommEvent" target="ListWorkEffortCommEvents" title="" type="single"> + <form name="FindWorkEffortCommEvents" default-map-name="workEffortCommEvent" target="ListWorkEffortCommEvents" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="commEventId"><lookup target-form-name="LookupCommEvent"/></field> <field name="fromDate"><date-find/></field> <field name="thruDate"><date-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListWorkEffortCommEvents" default-map-name="workEffortCommEvent" title="" list-name="listIt" type="list"> + <form name="ListWorkEffortCommEvents" default-map-name="workEffortCommEvent" title="" list-name="listIt" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="requestParameters" field-name="inputFields"/> @@ -570,7 +587,8 @@ <field map-name="subjectMap" name="subject"><text size="30"/></field> </form> - <form name="ListPreferredContactMech" default-widget-style="tabletext" target="" title="" type="list"> + <form name="ListPreferredContactMech" default-widget-style="tabletext" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="PartyAndContactMech"> <field-map field-name="partyId"/> @@ -581,7 +599,8 @@ </field> <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field> </form> - <form name="LookupCommEvent" target="LookupCommEvent" title="" type="single"> + <form name="LookupCommEvent" target="LookupCommEvent" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}"><text-find/></field> <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> @@ -612,7 +631,8 @@ <field map-name="subjectMap" name="subject"><text-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="ListLookupCommEvent" target="" title="" list-name="listIt" type="list"> + <form name="ListLookupCommEvent" target="" title="" list-name="listIt" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="parameters" field-name="inputFields"/> @@ -647,7 +667,8 @@ </form> <!-- WorkEffortAssignmentRate --> - <form name="ListWorkEffortAssignmentRates" type="list" list-name="workEffortAssignmentRates" target="updateWorkEffortAssignmentRate"> + <form name="ListWorkEffortAssignmentRates" type="list" list-name="workEffortAssignmentRates" target="updateWorkEffortAssignmentRate" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortAssignmentRate"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -670,7 +691,8 @@ <hyperlink target="deleteWorkEffortAssignmentRate?workEffortId=${workEffortId}&rateTypeId=${rateTypeId}&partyId=${partyId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddWorkEffortAssignmentRate" type="single" target="createWorkEffortAssignmentRate" title=""> + <form name="AddWorkEffortAssignmentRate" type="single" target="createWorkEffortAssignmentRate" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortAssignmentRate"/> <field name="workEffortId"><hidden/></field> @@ -686,7 +708,8 @@ </form> <!-- TimeEntry --> - <form name="ListWorkEffortTimeEntries" type="list" list-name="timesheetEntries" target="updateWorkEffortTimeEntry"> + <form name="ListWorkEffortTimeEntries" type="list" list-name="timesheetEntries" target="updateWorkEffortTimeEntry" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="TimeEntry"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -728,7 +751,8 @@ <hyperlink target="deleteWorkEffortTimeEntry?workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title=""> + <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTimeEntry"/> <field name="timeEntryId"><ignored/><!-- don't pass, will be sequenced --></field> @@ -750,8 +774,8 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddWorkEffortTimeToInvoice" target="addWorkEffortTimeToInvoice" title="" type="single"> - + <form name="AddWorkEffortTimeToInvoice" target="addWorkEffortTimeToInvoice" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden/></field> <field name="invoiceId"><lookup target-form-name="LookupInvoice"/></field> <field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -765,7 +789,8 @@ </form> <!-- WorkEffort Note --> - <form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes"> + <form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortNoteAndData"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -788,7 +813,8 @@ </field> </form> - <form name="AddWorkEffortNote" type="single" target="createWorkEffortNote" title=""> + <form name="AddWorkEffortNote" type="single" target="createWorkEffortNote" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortNote"/> <field name="noteId"><ignored/><!-- don't pass, will be sequenced --></field> <field name="workEffortId"><hidden/></field> @@ -805,7 +831,8 @@ </form> <!-- WorkEffortContent forms --> - <form name="AddWorkEffortContent" target="createWorkEffortContent" title="" type="single"> + <form name="AddWorkEffortContent" target="createWorkEffortContent" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortContent"/> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="contentId"> @@ -820,7 +847,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWorkEffortContents" type="list" target="updateWorkEffortContent" list-name="workEffortContents"> + <form name="ListWorkEffortContents" type="list" target="updateWorkEffortContent" list-name="workEffortContents" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortContent" use-cache="true" list-name="workEffortContents"> <field-map env-name="workEffortId" field-name="workEffortId" /> @@ -842,7 +870,8 @@ </form> <!-- WorkEffort Good Standard forms --> - <form name="AddWorkEffortGoodStandard" target="createWorkEffortGoodStandard" title="" type="single"> + <form name="AddWorkEffortGoodStandard" target="createWorkEffortGoodStandard" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortGoodStandard"/> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="productId"> @@ -865,7 +894,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWorkEffortGoodStandards" type="list" target="updateWorkEffortGoodStandard" list-name="workEffortGoodStandards"> + <form name="ListWorkEffortGoodStandards" type="list" target="updateWorkEffortGoodStandard" list-name="workEffortGoodStandards" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list-name="workEffortGoodStandards"> <field-map env-name="workEffortId" field-name="workEffortId" /> @@ -895,7 +925,8 @@ </form> <!-- WorkEffort Reviews --> - <form name="AddWorkEffortReview" target="createWorkEffortReview" title="" type="single"> + <form name="AddWorkEffortReview" target="createWorkEffortReview" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortReview"/> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="userLoginId"> @@ -913,7 +944,8 @@ <field name="reviewText"><textarea rows="5" cols="60"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWorkEffortReviews" type="list" target="updateWorkEffortReview" list-name="productWorkEfforts" separate-columns="true"> + <form name="ListWorkEffortReviews" type="list" target="updateWorkEffortReview" list-name="productWorkEfforts" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortReview" use-cache="true" list-name="workEffortReviews"> <field-map env-name="workEffortId" field-name="workEffortId" /> @@ -941,14 +973,16 @@ </field> </form> <!-- WorkEffortKeyword forms --> - <form name="AddWorkEffortKeyword" target="createWorkEffortKeyword" title="" type="single"> + <form name="AddWorkEffortKeyword" target="createWorkEffortKeyword" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortKeyword"/> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="keyword" title="${uiLabelMap.WorkEffortKeyword}*"><text size="10"/></field> <field name="relevancyWeight" title="${uiLabelMap.ProductWeight}"><text size="5"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWorkEffortKeywords" type="list" target="" list-name="listWorkEffortKeywords"> + <form name="ListWorkEffortKeywords" type="list" target="" list-name="listWorkEffortKeywords" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortKeyword" use-cache="true" list-name="workEffortkeywords"> <field-map env-name="workEffortId" field-name="workEffortId" /> @@ -963,13 +997,15 @@ </form> <!-- WorkEffortKeyword forms --> - <form name="AddWorkEffortContactMech" target="createWorkEffortContactMech" title="" type="single"> + <form name="AddWorkEffortContactMech" target="createWorkEffortContactMech" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="contactMechId"><lookup target-form-name="LookupContactMech"/></field> <field name="comments"><text size="50"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="ListWorkEffortContactMechs" type="list" target="" list-name="workEffortContactMechs"> + <form name="ListWorkEffortContactMechs" type="list" target="" list-name="workEffortContactMechs" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortContactMech" list-name="workEffortContactMechs"> <field-map env-name="workEffortId" field-name="workEffortId" /> @@ -990,4 +1026,4 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech?workEffortId=${workEffortId}&contactMechId=${contactMechId}"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=615366&r1=615365&r2=615366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Fri Jan 25 13:57:56 2008 @@ -39,7 +39,8 @@ <link target="${checkLoginUrl}"/> </menu-item> </menu> - <menu name="WorkEffortTabBar" default-menu-item-name="WorkEffort" type="simple"> + <menu name="WorkEffortTabBar" default-menu-item-name="WorkEffort" default-selected-style="selected" + type="simple" menu-container-style="button-bar tab-bar"> <menu-item name="WorkEffortRelatedSummary" title="${uiLabelMap.WorkEffortSummary}"> <link target="WorkEffortSummary?workEffortId=${workEffortId}"/> </menu-item> @@ -94,6 +95,5 @@ <menu-item name="WorkEffortContactMechs" title="${uiLabelMap.WorkEffortContactMechs}"> <link target="EditWorkEffortContactMechs?workEffortId=${workEffortId}"/> </menu-item> - </menu> - -</menus> + </menu> +</menus> \ No newline at end of file |
Free forum by Nabble | Edit this page |