svn commit: r935311 - in /ofbiz/trunk/framework: common/webcommon/includes/ common/webcommon/portal/ webtools/webapp/webtools/datafile/ webtools/webapp/webtools/entity/ webtools/webapp/webtools/service/ webtools/webapp/webtools/stats/ webtools/webapp/w...

[buscob]

Author: buscob
Date: Sun Apr 18 07:52:08 2010
New Revision: 935311

URL: http://svn.apache.org/viewvc?rev=935311&view=rev
Log:
A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza
OFBIZ-3681 - XHTML validation errors round 2+ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3681
XHTML validation errors

    * Unclosed tags
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * Uppercase tags or attributes.
    * Unencoded ampersands in urls.

Other errors:

common/webcommon/includes/listVisualThemes.ftl
Line 19: style tag is not allowed here, style must be in the style attribute of the tag.

webtools/webapp/webtools/stats/StatBinsHistory.ftl
Line 29: duplicated id

webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Lin 32, 104: form must be outside table.

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl
    ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl
    ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
    ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
    ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
    ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/insertDropDown.ftl Sun Apr 18 07:52:08 2010
@@ -26,7 +26,7 @@ ${StringUtil.wrapString(topLine.textBegi
       <input type="hidden" name="${field.name}" value="${field.value}"/>
     </#list>
   </#if>
-  <select name="${topLine.selectionName?if_exists}" onChange="javascript:document.${topLine.action}.submit();">
+  <select name="${topLine.selectionName?if_exists}" onchange="javascript:document.${topLine.action}.submit();">
     <#list topLine.dropDownList as option>
       <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key?if_exists}">${option.value?if_exists}</option>
     </#list>

Modified: ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl Sun Apr 18 07:52:08 2010
@@ -16,14 +16,14 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-
+<!--
 <style type="text/css">
 .screenlet {
 margin: 1em;
 }
 </style>
-
-<div class="screenlet">
+-->
+<div class="screenlet" style="margin: 1em;">
   <div class="screenlet-title-bar">
     <ul>
       <li class="h3">${uiLabelMap.CommonVisualThemes}</li>
@@ -53,7 +53,7 @@ margin: 1em;
           <td>
             <#if screenshots?has_content>
               <#list screenshots as screenshot>
-                <a href="<@ofbizContentUrl>${screenshot.resourceValue}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${screenshot.resourceValue}</@ofbizContentUrl>" width="150"/></a>
+                <a href="<@ofbizContentUrl>${screenshot.resourceValue}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${screenshot.resourceValue}</@ofbizContentUrl>" width="150" alt=""/></a>
               </#list>
            <#else>
               ${uiLabelMap.CommonVisualThemeNoScreenshots}

Modified: ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/simple.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/simple.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/simple.ftl Sun Apr 18 07:52:08 2010
@@ -54,7 +54,7 @@ under the License.
 
 <body id="column-container" style="background: white;">
 <form name="printPage">
-<input type="button" value="${uiLabelMap.CommonPrint}" onClick="window.print()" class="smallSubmit"/>
+<input type="button" value="${uiLabelMap.CommonPrint}" onclick="window.print()" class="smallSubmit"/>
 </form>
 <br />
 ${sections.render("body")}

Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Sun Apr 18 07:52:08 2010
@@ -23,18 +23,18 @@ under the License.
       <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>">
         <hr />
         <ul>
-          <li id="delete-column"><form method="post" action="<@ofbizUrl>deletePortalPageColumn</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li>
-          <li id="add-portlet"><form method="post" action="<@ofbizUrl>AddPortlet</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li>
+          <li id="delete-column"><form method="post" action="<@ofbizUrl>deletePortalPageColumn</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li>
+          <li id="add-portlet"><form method="post" action="<@ofbizUrl>AddPortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li>
           <li id="column-width">
-           <form method="post" action="<@ofbizUrl>updatePortalPageColumn</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}">
+           <form method="post" action="<@ofbizUrl>updatePortalPageColumn</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}">
             <input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/>
             <input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/>
             <input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/>
             <select name="columnWidthPercentage" onchange="javascript:document.updatePortalPageColum_${portalPageColumn_index}.submit()">
               <option value="">${uiLabelMap.CommonSetColumnWidth}</option>
-              <option <#if portalPageColumn.columnWidthPercentage?default(0) == 10> selected</#if> value="25">25%</option>
-              <option <#if portalPageColumn.columnWidthPercentage?default(0) == 20> selected</#if> value="50">50%</option>
-              <option <#if portalPageColumn.columnWidthPercentage?default(0) == 30> selected</#if> value="75">75%</option>
+              <option <#if portalPageColumn.columnWidthPercentage?default(0) == 10> selected="selected"</#if> value="25">25%</option>
+              <option <#if portalPageColumn.columnWidthPercentage?default(0) == 20> selected="selected"</#if> value="50">50%</option>
+              <option <#if portalPageColumn.columnWidthPercentage?default(0) == 30> selected="selected"</#if> value="75">75%</option>
             </select>
            </form>
           </li>
@@ -47,14 +47,17 @@ under the License.
   </tr>
   <tr>
     <#list portalPageColumnList?if_exists as portalPageColumn>
-      <td style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>" id="${portalPageColumn.columnSeqId}" name="portalColumn">
+      <td style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>" id="portalColumn_${portalPageColumn.columnSeqId}">
       <#assign firstInColumn = true/>
       <#list portalPagePortletViewList as portlet>
         <#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0) || (portlet.columnSeqId?if_exists == portalPageColumn.columnSeqId)>
           <#if portlet.screenName?has_content>
               <#assign portletFields = '<input name="portalPageId" value="' + portlet.portalPageId + '" type="hidden"/><input name="portalPortletId" value="' + portlet.portalPortletId + '" type="hidden"/><input name="portletSeqId" value="' + portlet.portletSeqId  + '" type="hidden"/>'>
-              <div class="portlet-config" id="${portlet_index}" name="portalPortlet" onMouseOver="javascript:this.style.cursor='move';">
+              <div class="portlet-config" id="portalPortlet_${portlet_index}" onmouseover="javascript:this.style.cursor='move';">
               <div class="portlet-config-title-bar">
+                  <script type="text/javascript">makeDragable("${portlet_index}");</script>
+                  <script type="text/javascript">makeDroppable("${portlet_index}");</script>
+                  <form method="post" action="<@ofbizUrl>updatePortalPagePortletAjax</@ofbizUrl>" name="freeMove_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form>
                 <#list portalPages as portalPageList>
                   <#if portalPage.portalPageId != portalPageList.portalPageId>
                     <form method="post" action="<@ofbizUrl>movePortletToPortalPage</@ofbizUrl>" name="movePP_${portlet_index}_${portalPageList_index}">
@@ -64,9 +67,6 @@ under the License.
                   </#if>
                 </#list>
                 <ul>
-                  <script type="text/javascript">makeDragable("${portlet_index}");</script>
-                  <script type="text/javascript">makeDroppable("${portlet_index}");</script>
-                  <form method="post" action="<@ofbizUrl>updatePortalPagePortletAjax</@ofbizUrl>" name="freeMove_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form>
                   <li class="title">Portlet : ${portlet.portletName?if_exists} [${portlet.portalPortletId}]</li>
                   <li class="remove"><form method="post" action="<@ofbizUrl>deletePortalPagePortlet</@ofbizUrl>" name="removePP_${portlet_index}">${portletFields}</form><a href="javascript:document.removePP_${portlet_index}.submit()">&nbsp;&nbsp;&nbsp;</a></li>
 
@@ -124,6 +124,7 @@ under the License.
       <#if portalPageColumn_has_next>
         <td>&nbsp;</td>
       </#if>
+      </td>
     </#list>
   </tr>
 </table>

Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Sun Apr 18 07:52:08 2010
@@ -40,7 +40,7 @@ under the License.
               <tr>
                 <td>
                   <div class="h2">
-                    <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
+                    <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
                   </div>
                   <div class="tabletext">
                     ${portalPortlet.description?if_exists}

Modified: ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Sun Apr 18 07:52:08 2010
@@ -35,7 +35,7 @@ under the License.
             ${screens.setRenderFormUniqueSeq(portlet_index)}
             </div>
             <#-- DragNDrop is only activated, when the portal Page isn't the Default page -->
-            <#if portalPage.originalPortalPageId?has_content><script>setMousePointer("${portlet_index}")</script></#if>
+            <#if portalPage.originalPortalPageId?has_content><script type="text/javascript">setMousePointer("${portlet_index}")</script></#if>
             <#if portalPage.originalPortalPageId?has_content><script type="text/javascript">makeDragable("${portlet_index}");</script></#if>
             <#if portalPage.originalPortalPageId?has_content><script type="text/javascript">makeDroppable("${portlet_index}");</script></#if>
             <form method="post" action="<@ofbizUrl>updatePortalPagePortletAjax</@ofbizUrl>" name="freeMove_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Sun Apr 18 07:52:08 2010
@@ -43,7 +43,7 @@ under the License.
                   <option value=""></option>
                   <#list definitionNames as oneDefinitionName>
                     boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName);
