svn commit: r932732 - in /ofbiz/trunk/specialpurpose/shark/webapp/shark: process/processDetailList.ftl repository/showRepository.ftl tasklist/worklist.ftl

[buscob]

Author: buscob
Date: Sat Apr 10 14:27:24 2010
New Revision: 932732

URL: http://svn.apache.org/viewvc?rev=932732&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3618 - XHTML validation errors (specialpurpose_shark)
https://issues.apache.org/jira/browse/OFBIZ-3618

XHTML validation errors

    * Unclosed INPUT
    * attributes without values (checked)
    * Unencoded ampersands in urls.

Modified:
    ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl
    ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl
    ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl

Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl?rev=932732&r1=932731&r2=932732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl Sat Apr 10 14:27:24 2010
@@ -47,18 +47,18 @@ under the License.
           <td>&nbsp;</td>
         </#if>
         <#if proc.state() == "open.running">
-          <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&terminate=${proc.key()}</@ofbizUrl>" class="buttontext">Terminate</a></td>
-          <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&abort=${proc.key()}</@ofbizUrl>" class="buttontext">Abort</a></td>
-          <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&suspend=${proc.key()}</@ofbizUrl>" class="buttontext">Suspend</a></td>
+          <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;terminate=${proc.key()}</@ofbizUrl>" class="buttontext">Terminate</a></td>
+          <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;abort=${proc.key()}</@ofbizUrl>" class="buttontext">Abort</a></td>
+          <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;suspend=${proc.key()}</@ofbizUrl>" class="buttontext">Suspend</a></td>
         <#else>
           <td>&nbsp;</td>
           <td>&nbsp;</td>
           <#if proc.state() == "open.not_running.not_started">
-            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&start=${proc.key()}</@ofbizUrl>" class="buttontext">Start</a></td>
-            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&delete=${proc.key()}</@ofbizUrl>" class="buttontext">Delete</a></td>
+            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;start=${proc.key()}</@ofbizUrl>" class="buttontext">Start</a></td>
+            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;delete=${proc.key()}</@ofbizUrl>" class="buttontext">Delete</a></td>
           <#elseif proc.state() == "open.not_running.suspended">
-            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&resume=${proc.key()}</@ofbizUrl>" class="buttontext">Resume</a></td>
-            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&delete=${proc.key()}</@ofbizUrl>" class="buttontext">Delete</a></td>
+            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;resume=${proc.key()}</@ofbizUrl>" class="buttontext">Resume</a></td>
+            <td align="center"><a href="<@ofbizUrl>processDetailList?manager=${manager?replace("#", "%23")?if_exists}&amp;delete=${proc.key()}</@ofbizUrl>" class="buttontext">Delete</a></td>
           <#else>
             <td>&nbsp;</td>
           </#if>

Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl?rev=932732&r1=932731&r2=932732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl Sat Apr 10 14:27:24 2010
@@ -44,7 +44,7 @@ under the License.
           <td><div>${version?default("??")}</div></td>
           <td align="center"><div><#if open>Y<#else>N</#if></div>
           <td align="center"><a href="<@ofbizUrl>repository?delete=${package}</@ofbizUrl>" class="buttontext">Remove</a>
-          <td align="center"><a href="<@ofbizUrl>repository?<#if open>close=${packageId}&version=${version}<#else>open=${package}</#if></@ofbizUrl>" class="buttontext"><#if open>Close<#else>Open</#if></a>
+          <td align="center"><a href="<@ofbizUrl>repository?<#if open>close=${packageId}&amp;version=${version}<#else>open=${package}</#if></@ofbizUrl>" class="buttontext"><#if open>Close<#else>Open</#if></a>
         </tr>
       </#if>
     </#list>
@@ -57,7 +57,7 @@ under the License.
 <h2>Upload XPDL</h2>
 <div>&nbsp;</div>
 <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>repository?upload=xpdl</@ofbizUrl>" name="xpdlUploadForm">
-  <input type="file" size="50" name="fname">
+  <input type="file" size="50" name="fname" />
   <div><hr></div>
-  <input type="submit" class="smallSubmit" value="Upload">
+  <input type="submit" class="smallSubmit" value="Upload" />
 </form>

Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl?rev=932732&r1=932731&r2=932732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl Sat Apr 10 14:27:24 2010
@@ -43,16 +43,16 @@ under the License.
       </#if>
       <tr>
         <form method="post" action="<@ofbizUrl>worklist</@ofbizUrl>" name="assignmentChange${formNumber}" style='margin: 0;'>
-          <input type="hidden" name="process" value="${assignm.activity().container().key()}">
-          <input type="hidden" name="activity" value="${assignm.activity().key()}">
-          <input type="hidden" name="resource" value="${assignm.assignee().resource_key()}">
-          <input type="hidden" name="mode" value="accept">
+          <input type="hidden" name="process" value="${assignm.activity().container().key()}" />
+          <input type="hidden" name="activity" value="${assignm.activity().key()}" />
+          <input type="hidden" name="resource" value="${assignm.assignee().resource_key()}" />
+          <input type="hidden" name="mode" value="accept" />
 
           <td><div>${assignm.assignee().resource_key()}</div></td>
           <td><div>${assignm.activity().name()}</div></td>
           <td><div>${assignm.activity().key()}</div></td>
           <td align="center">
-            <input type="checkbox" name="accept" onclick="javascript:document.assignmentChange${formNumber}.submit();" value="Y" <#if assignm.get_accepted_status()>checked</#if>>
+            <input type="checkbox" name="accept" onclick="javascript:document.assignmentChange${formNumber}.submit();" value="Y" <#if assignm.get_accepted_status()>checked="checked"</#if> />
           </td>
           <td align="center"><div>${assignm.activity().priority()}</div></td>
           <td><div>${assignm.activity().state()}</div></td>
@@ -62,7 +62,7 @@ under the License.
             <td align="center"><div>N/A</div></td>
           </#if>
           <#if assignm.activity().state() == "open.running">
-            <td align="center"><a href="<@ofbizUrl>worklist?mode=complete&resource=${assignm.assignee().resource_key()}&process=${assignm.activity().container().key()}&activity=${assignm.activity().key()}</@ofbizUrl>" class="buttontext">Complete</a></td>
+            <td align="center"><a href="<@ofbizUrl>worklist?mode=complete&amp;resource=${assignm.assignee().resource_key()}&amp;process=${assignm.activity().container().key()}&amp;activity=${assignm.activity().key()}</@ofbizUrl>" class="buttontext">Complete</a></td>
           <#else>
             <td>&nbsp;</td>
           </#if>