Author: adrianc
Date: Tue Mar 30 05:26:27 2010
New Revision: 928994
URL: http://svn.apache.org/viewvc?rev=928994&view=rev
Log:
Committed patch from Blas Rodriguez Somoza: XHTML validation errors
(workeffort) - ( https://issues.apache.org/jira/browse/OFBIZ-3610).
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl?rev=928994&r1=928993&r2=928994&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
(original)
+++
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
Tue Mar 30 05:26:27 2010
@@ -28,7 +28,7 @@ under the License.
</a>
${workEffort.workEffortName?default("Undefined")}<#if
workEffort.reservPersons?exists> Persons:${workEffort.reservPersons}</#if>
<#else>
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=edit&parentTypeId=${parentTypeId?if_exists}&period=${periodType?if_exists}&start=${parameters.start?if_exists}&workEffortId=${workEffort.workEffortId}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>"
class="event">
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?form=edit&parentTypeId=${parentTypeId?if_exists}&period=${periodType?if_exists}&start=${parameters.start?if_exists}&workEffortId=${workEffort.workEffortId}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>"
class="event">
${workEffort.workEffortId}
</a>
${workEffort.workEffortName?default("")}
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=928994&r1=928993&r2=928994&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Tue
Mar 30 05:26:27 2010
@@ -33,7 +33,7 @@ under the License.
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="label">
${period.start?time?string.short}<br />
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&form=edit&parentTypeId=${parentTypeId?if_exists}&start=${parameters.start?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&form=edit&parentTypeId=${parentTypeId?if_exists}&start=${parameters.start?if_exists}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate?exists>
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=928994&r1=928993&r2=928994&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
Tue Mar 30 05:26:27 2010
@@ -44,12 +44,12 @@ height: auto;
<#if indexMod7 = 0>
<tr>
<td class="label">
- <a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonWeek}
${period.start?date?string("w")}</a>
+ <a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonWeek}
${period.start?date?string("w")}</a>
</td>
</#if>
<td<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
- <span class="h1"><a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
- <a class="add-new"
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=month&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+ <span class="h1"><a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
+ <a class="add-new"
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=month&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
<br class="clear"/>
<#assign maxNumberOfPersons = 0/>
@@ -119,8 +119,8 @@ height: auto;
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td nowrap class="monthdaynumber"><a
href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>'
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
- <td align="right"><a
href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam?if_exists}</@ofbizUrl>'
class="add">${uiLabelMap.CommonAddNew}</a> </td>
+ <td nowrap="nowrap" class="monthdaynumber"><a
href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>'
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
+ <td align="right"><a
href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam?if_exists}</@ofbizUrl>'
class="add">${uiLabelMap.CommonAddNew}</a> </td>
</tr>
</table>
<#list period.calendarEntries as calEntry>
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=928994&r1=928993&r2=928994&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Tue
Mar 30 05:26:27 2010
@@ -25,15 +25,15 @@ under the License.
<table cellspacing="0" class="basic-table calendar">
<tr class="header-row">
<td>${uiLabelMap.CommonTime}</td>
- <td
colspan=${maxConcurrentEntries}>${uiLabelMap.WorkEffortCalendarEntries}</td>
+ <td
colspan="${maxConcurrentEntries}">${uiLabelMap.WorkEffortCalendarEntries}</td>
</tr>
<#list periods as period>
<#assign currentPeriod = false/>
<#if (nowTimestamp >= period.start) && (nowTimestamp <=
period.end)><#assign currentPeriod = true/></#if>
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br
/>
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br
/>
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate?exists>
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=928994&r1=928993&r2=928994&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
(original)
+++
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
Tue Mar 30 05:26:27 2010
@@ -29,8 +29,8 @@ under the License.
<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>/>
+ ${uiLabelMap.CommonAny}<input type="radio"
name="SEARCH_OPERATOR" value="OR" <#if searchOperator ==
"OR">checked="checked"</#if>/>
+ ${uiLabelMap.CommonAll}<input type="radio"
name="SEARCH_OPERATOR" value="AND" <#if searchOperator ==
"AND">checked="checked"</#if>/>
</div>
</td>
</tr>
@@ -52,8 +52,8 @@ under the License.
</td>
</tr>
<tr>
- <td align="right" valign="middle" nowrap
class="label">${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}</td>
- <td valign="middle" nowrap>
+ <td align="right" valign="middle" nowrap="nowrap"
class="label">${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}</td>
+ <td valign="middle" nowrap="nowrap">
<div>
<select name="workEffortAssocTypeId">
<option value="">- ${uiLabelMap.WorkEffortAnyAssocType}
-</option>
@@ -62,7 +62,7 @@ under the License.
</#list>
</select>
${uiLabelMap.WorkEffortIncludeAllSubWorkEfforts}?
- ${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_WORK_EFFORTS" value="Y" checked/>
+ ${uiLabelMap.CommonYes}<input type="radio"
name="SEARCH_SUB_WORK_EFFORTS" value="Y" checked="checked"/>
${uiLabelMap.CommonNo}<input type="radio"
name="SEARCH_SUB_WORK_EFFORTS" value="N"/>
</div>
</td>
@@ -112,14 +112,14 @@ under the License.
<td>
<table class="basic-table" cellspacing="0">
<tr>
- <td nowrap>
+ <td nowrap="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>
+ <td nowrap="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>
@@ -136,7 +136,7 @@ under the License.
<option
value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
<option
value="SortWorkEffortField:workEffortName">${uiLabelMap.WorkEffortName}</option>
</select>
- ${uiLabelMap.ProductLowToHigh}<input type="radio"
name="sortAscending" value="Y" checked/>
+ ${uiLabelMap.ProductLowToHigh}<input type="radio"
name="sortAscending" value="Y" checked="checked"/>
${uiLabelMap.ProductHighToLow}<input type="radio"
name="sortAscending" value="N"/>
</div>
</td>
@@ -150,7 +150,7 @@ under the License.
</#list>
<div class="label">${uiLabelMap.CommonSortedBy}
${searchSortOrderString}</div>
<div>
- ${uiLabelMap.ProductNewSearch}<input type="radio"
name="clearSearch" value="Y" checked/>
+ ${uiLabelMap.ProductNewSearch}<input type="radio"
name="clearSearch" value="Y" checked="checked"/>
${uiLabelMap.CommonRefineSearch}<input type="radio"
name="clearSearch" value="N"/>
</div>
</td>
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=928994&r1=928993&r2=928994&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
(original)
+++
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
Tue Mar 30 05:26:27 2010
@@ -22,7 +22,7 @@ under the License.
</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>
+ <div> <a
href="<@ofbizUrl>WorkEffortSearchResults?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>"
class="buttontext">X</a> ${searchConstraintString}</div>
</#list>
<div><span class="label">${uiLabelMap.CommonSortedBy}</span>
${searchSortOrderString}</div>
<div><a href="<@ofbizUrl>WorkEffortSearchOptions</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=928994&r1=928993&r2=928994&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl Tue
Mar 30 05:26:27 2010
@@ -94,7 +94,7 @@ under the License.
<#-- <td>${workEffort.partyId}</td> -->
<td>${workEffort.roleTypeId}</td>
<td><a
href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
- <td class="button-col"><a
href="<@ofbizUrl>acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
+ <td class="button-col"><a
href="<@ofbizUrl>acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
</tr>
<#assign alt_row = !alt_row>
</#list>
@@ -124,7 +124,7 @@ under the License.
<td>${workEffort.groupPartyId}</td>
<#-- <td>${workEffort.roleTypeId}</td> -->
<td><a
href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
- <td class="button-col"><a
href="<@ofbizUrl>acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
+ <td class="button-col"><a
href="<@ofbizUrl>acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td>
</tr>
<#assign alt_row = !alt_row>
</#list>