-                    <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected </#if>>${oneDefinitionName}</option>
+                    <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
                   </#list>
                 </select>
               <#else>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Sun Apr 18 07:52:08 2010
@@ -18,16 +18,22 @@ under the License.
 -->
 
 <#assign enableEdit = parameters.enableEdit?default("false")>
-
-<style>
-  .topcontainerhidden { POSITION: absolute; VISIBILITY: hidden; }
-</style>
-
 <script language="JavaScript" type="text/javascript">
 var numTabs=${(entity.getRelationsSize()+1)};
 function ShowTab(lname) {
   for(inc=1; inc <= numTabs; inc++) {
-    document.getElementById('area' + inc).className = (lname == 'tab' + inc) ? 'screenlet' : 'topcontainerhidden';
+    // document.getElementById('area' + inc).className = (lname == 'tab' + inc) ? 'screenlet' : 'topcontainerhidden';
+    // style of topcontainerhidden
+    // .topcontainerhidden { POSITION: absolute; VISIBILITY: hidden; }
+    var elem = document.getElementById('area' + inc);
+    if (lname == 'tab' + inc){
+      elem.className = 'screenlet';
+    }
+    else {
+      elem.className = 'topcontainerhidden';
+      elem.style.position = 'absolute';
+      elem.style.visibility = 'hidden';
+    }
   }
 }
 </script>
