Author: buscob
Date: Tue Mar 30 20:28:48 2010
New Revision: 929257
URL: http://svn.apache.org/viewvc?rev=929257&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3611 - XHTML validation errors (content)
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:
AdminSearch.ftl (this template has several markup errors and it should be
reviewed)
Wrong markup at line 32. Duplicated TR
<tr>
Wrong markup at line 49. Table directly inside tr, needs td. Also wrong
attribute name wdith should be width.
<table border="0" wdith="100%">
Wrong markup at line 112. Unclosed previous table and td
<td width="20%" align="right">
CMSSites.ftl
Wrong attribute name at lines 42,66, 154, 211. mode should be method
mode="POST"
Lacks needed type attribute at lines 19, 265.
<SCRIPT language="javascript">
UserPermissions.ftl
Wrong attribute name at lines 60, 81. mode should be method
mode="POST"
Lacks needed type attribute at lines 19 .
<SCRIPT language="javascript">
Wrong markup at lines 115 to 120. Those closing tags have no matching open tags.
</td>
</tr>
</table>
</td>
</tr>
</table>
CMSMenus.xml
Duplicated id value "dflt" at lines 32,38,43
<link id="dflt"
Modified:
ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl
ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl
ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl
ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl
ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml
Modified: ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
(original)
+++ ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl Tue Mar
30 20:28:48 2010
@@ -45,27 +45,27 @@ under the License.
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"/>
<textarea cols="40" rows="5"
name="${questionFieldName}">${(answer.textResponse)?if_exists}</textarea>
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"/>
- <input type="text" size="15" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="15" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"/>
- <input type="text" size="35" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="35" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"/>
- <input type="text" size="30" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="30" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"/>
- <input type="text" size="40" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="40" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"/>
- <input type="text" size="12" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="12" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"/>
- <input type="text" size="20" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="20" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"/>
- <input type="text" size="20" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="text" size="20" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"/>
- <input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.currencyResponse)?default(defValue?if_exists)}">
+ <input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.currencyResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"/>
- <input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.floatResponse)?default(defValue?if_exists)}">
+ <input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.floatResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG"/>
- <input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.numericResponse?default(defValue)?string("#"))?if_exists}">
+ <input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.numericResponse?default(defValue)?string("#"))?if_exists}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"/>
- <input type="password" size="30" class="textBox"
name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}">
+ <input type="password" size="30" class="textBox"
name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"/>
<#if (answer.contentId)?has_content>
<#assign content = answer.getRelatedOne("Content")>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
(original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl Tue Mar
30 20:28:48 2010
@@ -29,7 +29,7 @@ under the License.
<input type="text" class="inputBox" name="queryLine" size="60"/>
</td>
</tr>
-<tr>
+
<tr>
<td width="20%" align="right">
<span class="tableheadtext">${uiLabelMap.CommonSelect}
${uiLabelMap.ContentCategory}</span>
@@ -46,15 +46,16 @@ under the License.
<!-- category form -->
<tr>
- <table border="0" wdith="100%">
+<td>
+ <table border="0" width="100%">
<tr>
<td align="right" valign="middle">
<div class="tabletext">${uiLabelMap.ProductFeatures}:</div>
</td>
<td align="right" valign="middle">
<div class="tabletext">
- ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all"
value="all" checked>
- ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all"
value="any">
+ ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all"
value="all" checked="checked"/>
+ ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all"
value="any"/>
</div>
</td>
</tr>
@@ -65,9 +66,9 @@ under the License.
</td>
<td valign="middle">
<div class="tabletext">
- <input type="text" class="inputBox" name="SEARCH_FEAT" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}">
- <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}">
- <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}">
+ <input type="text" class="inputBox" name="SEARCH_FEAT" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}"/>
+ <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}"/>
+ <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15"
value="${requestParameters.SEARCH_FEAT?if_exists}"/>
</div>
</td>
</tr>
@@ -103,12 +104,16 @@ under the License.
</#list>
<div class="tabletext">${uiLabelMap.CommonSortedBy}:
${searchSortOrderString}</div>
<div class="tabletext">
- ${uiLabelMap.CommonNew} ${uiLabelMap.CommonSearch} <input
type="radio" name="clearSearch" value="Y" checked>
- ${uiLabelMap.CommonRefineSearch} <input type="radio"
name="clearSearch" value="N">
+ ${uiLabelMap.CommonNew} ${uiLabelMap.CommonSearch} <input
type="radio" name="clearSearch" value="Y" checked="checked"/>
+ ${uiLabelMap.CommonRefineSearch} <input type="radio"
name="clearSearch" value="N"/>
</div>
</td>
</tr>
</#if>
+ </table>
+ </td>
+</tr>
+<tr>
<td width="20%" align="right">
</td>
<td> </td>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
(original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Tue
Mar 30 20:28:48 2010
@@ -55,9 +55,9 @@ ${menuWrapper.renderMenuString()}
<#-- ============================================================= -->
<br />
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
- <TR>
- <TD width='100%'>
+<table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxtop'>
<tr>
<td valign="middle">
@@ -65,10 +65,10 @@ ${menuWrapper.renderMenuString()}
</td>
</tr>
</table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
<tr>
<td>
@@ -92,14 +92,14 @@ ${menuWrapper.renderMenuString()}
</tr>
</table>
- </TD>
- </TR>
-</TABLE>
+ </td>
+ </tr>
+</table>
<br />
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
- <TR>
- <TD width='100%'>
+<table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxtop'>
<tr>
<td valign="middle">
@@ -107,10 +107,10 @@ ${menuWrapper.renderMenuString()}
</td>
</tr>
</table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
<tr>
<td>
@@ -166,14 +166,14 @@ ${menuWrapper.renderMenuString()}
</tr>
</table>
- </TD>
- </TR>
-</TABLE>
+ </td>
+ </tr>
+</table>
<#--
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
- <TR>
- <TD width='100%'>
+<table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxtop'>
<tr>
<td valign="middle">
@@ -184,24 +184,24 @@ ${menuWrapper.renderMenuString()}
</td>
</tr>
</table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
<tr>
<td>
<table width="100%" border="0" cellpadding="0" cellspacing='0'>
- <tr><td align="right" nowrap><div
class='tabletext'><b>Image</b></div></td><td> </td><td><div
class='tabletext'>
+ <tr><td align="right" nowrap="nowrap"><div
class='tabletext'><b>Image</b></div></td><td> </td><td><div
class='tabletext'>
<img
src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" />
<div></td></tr>
</table>
</td>
</tr>
</table>
- </TD>
- </TR>
-</TABLE>
+ </td>
+ </tr>
+</table>
-->
@@ -232,42 +232,42 @@ ${menuWrapper.renderMenuString()}
<#macro renderTextData content textData >
<#assign contentId=content.contentId?if_exists/>
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
- <TR>
- <TD width='100%'>
+<table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxtop'>
<tr>
<td valign="middle">
<div class="boxhead"> </div>
</td>
<td valign="middle" align="right">
- <a
href="<@ofbizUrl>EditAddContent?contentId=${content.contentId?if_exists}&contentIdTo=${content.caContentIdTo?if_exists}&contentAssocTypeId=${content.caContentAssocTypeId?if_exists}&fromDate=${content.caFromDate?if_exists}&mapKey=${content.caMapKey?if_exists}</@ofbizUrl>"
class="submenutextright">Update</a>
+ <a
href="<@ofbizUrl>EditAddContent?contentId=${content.contentId?if_exists}&contentIdTo=${content.caContentIdTo?if_exists}&contentAssocTypeId=${content.caContentAssocTypeId?if_exists}&fromDate=${content.caFromDate?if_exists}&mapKey=${content.caMapKey?if_exists}</@ofbizUrl>"
class="submenutextright">Update</a>
</td>
</tr>
</table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
<tr>
<td>
<table width="100%" border="0" cellpadding="0" cellspacing='0'>
- <tr><td align="right" nowrap><div class='tabletext'><b>Content
Name</b></div></td><td> </td><td><div
class='tabletext'>${content.contentName?if_exists}</div></td></tr>
- <tr><td align="right" nowrap><div
class='tabletext'><b>Description</b></div></td><td> </td><td><div
class='tabletext'>${content.description?if_exists}<div></td></tr>
+ <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Content
Name</b></div></td><td> </td><td><div
class='tabletext'>${content.contentName?if_exists}</div></td></tr>
+ <tr><td align="right" nowrap="nowrap"><div
class='tabletext'><b>Description</b></div></td><td> </td><td><div
class='tabletext'>${content.description?if_exists}<div></td></tr>
</table>
</td>
</tr>
</table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
<tr>
<td>
<table width="100%" border="0" cellpadding="0" cellspacing='0'>
- <tr><td align="right" nowrap><div
class='tabletext'><b></b></div></td><td> </td><td><div class='tabletext'>
+ <tr><td align="right" nowrap="nowrap"><div
class='tabletext'><b></b></div></td><td> </td><td><div class='tabletext'>
<#-- ${textData?if_exists} -->
<@renderContentAsText subContentId=content.contentId
editRequestName="/EditAddContent"/>
<div></td></tr>
@@ -275,9 +275,9 @@ ${menuWrapper.renderMenuString()}
</td>
</tr>
</table>
- </TD>
- </TR>
-</TABLE>
+ </td>
+ </tr>
+</table>
</#macro>
<#macro publishContent forumId contentId formAction="/updatePublishLinksMulti"
indentIndex=0 catTrail=[]>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Tue Mar 30
20:28:48 2010
@@ -16,9 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<SCRIPT language="javascript">
+<script type="text/javascript" language="javascript">
function call_fieldlookup4(rootForumId, parentForumId ) {
- var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId
+ "&parentForumId=" + parentForumId, 'FieldLookup',
'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId
+ "&parentForumId=" + parentForumId, 'FieldLookup',
'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
obj_lookupwindow.opener = window;
obj_lookupwindow.focus();
}
@@ -36,10 +36,10 @@ function call_fieldlookup4(rootForumId,
</#if>
<@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_ADMIN" >
<br />
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
- <TR>
- <TD width='100%'>
- <form name="userform" mode="POST"
action="<@ofbizUrl>CMSSites</@ofbizUrl>" >
+<table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
+ <form name="userform" method="post"
action="<@ofbizUrl>CMSSites</@ofbizUrl>" >
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='appTitle'>
<tr>
<td colspan="1" valign="middle" align="right">
@@ -47,23 +47,23 @@ function call_fieldlookup4(rootForumId,
</td>
<td valign="middle">
<div class="boxhead">
- <input type="text" name="rootForumId" size="20"
value="${rootForumId?if_exists}">
+ <input type="text" name="rootForumId" size="20"
value="${rootForumId?if_exists}"/>
</div>
</td>
<td valign="middle" align="right">
<a href="javascript:document.userform.submit()"
class="submenutextright">Refresh</a>
</td>
</tr>
- <table>
+ </table>
</form>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
<tr>
<td>
- <form mode="POST" name="publishsite"
action="<@ofbizUrl>linkContentToPubPt</@ofbizUrl>">
+ <form method="post" name="publishsite"
action="<@ofbizUrl>linkContentToPubPt</@ofbizUrl>">
<table width="100%" border="0" cellpadding="1">
<#assign rowCount = 0 />
<@showSites forumId=rootForumId />
@@ -73,38 +73,38 @@ function call_fieldlookup4(rootForumId,
</tr>
<tr>
<td >
- <a class="buttontext"
href="<@ofbizUrl>addSubSite?rootForumId=${rootForumId}&parentForumId=${rootForumId}</@ofbizUrl>"
>Add Top Level Forum</a>
+ <a class="buttontext"
href="<@ofbizUrl>addSubSite?rootForumId=${rootForumId}&parentForumId=${rootForumId}</@ofbizUrl>"
>Add Top Level Forum</a>
</td >
</tr>
</table>
- </TD>
- </TR>
+ </td>
+ </tr>
<#if requestParameters.moderatedSiteId?has_content>
- <TR>
- <TD width='100%'>
- <TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
+ <table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
<tr><td><hr /></td></tr>
<tr><td align="center"><h1>Unapproved entries for forum
Id:${requestParameters.moderatedSiteId}</h1></td></tr>
<tr><td><hr /></td></tr>
<@moderateSite rootForumId=rootForumId
forumId=requestParameters.moderatedSiteId />
- </TABLE>
- </TD>
- </TR>
+ </table>
+ </td>
+ </tr>
</#if>
<#if requestParameters.permRoleSiteId?has_content>
- <TR>
- <TD width='100%'>
- <TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
+ <table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
<tr><td><hr /></td></tr>
<tr><td align="center"><h1>Associated roles for forum
Id:${requestParameters.permRoleSiteId}</h1></td></tr>
<tr><td><hr /></td></tr>
<@grantSiteRoles rootForumId=rootForumId
forumId=requestParameters.permRoleSiteId/>
- </TABLE>
- </TD>
- </TR>
+ </table>
+ </td>
+ </tr>
</#if>
-</TABLE>
+</table>
</@checkPermission>
<#macro showSites forumId formAction="/enableSites" indentIndex=0 catTrail=[]>
@@ -127,19 +127,19 @@ function call_fieldlookup4(rootForumId,
${plusMinus} ${content.contentName?if_exists}
</td >
<td >
- <a class="buttontext"
href="<@ofbizUrl>CMSSites?rootForumId=${rootForumId}&moderatedSiteId=${content.contentId}</@ofbizUrl>">Moderate</a>
+ <a class="buttontext"
href="<@ofbizUrl>CMSSites?rootForumId=${rootForumId}&moderatedSiteId=${content.contentId}</@ofbizUrl>">Moderate</a>
</td >
<td > | </td >
<td >
- <a class="buttontext"
href="<@ofbizUrl>CMSSites?rootForumId=${rootForumId}&permRoleSiteId=${content.contentId}</@ofbizUrl>">User
Roles</a>
+ <a class="buttontext"
href="<@ofbizUrl>CMSSites?rootForumId=${rootForumId}&permRoleSiteId=${content.contentId}</@ofbizUrl>">User
Roles</a>
</td >
<td > | </td >
<td >
- <a class="buttontext"
href="<@ofbizUrl>addSubSite?rootForumId=${rootForumId}&parentForumId=${content.contentId}</@ofbizUrl>"
>Add Child Forum</a>
+ <a class="buttontext"
href="<@ofbizUrl>addSubSite?rootForumId=${rootForumId}&parentForumId=${content.contentId}</@ofbizUrl>"
>Add Child Forum</a>
</td >
<td > | </td >
<td >
- <a class="buttontext"
href="<@ofbizUrl>removeSite?rootForumId=${rootForumId}&contentId=${content.contentId}&contentIdTo=${forumId}&contentAssocTypeId=SUBSITE</@ofbizUrl>">RemoveSite</a>
+ <a class="buttontext"
href="<@ofbizUrl>removeSite?rootForumId=${rootForumId}&contentId=${content.contentId}&contentIdTo=${forumId}&contentAssocTypeId=SUBSITE</@ofbizUrl>">RemoveSite</a>
</td >
</tr>
<#assign rowCount = rowCount + 1 />
@@ -151,7 +151,7 @@ function call_fieldlookup4(rootForumId,
<#macro moderateSite forumId rootForumId >
<table width="100%" border="0" >
- <form name="mostrecent" mode="POST"
action="<@ofbizUrl>publishResponse</@ofbizUrl>"/>
+ <form name="mostrecent" method="post"
action="<@ofbizUrl>publishResponse</@ofbizUrl>"/>
<#assign row=0/>
<#list mostRecentList as content>
<@checkPermission entityOperation="_ADMIN"
targetOperation="CONTENT_PUBLISH" subContentId=forumId >
@@ -160,11 +160,11 @@ function call_fieldlookup4(rootForumId,
<td class="tabletext"> <b>name:</b>${content.contentName} </td>
<@injectNodeTrailCsv subContentId=content.contentId redo="true"
contentAssocTypeId="PUBLISH_LINK">
<td>
- <a class="tabButton"
href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>"
>View</a>
+ <a class="tabButton"
href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>"
>View</a>
</td>
<td class="tabletext">
<b>submitted:</b>
- <input type="radio" name="statusId_o_${row}"
value="CTNT_FINAL_DRAFT" checked/>
+ <input type="radio" name="statusId_o_${row}"
value="CTNT_FINAL_DRAFT" checked="checked"/>
</td>
<td class="tabletext">
<b>publish:</b>
@@ -206,9 +206,9 @@ function call_fieldlookup4(rootForumId,
<#macro grantSiteRoles forumId rootForumId >
<table width="100%" border="0" >
- <TR>
- <TD width='100%'>
- <form name="siteRoleForm" mode="POST"
action="<@ofbizUrl>updateSiteRoles</@ofbizUrl>">
+ <tr>
+ <td width='100%'>
+ <form name="siteRoleForm" method="post"
action="<@ofbizUrl>updateSiteRoles</@ofbizUrl>">
<input type="hidden" name="permRoleSiteId" value="${forumId}"/>
<input type="hidden" name="forumId" value="${forumId}"/>
<input type="hidden" name="rootForumId" value="${rootForumId}"/>
@@ -258,11 +258,11 @@ function call_fieldlookup4(rootForumId,
</table>
<input type="hidden" name="_rowCount" value="${blogRoleIdList}"/>
</form>
- </TD>
- </TR>
+ </td>
+ </tr>
</table>
-<SCRIPT language="javascript">
+<script type="text/javascript" language="javascript">
function call_fieldlookup3(view_name) {
window.target = document.siteRoleForm.partyId_o_${rowCount - 1};
var obj_lookupwindow = window.open(view_name,'FieldLookup',
'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
Modified:
ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl
(original)
+++ ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl
Tue Mar 30 20:28:48 2010
@@ -21,12 +21,12 @@
<#if parameters.rename?has_content>
<div class="h3">${uiLabelMap.ContentRenameFolder}</div>
${uiLabelMap.ContentRenameFolder} : ${content.contentName}<br />
- <input type="text" name="contentName" value="${content.contentName}">
+ <input type="text" name="contentName" value="${content.contentName}" />
<br/ <a class="buttontext"
href="javascript:document.editContentTree.submit();">${uiLabelMap.ContentRenameFolder}</a><a
class="buttontext"
href="<@ofbizUrl>navigateContent</@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
<#else>
<div class="h3">${uiLabelMap.ContentNewFolder}</div>
${uiLabelMap.ContentRoot} : ${content.contentName}
- <input type="text" name="contentName">
+ <input type="text" name="contentName" />
<br /><a class="buttontext"
href="javascript:document.editContentTree.submit();">${uiLabelMap.CommonCreate}</a><a
class="buttontext"
href="<@ofbizUrl>navigateContent</@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
</#if>
<input type="hidden" name="contentId" value="${parameters.contentId}"/>
Modified:
ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl
(original)
+++
ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl
Tue Mar 30 20:28:48 2010
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script language="javascript1.2">
+<script type="text/javascript" language="javascript1.2">
function call_fieldlookup3(view_name) {
var obj_lookupwindow = window.open(view_name + "?webSitePublishPoint=" +
webSitePublishPoint,'FieldLookup',
'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
obj_lookupwindow.opener = window;
@@ -54,10 +54,10 @@ function call_fieldlookup3(view_name) {
<#-- ============================================================= -->
<br />
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
- <TR>
- <TD width='100%'>
- <form name="userform" mode="POST"
action="<@ofbizUrl>UserPermissions</@ofbizUrl>" >
+<table border="0" width='100%' cellspacing='0' cellpadding='0'
class='boxoutside'>
+ <tr>
+ <td width='100%'>
+ <form name="userform" method="post"
action="<@ofbizUrl>UserPermissions</@ofbizUrl>" >
<table width='100%' border='0' cellspacing='0' cellpadding='0'
class='appTitle'>
<tr>
<td colspan="1" valign="middle" align="right">
@@ -65,7 +65,7 @@ function call_fieldlookup3(view_name) {
</td>
<td valign="middle">
<div class="boxhead">
- <input type="text" name="webSitePublishPoint" size="20"
value="${webSitePublishPoint?if_exists}">
+ <input type="text" name="webSitePublishPoint" size="20"
value="${webSitePublishPoint?if_exists}" />
<input type="submit" value="${uiLabelMap.CommonRefresh}"/>
<input type="hidden" name="partyId" value="${partyId?if_exists}"/>
<input type="hidden" name="userLoginId"
value="${userLoginId?if_exists}"/>
@@ -74,11 +74,11 @@ function call_fieldlookup3(view_name) {
</tr>
</table>
</form>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <form name="siteRoleForm" mode="POST"
action="<@ofbizUrl>updateSiteRoles</@ofbizUrl>">
+ </td>
+ </tr>
+ <tr>
+ <td width='100%'>
+ <form name="siteRoleForm" method="post"
action="<@ofbizUrl>updateSiteRoles</@ofbizUrl>">
<table width='100%' border='0' cellspacing='0' cellpadding='4'
class='boxoutside'>
<tr>
<td class="">${uiLabelMap.ContentWebSite}</td>
@@ -109,15 +109,6 @@ function call_fieldlookup3(view_name) {
</tr>
</table>
</form>
-
-
-
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
+ </td>
+ </tr>
+</table>
Modified:
ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
(original)
+++
ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
Tue Mar 30 20:28:48 2010
@@ -63,7 +63,7 @@ under the License.
<td>${questionType.get("description",locale)}</td>
<td>${(questionCat.description)?if_exists}</td>
<td>${surveyQuestionAndAppl.description?if_exists}</td>
- <td><input type="text" name="question" size="30"
value="${surveyQuestionAndAppl.question?if_exists?html}">
+ <td><input type="text" name="question" size="30"
value="${surveyQuestionAndAppl.question?if_exists?html}" />
<td>
<select name="surveyPageId">
<#if surveyQuestionAndAppl.surveyPageSeqId?has_content>
@@ -116,7 +116,7 @@ under the License.
<td><input type="text" name="withSurveyQuestionId" size="5"
value="${surveyQuestionAndAppl.withSurveyQuestionId?if_exists}"/></td>
<td><input type="text" name="withSurveyOptionSeqId" size="5"
value="${surveyQuestionAndAppl.withSurveyOptionSeqId?if_exists}"/></td>
<td><input type="submit" value="${uiLabelMap.CommonUpdate}"
class="smallSubmit"/></td>
- <td><a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit} ${uiLabelMap.ContentSurveyQuestion}</a></td>
+ <td><a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit} ${uiLabelMap.ContentSurveyQuestion}</a></td>
</form>
<td>
<form
id="removeSurveyQuestion_${surveyQuestionAndAppl.surveyQuestionId}"
action="<@ofbizUrl>removeSurveyQuestionAppl</@ofbizUrl>" method="post">
@@ -162,11 +162,11 @@ under the License.
<#list categoryQuestions as question>
<#assign questionType =
question.getRelatedOne("SurveyQuestionType")>
<form method="post"
action="<@ofbizUrl>createSurveyQuestionAppl</@ofbizUrl>">
- <input type="hidden" name="surveyId"
value="${requestParameters.surveyId}">
- <input type="hidden" name="surveyQuestionId"
value="${question.surveyQuestionId}">
- <input type="hidden" name="surveyQuestionCategoryId"
value="${requestParameters.surveyQuestionCategoryId}">
+ <input type="hidden" name="surveyId"
value="${requestParameters.surveyId}" />
+ <input type="hidden" name="surveyQuestionId"
value="${question.surveyQuestionId}" />
+ <input type="hidden" name="surveyQuestionCategoryId"
value="${requestParameters.surveyQuestionCategoryId}" />
<tr<#if alt_row> class="alternate-row"</#if>>
- <td><a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${question.surveyQuestionId}&surveyQuestionCategoryId=${requestParameters.surveyQuestionCategoryId}#edit</@ofbizUrl>"
class="buttontext">${question.surveyQuestionId}</a></td>
+ <td><a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${question.surveyQuestionId}&surveyQuestionCategoryId=${requestParameters.surveyQuestionCategoryId}#edit</@ofbizUrl>"
class="buttontext">${question.surveyQuestionId}</a></td>
<td>${question.description?if_exists}</td>
<td>${questionType.get("description",locale)}</td>
<td>${question.question?if_exists}</td>
@@ -257,7 +257,7 @@ under the License.
</div>
<div class="screenlet-body">
</#if>
- <a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&newCategory=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion}
${uiLabelMap.ContentSurveryCategory}</a>
+ <a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&newCategory=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion}
${uiLabelMap.ContentSurveryCategory}</a>
<br /><br />
${createSurveyQuestionWrapper.renderFormString(context)}
</#if>
@@ -284,8 +284,8 @@ under the License.
<tr<#if alt_row> class="alternate-row"</#if>>
<td>${option.description?if_exists}</td>
<td>${option.sequenceNum?if_exists}</td>
- <td><a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit}</a>
- <td><a
href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRemove}</a>
+ <td><a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit}</a>
+ <td><a
href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRemove}</a>
</tr>
<#assign alt_row = !alt_row>
</#list>
@@ -309,7 +309,7 @@ under the License.
<br class="clear"/>
</div>
<div class="screenlet-body">
- <a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionOption.surveyQuestionId}</@ofbizUrl>"
class="buttontext">[${uiLabelMap.CommonNew}
${uiLabelMap.ContentSurveyOption}]</a>
+ <a
href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionOption.surveyQuestionId}</@ofbizUrl>"
class="buttontext">[${uiLabelMap.CommonNew}
${uiLabelMap.ContentSurveyOption}]</a>
</#if>
${createSurveyOptionWrapper.renderFormString()}
</#if>
Modified:
ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
(original)
+++
ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
Tue Mar 30 20:28:48 2010
@@ -34,7 +34,7 @@ under the License.
<#else>
<#-- standard questions -->
- <td align='right' nowrap class="label">
+ <td align='right' nowrap="nowrap" class="label">
<#assign answerString = "${uiLabelMap.ContentAnswers}">
<#if (results._total?default(0) == 1)>
<#assign answerString = "${uiLabelMap.ContentAnswer}">
Modified:
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
(original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl
Tue Mar 30 20:28:48 2010
@@ -107,19 +107,19 @@
<table>
<tr>
<td class="label">Page Title</td>
- <td><input type="text" name="title"
value="${(title.objectInfo)?if_exists}" size="40"></td>
+ <td><input type="text" name="title"
value="${(title.objectInfo)?if_exists}" size="40" /></td>
</tr>
<tr>
<td class="label">Title Property</td>
- <td><input type="text" name="titleProperty"
value="${(titleProperty.objectInfo)?if_exists}" size="40"></td>
+ <td><input type="text" name="titleProperty"
value="${(titleProperty.objectInfo)?if_exists}" size="40" /></td>
</tr>
<tr>
<td class="label">Meta-Description</td>
- <td><input type="text" name="metaDescription"
value="${(metaDescription.objectInfo)?if_exists}" size="40"></td>
+ <td><input type="text" name="metaDescription"
value="${(metaDescription.objectInfo)?if_exists}" size="40" /></td>
</tr>
<tr>
<td class="label">Meta-Keywords</td>
- <td><input type="text" name="metaKeywords"
value="${(metaKeywords.objectInfo)?if_exists}" size="40"></td>
+ <td><input type="text" name="metaKeywords"
value="${(metaKeywords.objectInfo)?if_exists}" size="40" /></td>
</tr>
<tr><td colspan="2"> </td></tr>
<tr>
Modified:
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl
(original)
+++
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSPathAlias.ftl
Tue Mar 30 20:28:48 2010
@@ -79,11 +79,11 @@
<tr><td colspan="2"> </td></tr>
<tr>
<td class="label">Path Alias</td>
- <td><input type="text" name="pathAlias" value=""></td>
+ <td><input type="text" name="pathAlias" value="" /></td>
</tr>
<tr>
<td class="label">Map Key</td>
- <td><input type="text" name="mapKey" value=""></td>
+ <td><input type="text" name="mapKey" value="" /></td>
</tr>
<tr>
<td colspan="2" align="center"><input id="submit"
type="button" onclick="javascript:pathSave('${contentId}');"
class="smallSubmit" value="Create"/></td>
Modified: ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml?rev=929257&r1=929256&r2=929257&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSMenus.xml Tue Mar 30
20:28:48 2010
@@ -29,18 +29,18 @@ under the License.
<link id="contentfind" target="CMSContentFind"/>
</menu-item>
<menu-item name="subsites" title="${uiLabelMap.ContentSubSites}" >
- <link id="dflt" target="CMSSites">
+ <link id="sites" target="CMSSites">
<parameter param-name="forumId" from-field="subsites.forumId"/>
</link>
</menu-item>
<menu-item name="index" title="${uiLabelMap.ContentIndex}" >
- <link id="dflt" target="AdminIndex">
+ <link id="index" target="AdminIndex">
</link>
</menu-item>
<menu-item name="search" title="${uiLabelMap.CommonFind}" >
- <link id="dflt" target="AdminSearch">
+ <link id="search" target="AdminSearch">
</link>
</menu-item>
