Author: buscob
Date: Sat Apr 10 13:58:26 2010
New Revision: 932722
URL: http://svn.apache.org/viewvc?rev=932722&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3617 - XHTML validation errors (specialpurpose_projectmgr)
https://issues.apache.org/jira/browse/OFBIZ-3617
XHTML validation errors
* Unclosed INPUT
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
* Unencoded ampersands in urls.
Other errors:
gantChart.ftl
Duplicated DOCTYPE
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl?rev=932722&r1=932721&r2=932722&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
Sat Apr 10 13:58:26 2010
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<#-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -->
<#--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@ under the License.
-->
<div style="position:relative" class="gantt" id="GanttChartDIV"></div>
-<script language="javascript">
+<script type="text/javascript" language="javascript">
var g = new JSGantt.GanttChart('g',document.getElementById('GanttChartDIV'),
'day');
g.setShowRes(1); // Show/Hide Responsible (0/1)
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=932722&r1=932721&r2=932722&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
Sat Apr 10 13:58:26 2010
@@ -23,9 +23,9 @@ under the License.
<ul>
<li class="h3"> ${uiLabelMap.WorkEffortNotes}</li>
<#--if project?has_content>
- <li><a
href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
+ <li><a
href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
<#else>
- <li><a
href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
+ <li><a
href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
</#if-->
</ul>
<br class="clear" />
@@ -49,17 +49,17 @@ under the License.
<#if note.internalNote?if_exists == "N">
<div>${uiLabelMap.ProjectMgrPrintableNote}</div>
<#if project?has_content>
- <a
href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
+ <a
href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
<#else>
- <a
href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
+ <a
href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
</#if>
</#if>
<#if note.internalNote?if_exists == "Y">
<div>${uiLabelMap.OrderNotPrintableNote}</div>
<#if project?has_content>
- <a
href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
+ <a
href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
<#else>
- <a
href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
+ <a
href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
</#if>
</#if>
</td>
@@ -95,9 +95,9 @@ under the License.
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
<#if project?has_content>
- <td><input type="hidden" name="workEffortId"
value="${project.workEffortId}"></td>
+ <td><input type="hidden" name="workEffortId"
value="${project.workEffortId}" /></td>
<#else>
- <td><input type="hidden" name="workEffortId"
value="${task.workEffortId}"></td>
+ <td><input type="hidden" name="workEffortId"
value="${task.workEffortId}" /></td>
</#if>
</tr>
<tr>
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=932722&r1=932721&r2=932722&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
Sat Apr 10 13:58:26 2010
@@ -46,7 +46,7 @@ under the License.
</tr>
<tr>
<td>
- <a
href="<@ofbizUrl>requestitem?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>"
class="linktext">${custRequestItemList.custRequestItemSeqId}</a>
+ <a
href="<@ofbizUrl>requestitem?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>"
class="linktext">${custRequestItemList.custRequestItemSeqId}</a>
</td>
<td colspan="2">
<#if custRequestItemList.story?has_content>
@@ -102,7 +102,7 @@ under the License.
</#list>
</table>
</#if>
- <a
href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>"
class="linktext">${uiLabelMap.OrderAddNote}</a>
+ <a
href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>"
class="linktext">${uiLabelMap.OrderAddNote}</a>
</td>
</tr>
</#if>
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=932722&r1=932721&r2=932722&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
Sat Apr 10 13:58:26 2010
@@ -44,15 +44,15 @@ under the License.
<td><a
href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId?if_exists}"
class="buttontext">${workEffortSurveyAppl.surveyId?if_exists} -
${survey.surveyName?if_exists}</a></td>
<td>${workEffortSurveyAppl.fromDate?if_exists}</td>
<td>
- <input type="text" size="20" name="thruDate"
value="${(workEffortSurveyAppl.thruDate)?if_exists}" <#if isReadable?exists>
readonly="readonly"</#if>>
- <a
href="javascript:call_cal(document.editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}.thruDate,
'${nowTimeStampString}');"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="Calendar"></a>
+ <input type="text" size="20" name="thruDate"
value="${(workEffortSurveyAppl.thruDate)?if_exists}" <#if isReadable?exists>
readonly="readonly"</#if> />
+ <a
href="javascript:call_cal(document.editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}.thruDate,
'${nowTimeStampString}');"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="Calendar" /></a>
</td>
- <td><a
href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId?if_exists}&workEffortId=${workEffortSurveyAppl.workEffortId?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td>
+ <td><a
href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId?if_exists}&workEffortId=${workEffortSurveyAppl.workEffortId?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td>
<#if !isReadable?exists>
<input type="hidden" name="surveyId"
value="${workEffortSurveyAppl.surveyId?if_exists}"/>
<input type="hidden" name="workEffortId"
value="${workEffortSurveyAppl.workEffortId?if_exists}"/>
<input type="hidden" name="fromDate"
value="${workEffortSurveyAppl.fromDate?if_exists}"/>
- <td><input type="submit" name="submitBtn"
value='${uiLabelMap.CommonUpdate}'> </td>
+ <td><input type="submit" name="submitBtn"
value='${uiLabelMap.CommonUpdate}' /> </td>
</form>
<td>
<form
id="deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}" method="post"
action="<@ofbizUrl>deleteWorkEffortSurveyAppl</@ofbizUrl>">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=932722&r1=932721&r2=932722&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Apr
10 13:58:26 2010
@@ -610,12 +610,12 @@
</sub-hyperlink>
</display-entity>
</field>
- <field name="partyId" use-when="workEffortId==projectId &&
parameters.get("partyId")==null" event="onChange"
action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- project
level -->
+ <field name="partyId" use-when="workEffortId==projectId &&
parameters.get("partyId")==null" event="onchange"
action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- project
level -->
<drop-down allow-empty="true" current="selected">
<list-options list-name="projectResources" key-name="partyId"
description="${lastName} ${firstName} ${middleName} ${groupName}"/>
</drop-down>
</field>
- <field name="partyId" use-when="workEffortId!=projectId &&
parameters.get("partyId")==null" event="onChange"
action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- task level
-->
+ <field name="partyId" use-when="workEffortId!=projectId &&
parameters.get("partyId")==null" event="onchange"
action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- task level
-->
<drop-down allow-empty="true" current="selected">
<list-options list-name="taskResources" key-name="partyId"
description="${lastName} ${firstName} ${middleName} ${groupName}"/>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=932722&r1=932721&r2=932722&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Apr 10
13:58:26 2010
@@ -55,7 +55,7 @@
<sub-hyperlink target="MyTasks"
description="[${uiLabelMap.CommonChange}]"/>
</display-entity>
</field>
- <field name="workEffortParentId"
use-when="myTask!=void&&parameters.get("workEffortParentId")==null"
title="${uiLabelMap.ProjectMgrTaskPhase}*"
tooltip="${uiLabelMap.CommonRequired}" event="onChange"
action="javascript:document.EditTask.submit();">
+ <field name="workEffortParentId"
use-when="myTask!=void&&parameters.get("workEffortParentId")==null"
title="${uiLabelMap.ProjectMgrTaskPhase}*"
tooltip="${uiLabelMap.CommonRequired}" event="onchange"
action="javascript:document.EditTask.submit();">
<drop-down allow-empty="true">
<entity-options entity-name="ProjectPartyAndPhase"
key-field-name="phaseId" description="${projectName} -- ${phaseName}">
<entity-constraint name="partyId"
env-name="userLogin.partyId"/>
@@ -303,7 +303,7 @@
<display-entity entity-name="WorkEffort"
description="${workEffortName}[${workEffortId}]">
<sub-hyperlink target="MyTasks"
description="[${uiLabelMap.CommonChange}]"/>
</display-entity></field>
- <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"
event="onChange" action="javascript:document.assignTaskToMe.submit();"
use-when="parameters.get("workEffortId")==null">
+ <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"
event="onchange" action="javascript:document.assignTaskToMe.submit();"
use-when="parameters.get("workEffortId")==null">
<drop-down allow-empty="true">
<entity-options entity-name="ProjectPartyAndPhaseAndTask"
description="${projectName} -- ${phaseName} -- ${workEffortName}"
key-field-name="workEffortId" filter-by-date="true">
<entity-constraint name="projectStatusId"
operator="not-equals" value="PRJ_CLOSED"/>