@@ -48,7 +54,7 @@ function ShowTab(lname) {
       <#if enableEdit = "false">
         <#if hasCreatePermission>
           <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&amp;enableEdit=true</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonCreateNew}</a>
-          <a href=<@ofbizUrl>ViewGeneric?${curFindString}&amp;enableEdit=true</@ofbizUrl> class="smallSubmit">${uiLabelMap.CommonEdit}</a>
+          <a href="<@ofbizUrl>ViewGeneric?${curFindString}&amp;enableEdit=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonEdit}</a>
         </#if>
         <#if value?has_content>
           <#if hasDeletePermission>
@@ -210,7 +216,7 @@ function ShowTab(lname) {
                     <td>&nbsp;</td>
                     <td>
                       <input type="submit" name="Update" value="${button}" />
-                      <a href=<@ofbizUrl>ViewGeneric?${curFindString}</@ofbizUrl> class="smallSubmit">${uiLabelMap.CommonCancel}</a>
+                      <a href="<@ofbizUrl>ViewGeneric?${curFindString}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancel}</a>
                     </td>
                   </tr>
                 </#if>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Sun Apr 18 07:52:08 2010
@@ -263,7 +263,7 @@ under the License.
                 </td>
               </#if>
             </tr>
-            <tr><td colspan='5'><hr></td></tr>
+            <tr><td colspan='5'><hr/></td></tr>
           </#list>
         </table>
       </div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl Sun Apr 18 07:52:08 2010
@@ -26,7 +26,7 @@ under the License.
 </div>
 <#if security.hasPermission("SERVER_STATS_VIEW", session)>
 
-  <div id="stats-bins-history" class="screenlet">
+  <div id="stats-bins-history2" class="screenlet">
     <div class="screenlet-title-bar">
       <h3>${uiLabelMap.WebtoolsStatsRequestStats}</h3>
     </div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl?rev=935311&r1=935310&r2=935311&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl Sun Apr 18 07:52:08 2010
@@ -20,6 +20,11 @@ under the License.
 <h1>${title}</h1>
 <#if temporalExpression?has_content>
   <#-- Edit existing expression -->
+  <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
+    <form name="updateExpression" method="post" action="<@ofbizUrl>updateTemporalExpression</@ofbizUrl>">
+      <input type="hidden" name="tempExprId" value="${temporalExpression.tempExprId}"/>
+      <input type="hidden" name="tempExprTypeId" value="${temporalExpression.tempExprTypeId}"/>
+  </#if>
   <table class="basic-table" cellspacing="0">
     <tr>
       <td class="label">${uiLabelMap.TemporalExpressionId}</td>
@@ -29,11 +34,6 @@ under the License.
       <td class="label">${uiLabelMap.TemporalExpressionType}</td>
       <td>${uiLabelMap.get("TemporalExpression_" + temporalExpression.tempExprTypeId)}</td>
     </tr>
-    <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
-      <form name="updateExpression" method="post" action="<@ofbizUrl>updateTemporalExpression</@ofbizUrl>">
-        <input type="hidden" name="tempExprId" value="${temporalExpression.tempExprId}"/>
-        <input type="hidden" name="tempExprTypeId" value="${temporalExpression.tempExprTypeId}"/>
-    </#if>
     <#if temporalExpression.tempExprTypeId == "DATE_RANGE">
       <@DateRange formName="updateExpression" fromDate=temporalExpression.date1 toDate=temporalExpression.date2/>
     <#elseif temporalExpression.tempExprTypeId == "DAY_IN_MONTH">
@@ -99,9 +99,11 @@ under the License.
           <td>&nbsp;</td>
           <td><input type="submit" name="submitBtn" value="${uiLabelMap.CommonSave}"/></td>
         </tr>
+      </table>
       </form>
+    <#else>
+      </table>    
     </#if>
-  </table>
 <#else>
   <#-- Create new expression -->
   <@CreateForm "DATE_RANGE" CreateDateRange/>