Author: adrianc
Date: Sun Apr 4 15:29:58 2010
New Revision: 930701
URL: http://svn.apache.org/viewvc?rev=930701&view=rev
Log:
A patch from Blas Rodriguez Somoza - XHTML validation errors (framework
excluding widget) (https://issues.apache.org/jira/browse/OFBIZ-3622).
Modified:
ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
ofbiz/trunk/framework/testtools/webapp/testtools/SeleniumTest.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl
(original)
+++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Sun
Apr 4 15:29:58 2010
@@ -21,7 +21,7 @@ under the License.
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.CommonAvailablePortlets}</li>
- <li><a
href="<@ofbizUrl>ManagePortalPages?portalPageId=${parameters.portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}</@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li>
+ <li><a
href="<@ofbizUrl>ManagePortalPages?portalPageId=${parameters.portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}</@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li>
</ul>
<br class="clear"/>
</div>
Modified: ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Sun Apr 4
15:29:58 2010
@@ -20,14 +20,14 @@ under the License.
<table width="100%">
<tr>
<#list portalPageColumns?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 portalPagePortlets 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"/>'>
<form method="post"
action="<@ofbizUrl>movePortletToPortalPage</@ofbizUrl>"
name="movePP_${portlet_index}">${portletFields}<input name="newPortalPageId"
value="${portlet.portalPageId}" type="hidden"/></form>
- <div id="${portlet_index}" name="portalPortlet" class="noClass">
+ <div id="portalPortlet_${portlet_index}" class="noClass">
${setRequestAttribute("portalPageId", portalPage.portalPageId)}
${setRequestAttribute("portalPortletId", portlet.portalPortletId)}
${setRequestAttribute("portletSeqId", portlet.portletSeqId)}
Modified:
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
(original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml Sun
Apr 4 15:29:58 2010
@@ -160,7 +160,7 @@ under the License.
<!-- ***************** -->
<field name="field8"
title="${uiLabelMap.ExampleDropDownField8Title}"
- event="onChange"
+ event="onchange"
action="return alert('You have changed the value in the select
box');"
tooltip="${uiLabelMap.ExampleDropDownField8Tooltip}">
<drop-down>
Modified: ofbiz/trunk/framework/testtools/webapp/testtools/SeleniumTest.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/webapp/testtools/SeleniumTest.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/webapp/testtools/SeleniumTest.ftl (original)
+++ ofbiz/trunk/framework/testtools/webapp/testtools/SeleniumTest.ftl Sun Apr
4 15:29:58 2010
@@ -100,7 +100,7 @@ under the License.
var loadPercent = data.loadPercent;
$('loadpercent').innerHTML = ''+loadPercent+'%';
var contentLength = data.contentLength;
- //$('filesize').innerHTML =
'<b>'+contentLength/1000 + ' k</b>';
+ //$('filesize').innerHTML =
'<b>'+contentLength/1000 + ' k</b>';
progressBar.setProgress(loadPercent);
if(loadPercent > 99){
$('download').innerHTML = 'download';
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
Sun Apr 4 15:29:58 2010
@@ -83,7 +83,7 @@ under the License.
</#if>
<#if artifactInfo.getType() == "entity">
- <div><a
href="<@ofbizUrl>FindGeneric?entityName=${artifactInfo.modelEntity.getEntityName()}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>">All
Entity Data</a></div>
+ <div><a
href="<@ofbizUrl>FindGeneric?entityName=${artifactInfo.modelEntity.getEntityName()}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>">All
Entity Data</a></div>
<h2>Entity Fields</h2>
<table>
<#list artifactInfo.modelEntity.getFieldsUnmodifiable() as modelField>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
Sun Apr 4 15:29:58 2010
@@ -57,7 +57,7 @@ under the License.
<td>${cacheElement.lineSize?if_exists}</td>
<td class="button-col">
<#if hasUtilCacheEdit>
- <a
href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+ <a
href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
</#if>
</td>
</tr>
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=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
Sun Apr 4 15:29:58 2010
@@ -32,8 +32,8 @@ under the License.
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
- <td><input name="DEFINITION_LOCATION" type="text" size="60"
value="${parameters.DEFINITION_LOCATION?if_exists}"></td>
- <td><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox"
name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content>
checked="checked"</#if>></td>
+ <td><input name="DEFINITION_LOCATION" type="text" size="60"
value="${parameters.DEFINITION_LOCATION?if_exists}" /></td>
+ <td><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox"
name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content>
checked="checked"</#if> /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td>
@@ -47,15 +47,15 @@ under the License.
</#list>
</select>
<#else>
- <input name="DEFINITION_NAME" type="text" size="30"
value="${definitionName?if_exists}">
+ <input name="DEFINITION_NAME" type="text" size="30"
value="${definitionName?if_exists}" />
</#if>
</td>
<td> </td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
- <td><input name="DATAFILE_LOCATION" type="text" size="60"
value="${parameters.DATAFILE_LOCATION?if_exists}"></td>
- <td><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox"
name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content>
checked="checked"</#if>></td>
+ <td><input name="DATAFILE_LOCATION" type="text" size="60"
value="${parameters.DATAFILE_LOCATION?if_exists}" /></td>
+ <td><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox"
name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content>
checked="checked"</#if> /></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>
@@ -64,12 +64,12 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td>
- <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60"
value="${parameters.ENTITYXML_FILE_SAVE?if_exists}"></td>
+ <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60"
value="${parameters.ENTITYXML_FILE_SAVE?if_exists}" /></td>
<td> </td>
</tr>
<tr>
<td> </td>
- <td><input type="submit" value="${uiLabelMap.CommonRun}"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonRun}" /></td>
<td> </td>
</tr>
</table>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl Sun Apr
4 15:29:58 2010
@@ -39,7 +39,7 @@ under the License.
<input type="hidden" name="option" value="removetables"/>
${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName"
value="${groupName}" size="40"/>
<input type="submit" value="${uiLabelMap.CommonRemove}"
name="TablesRemoveButton" disabled="disabled"/>
- <input type="button" value="${uiLabelMap.WebtoolsEnable}"
onClick="enableTablesRemove();"/>
+ <input type="button" value="${uiLabelMap.WebtoolsEnable}"
onclick="enableTablesRemove();"/>
</form>
<form method="post" action="${encodeURLCheckDb}" name="TableRemoveForm">
<input type="hidden" name="option" value="removetable"/>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
Sun Apr 4 15:29:58 2010
@@ -34,8 +34,8 @@ under the License.
<h2>${uiLabelMap.WebtoolsExport}:</h2>
<form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
- ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60"
name="outpath" value="${outpath?if_exists}"><br />
+ ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60"
name="outpath" value="${outpath?if_exists}" /><br />
${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6"
value="${txTimeout?default('7200')}" name="txTimeout"/><br />
<br />
- <input type="submit" value="${uiLabelMap.WebtoolsExport}">
+ <input type="submit" value="${uiLabelMap.WebtoolsExport}" />
</form>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Sun
Apr 4 15:29:58 2010
@@ -30,7 +30,7 @@ under the License.
<select name="filterByGroupName">
<option value="">${uiLabelMap.CommonAll}</option>
<#list entityGroups as group>
- <option value="${group}" <#if filterByGroupName?exists><#if
group = filterByGroupName>selected</#if></#if>>${group}</option>
+ <option value="${group}" <#if filterByGroupName?exists><#if
group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
</#list>
</select>
<b>${uiLabelMap.WebtoolsEntityName}:</b>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl Sun
Apr 4 15:29:58 2010
@@ -63,10 +63,10 @@ under the License.
</div>
<div>${entity.title}
<#if !forstatic>
- <a target='main'
href="<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>">[${uiLabelMap.WebtoolsViewData}]</a>
+ <a target='main'
href="<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>">[${uiLabelMap.WebtoolsViewData}]</a>
</#if>
<#if !forstatic>
- <a target='main'
href="<@ofbizUrl>ArtifactInfo?name=${entity.entityName}&type=entity</@ofbizUrl>">[${uiLabelMap.WebtoolsArtifactInfo}]</a>
+ <a target='main'
href="<@ofbizUrl>ArtifactInfo?name=${entity.entityName}&type=entity</@ofbizUrl>">[${uiLabelMap.WebtoolsArtifactInfo}]</a>
</#if>
</div>
<#if entity.description?has_content &&
@@ -84,7 +84,7 @@ under the License.
<th width="30%">${uiLabelMap.WebtoolsDbName}</th>
<th width="10%">${uiLabelMap.WebtoolsFieldType}</th>
<th width="15%">${uiLabelMap.WebtoolsJavaType}</th>
- <th width="15%"
nowrap>${uiLabelMap.WebtoolsSqlType}</th>
+ <th width="15%"
nowrap="nowrap">${uiLabelMap.WebtoolsSqlType}</th>
</tr>
<#list entity.javaNameList as javaName>
<tr class='entitytext'>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
Sun Apr 4 15:29:58 2010
@@ -33,7 +33,7 @@ under the License.
<td>
<select name="group">
<#list groups as group>
- <option value="${group}" <#if selGroup?exists><#if
group = selGroup>selected</#if></#if>>${group}</option>
+ <option value="${group}" <#if selGroup?exists><#if
group = selGroup>selected="selected"</#if></#if>>${group}</option>
</#list>
</select>
</td>
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=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Sun
Apr 4 15:29:58 2010
@@ -44,15 +44,15 @@ function ShowTab(lname) {
<h2>${uiLabelMap.WebtoolsWithPk}: ${findByPk}</h2>
<br />
<div class="button-bar">
- <a
href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'
class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a>
+ <a
href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'
class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a>
<#if enableEdit = "false">
<#if hasCreatePermission>
- <a
href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&enableEdit=true</@ofbizUrl>'
class="smallSubmit">${uiLabelMap.CommonCreateNew}</a>
- <a
href=<@ofbizUrl>ViewGeneric?${curFindString}&enableEdit=true</@ofbizUrl>
class="smallSubmit">${uiLabelMap.CommonEdit}</a>
+ <a
href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&enableEdit=true</@ofbizUrl>'
class="smallSubmit">${uiLabelMap.CommonCreateNew}</a>
+ <a
href=<@ofbizUrl>ViewGeneric?${curFindString}&enableEdit=true</@ofbizUrl>
class="smallSubmit">${uiLabelMap.CommonEdit}</a>
</#if>
<#if value?has_content>
<#if hasDeletePermission>
- <a
href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>'
class="smallSubmit">${uiLabelMap.WebtoolsDeleteThisValue}</a>
+ <a
href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>'
class="smallSubmit">${uiLabelMap.WebtoolsDeleteThisValue}</a>
</#if>
</#if>
</#if>
@@ -131,29 +131,29 @@ function ShowTab(lname) {
<td class="label">${field.name}</td>
<td>
<#if field.fieldType == 'DateTime'>
- DateTime(YYYY-MM-DD HH:mm:SS.sss):<input
type="text" name="${field.name}" size="24" value="${field.value}">
+ DateTime(YYYY-MM-DD HH:mm:SS.sss):<input
type="text" name="${field.name}" size="24" value="${field.value}" />
<a
href="javascript:call_cal(document.updateForm.${field.name},
'${field.value}');" onmouseover="window.status='Date Picker';return true;"
onmouseout="window.status='';return true;"><img src='/images/cal.gif'
width='16' height='16' border='0' alt='Click here For Calendar'></a>
<#elseif field.fieldType == 'Date'>
- Date(YYYY-MM-DD):<input type="text"
name="${field.name}" size="11" value="${field.value}">
+ Date(YYYY-MM-DD):<input type="text"
name="${field.name}" size="11" value="${field.value}" />
<a
href="javascript:call_cal(document.updateForm.${field.name},
'${field.value}');" onmouseover="window.status='Date Picker';return true;"
onmouseout="window.status='';return true;"><img src='/images/cal.gif'
width='16' height='16' border='0' alt='Click here For Calendar'></a>
<#elseif field.fieldType == 'Time'>
- Time(HH:mm:SS.sss):<input type="text" size="6"
maxlength="10" name="${field.name}" value="${field.value}">
+ Time(HH:mm:SS.sss):<input type="text" size="6"
maxlength="10" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'Integer'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'Long'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'Double'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'Float'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'StringOneRow'>
- <input type="text" size="${field.stringLength}"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}">
+ <input type="text" size="${field.stringLength}"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'String'>
- <input type="text" size="80"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}">
+ <input type="text" size="80"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'Textarea'>
<textarea cols="60" rows="3"
maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea>
<#else>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
</#if>
</td>
</tr>
@@ -173,29 +173,29 @@ function ShowTab(lname) {
<td class="label">${field.name}</td>
<td>
<#if field.fieldType == 'DateTime'>
- DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text"
name="${field.name}" size="24" value="${field.value}">
+ DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text"
name="${field.name}" size="24" value="${field.value}" />
<a
href="javascript:call_cal(document.updateForm.${field.name},
'${field.value}');" onmouseover="window.status='Date Picker';return true;"
onmouseout="window.status='';return true;"><img src='/images/cal.gif'
width='16' height='16' border='0' alt='Click here For Calendar'></a>
<#elseif field.fieldType == 'Date'>
- Date(YYYY-MM-DD):<input type="text"
name="${field.name}" size="11" value="${field.value}">
+ Date(YYYY-MM-DD):<input type="text"
name="${field.name}" size="11" value="${field.value}" />
<a
href="javascript:call_cal(document.updateForm.${field.name},
'${field.value}');" onmouseover="window.status='Date Picker';return true;"
onmouseout="window.status='';return true;"><img src='/images/cal.gif'
width='16' height='16' border='0' alt='Click here For Calendar'></a>
<#elseif field.fieldType == 'Time'>
- Time(HH:mm:SS.sss):<input type="text" size="6"
maxlength="10" name="${field.name}" value="${field.value}">
+ Time(HH:mm:SS.sss):<input type="text" size="6"
maxlength="10" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'Integer'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'Long'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'Double'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'Float'>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
<#elseif field.fieldType == 'StringOneRow'>
- <input type="text" size="${field.stringLength}"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}">
+ <input type="text" size="${field.stringLength}"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'String'>
- <input type="text" size="80"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}">
+ <input type="text" size="80"
maxlength="${field.stringLength}" name="${field.name}" value="${field.value}" />
<#elseif field.fieldType == 'Textarea'>
<textarea cols="60" rows="3"
maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea>
<#else>
- <input type="text" size="20" name="${field.name}"
value="${field.value}">
+ <input type="text" size="20" name="${field.name}"
value="${field.value}" />
</#if>
</td>
</tr>
@@ -209,7 +209,7 @@ function ShowTab(lname) {
<tr<#if alt_row> class="alternate-row"</#if>>
<td> </td>
<td>
- <input type="submit" name="Update" value="${button}">
+ <input type="submit" name="Update" value="${button}" />
<a
href=<@ofbizUrl>ViewGeneric?${curFindString}</@ofbizUrl>
class="smallSubmit">${uiLabelMap.CommonCancel}</a>
</td>
</tr>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Sun Apr
4 15:29:58 2010
@@ -73,16 +73,16 @@ under the License.
<tr>
<td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td>
<td><input type="text" size="25" name="entityFrom" />
- <a href="javascript:call_cal(document.entityExport.entityFrom, null);"
title="View Calendar"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="View Calendar"></a></td>
+ <a href="javascript:call_cal(document.entityExport.entityFrom, null);"
title="View Calendar"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="View Calendar"/></a></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsRecordsUpdatedBefore} </td>
<td><input type="text" size="25" name="entityThru" />
- <a href="javascript:call_cal(document.entityExport.entityThru, null);"
title="View Calendar"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="View Calendar"></a></td>
+ <a href="javascript:call_cal(document.entityExport.entityThru, null);"
title="View Calendar"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="View Calendar"/></a></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsOutToBrowser}</td>
- <td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content>
checked="checked"</#if>></td>
+ <td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content>
checked="checked"</#if> /></td>
</tr>
</table>
<br />
@@ -107,7 +107,7 @@ under the License.
<#assign entCount = 0>
<#assign checkAll = parameters.checkAll?default("false")>
<#list modelEntities as modelEntity>
- <#if entCount % 3 == 0>
+ <#if entCount % 3 == 0 && entCount != 0>
</tr><tr>
</#if>
<#assign entCount = entCount + 1>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
Sun Apr 4 15:29:58 2010
@@ -19,13 +19,13 @@ under the License.
<div class="screenlet-body">
<form action="<@ofbizUrl>SearchLabels</@ofbizUrl>" method="post">
<table class="basic-table">
- <tr>${uiLabelMap.WebtoolsLabelManagerTemporarySearchTitle}</tr>
+ <tr><td
colspan="4">${uiLabelMap.WebtoolsLabelManagerTemporarySearchTitle}</td></tr>
<tr>
<td class="label">
${uiLabelMap.WebtoolsLabelManagerKey}
</td>
<td>
- <input type="text" name="labelKey" size="30" maxlength="70"
value="${parameters.labelKey?if_exists}">
+ <input type="text" name="labelKey" size="30" maxlength="70"
value="${parameters.labelKey?if_exists}" />
</td>
<td class="label">
${uiLabelMap.WebtoolsLabelManagerComponentName}
@@ -77,13 +77,13 @@ under the License.
${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}
</td>
<td>
- <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if
parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels ==
"Y">checked</#if>>
+ <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if
parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels ==
"Y">checked="checked"</#if> />
</td>
<td class="label">
${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}
</td>
<td>
- <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if
parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations
== "Y">checked</#if>>
+ <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if
parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations
== "Y">checked="checked"</#if> />
</td>
</tr>
<tr>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
Sun Apr 4 15:29:58 2010
@@ -33,18 +33,18 @@ under the License.
<td>
<#if parameters.sourceKey?exists>
${parameters.sourceKey}
- <input type="hidden" name="key"
value="${parameters.sourceKey}">
- <input type="hidden" name="update_label" value="Y">
+ <input type="hidden" name="key"
value="${parameters.sourceKey}" />
+ <input type="hidden" name="update_label" value="Y" />
<#else>
- <input type="text" name="key" size="70">
- <input type="hidden" name="update_label" value="N">
+ <input type="text" name="key" size="70" />
+ <input type="hidden" name="update_label" value="N" />
</#if>
</td>
</tr>
<tr>
<td
class="label">${uiLabelMap.WebtoolsLabelManagerKeyComment}</td>
<td>
- <input type="text" name="keyComment" size="70"
value="${parameters.sourceKeyComment?if_exists}">
+ <input type="text" name="keyComment" size="70"
value="${parameters.sourceKeyComment?if_exists}" />
</td>
</tr>
<tr>
@@ -52,7 +52,7 @@ under the License.
<td>
<#if parameters.sourceFileName?exists>
${parameters.sourceFileName}
- <input type="hidden" name="fileName"
value="${parameters.sourceFileName}">
+ <input type="hidden" name="fileName"
value="${parameters.sourceFileName}" />
<#else>
<select name="fileName">
<#list filesFound as fileInfo>
@@ -105,9 +105,9 @@ under the License.
<td class="label">${localeFound}</td>
</#if>
<td>
- <input type="hidden" name="localeNames"
value="${localeFound}">
- <input type="text" name="localeValues" size="70"
value="${labelValue?if_exists}">
- <input type="text" name="localeComments" size="70"
value="${labelComment?if_exists}">
+ <input type="hidden" name="localeNames"
value="${localeFound}" />
+ <input type="text" name="localeValues" size="70"
value="${labelValue?if_exists}" />
+ <input type="text" name="localeComments" size="70"
value="${labelComment?if_exists}" />
</td>
</tr>
</#if>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
Sun Apr 4 15:29:58 2010
@@ -90,9 +90,9 @@ under the License.
<#if showLabel == true>
<tr <#if rowNum == "1">class="alternate-row"</#if>>
<td>${rowNumber}</td>
- <td><a
href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&sourceFileName=${label.fileName}&sourceKeyComment=${label.labelKeyComment?if_exists}</@ofbizUrl>"
<#if previousKey ==
labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
+ <td><a
href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&sourceFileName=${label.fileName}&sourceKeyComment=${label.labelKeyComment?if_exists}</@ofbizUrl>"
<#if previousKey ==
labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
<td>${label.fileName}</td>
- <td><a
href="<@ofbizUrl>ViewReferences?sourceKey=${labelKey}&labelFileName=${label.fileName}</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManagerReferences}</a></td>
+ <td><a
href="<@ofbizUrl>ViewReferences?sourceKey=${labelKey}&labelFileName=${label.fileName}</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManagerReferences}</a></td>
<#list localesFound as localeFound>
<#assign labelVal = label.getLabelValue(localeFound)?if_exists>
<#assign showLocale = true>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
Sun Apr 4 15:29:58 2010
@@ -40,7 +40,7 @@ under the License.
<#list entries as entry>
<tr <#if rowNum == "1">class="alternate-row"</#if>>
<td>${rowNumber}</td>
- <td><a
href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&sourceKey=${parameters.sourceKey?if_exists}</@ofbizUrl>">${entry.getKey()}</a></td>
+ <td><a
href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&sourceKey=${parameters.sourceKey?if_exists}</@ofbizUrl>">${entry.getKey()}</a></td>
<td>${entry.getValue()}</td>
</tr>
<#assign totalRefs = totalRefs + entry.getValue()/>
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=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
Sun Apr 4 15:29:58 2010
@@ -42,7 +42,7 @@ under the License.
<li class="h3">${uiLabelMap.WebtoolsService}
${selectedServiceMap.serviceName}</li>
<li><a
href='<@ofbizUrl>${url}</@ofbizUrl>'>${uiLabelMap.CommonListAll}</a></li>
<li><a
href='<@ofbizUrl>/scheduleJob?SERVICE_NAME=${selectedServiceMap.serviceName}</@ofbizUrl>'>${uiLabelMap.WebtoolsSchedule}</a></li>
- <li><a
href='<@ofbizUrl>/setSyncServiceParameters?SERVICE_NAME=${selectedServiceMap.serviceName}&POOL_NAME=pool&_RUN_SYNC_=Y</@ofbizUrl>'>${uiLabelMap.PageTitleRunService}</a></li>
+ <li><a
href='<@ofbizUrl>/setSyncServiceParameters?SERVICE_NAME=${selectedServiceMap.serviceName}&POOL_NAME=pool&_RUN_SYNC_=Y</@ofbizUrl>'>${uiLabelMap.PageTitleRunService}</a></li>
</ul>
<br class="clear"/>
</div>
@@ -62,13 +62,13 @@ under the License.
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsExportable}</td>
- <td>${selectedServiceMap.export}<#if selectedServiceMap.export =
"True"> (<a
href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}&show_wsdl=true</@ofbizUrl>'>${uiLabelMap.WebtoolsShowShowWSDL}</a>)</#if></td>
+ <td>${selectedServiceMap.export}<#if selectedServiceMap.export =
"True"> (<a
href='<@ofbizUrl>${url}?sel_service_name=${selectedServiceMap.serviceName}&show_wsdl=true</@ofbizUrl>'>${uiLabelMap.WebtoolsShowShowWSDL}</a>)</#if></td>
<td class="label">${uiLabelMap.WebtoolsLocation}</td>
<td><a
href='<@ofbizUrl>${url}?constraint=locat...@${selectedservicemap.location}</@ofbizUrl>'>${selectedServiceMap.location}</a></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsArtifactInfo}</td>
- <td><a
href='<@ofbizUrl>ArtifactInfo?name=${selectedServiceMap.serviceName}&type=service</@ofbizUrl>'>${uiLabelMap.WebtoolsArtifactInfo}</a></td>
+ <td><a
href='<@ofbizUrl>ArtifactInfo?name=${selectedServiceMap.serviceName}&type=service</@ofbizUrl>'>${uiLabelMap.WebtoolsArtifactInfo}</a></td>
<td class="label">${uiLabelMap.WebtoolsDefaultEntityName}</td>
<td><a
href='<@ofbizUrl>${url}?constraint=default_entity_n...@${selectedservicemap.defaultentityname}</@ofbizUrl>'>${selectedServiceMap.defaultEntityName}</a></td>
</tr>
@@ -345,7 +345,7 @@ under the License.
}
}
</script>
- <select id='sd' name='selDisp' onChange='submitDispForm();'>
+ <select id='sd' name='selDisp' onchange='submitDispForm();'>
<option value=''
selected="selected">${uiLabelMap.WebtoolsSelectDispatcher}</option>
<option value='' ></option>
<#list dispArrList as disp>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
Sun Apr 4 15:29:58 2010
@@ -40,7 +40,7 @@ under the License.
</tr>
</#list>
<tr>
- <td> </td>
+ <td> </td>
<td class="label">${uiLabelMap.WebtoolsServiceClearPreviousParams}
? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></td>
<td><input type="submit" value="${uiLabelMap.CommonSubmit}"/></td>
</tr>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
Sun Apr 4 15:29:58 2010
@@ -34,7 +34,7 @@ under the License.
</tr>
</#list>
<tr>
- <td colspan="2" align="center"><input type="submit"
value="${uiLabelMap.CommonSubmit}"></td>
+ <td colspan="2" align="center"><input type="submit"
value="${uiLabelMap.CommonSubmit}" /></td>
</tr>
</table>
</form>
\ No newline at end of file
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Sun Apr
4 15:29:58 2010
@@ -58,8 +58,8 @@ under the License.
</div>
<div class="screenlet-body">
<br />
- <p>${uiLabelMap.WebtoolsThisThread}<b>
${Static["java.lang.Thread"].currentThread().getName()}
(${Static["java.lang.Thread"].currentThread().getId()})</b>
- <p>${uiLabelMap.WebtoolsJavaVersionIs5} <#if isJava5>
${uiLabelMap.CommonYes}<#else>${uiLabelMap.CommonNo}</#if><p>
+ <p>${uiLabelMap.WebtoolsThisThread}<b>
${Static["java.lang.Thread"].currentThread().getName()}
(${Static["java.lang.Thread"].currentThread().getId()})</b></p>
+ <p>${uiLabelMap.WebtoolsJavaVersionIs5} <#if isJava5>
${uiLabelMap.CommonYes}<#else>${uiLabelMap.CommonNo}</#if></p>
<br />
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row">
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=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl
Sun Apr 4 15:29:58 2010
@@ -21,7 +21,7 @@ under the License.
<h3>${uiLabelMap.WebtoolsStatsBinsPageTitle}</h3>
</div>
<div class="button-bar"><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>"
class="smallSubmit">${uiLabelMap.WebtoolsStatsMainPageTitle}</a>
- <a
href="<@ofbizUrl>StatBinsHistory?statsId=${parameters.statsId}&type=${parameters.type}</@ofbizUrl>"
class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
+ <a
href="<@ofbizUrl>StatBinsHistory?statsId=${parameters.statsId}&type=${parameters.type}</@ofbizUrl>"
class="smallSubmit">${uiLabelMap.WebtoolsStatsReloadPage}</a></div>
<p><span class="label">${uiLabelMap.WebtoolsStatsCurrentTime}</span>
${nowTimestamp}</p>
</div>
<#if security.hasPermission("SERVER_STATS_VIEW", session)>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl?rev=930701&r1=930700&r2=930701&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl
Sun Apr 4 15:29:58 2010
@@ -65,7 +65,7 @@ under the License.
<td>${requestRow.avgTime}</td>
<td>${requestRow.maxTime}</td>
<td>${requestRow.hitsPerMin}</td>
- <td class="button-col"><a
href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td>
+ <td class="button-col"><a
href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td>
</tr>
<#if rowNum == "2">
<#assign rowNum = "1">
@@ -116,7 +116,7 @@ under the License.
<td>${requestRow.avgTime}</td>
<td>${requestRow.maxTime}</td>
<td>${requestRow.hitsPerMin}</td>
- <td class="button-col"><a
href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td>
+ <td class="button-col"><a
href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td>
</tr>
<#if rowNum == "2">
<#assign rowNum = "1">
@@ -167,7 +167,7 @@ under the License.
<td>${requestRow.avgTime}</td>
<td>${requestRow.maxTime}</td>
<td>${requestRow.hitsPerMin}</td>
- <td class="button-col"><a
href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td>
+ <td class="button-col"><a
href="<@ofbizUrl>StatBinsHistory?statsId=${requestRow.requestId}&type=${requestRow.requestType}</@ofbizUrl>">${uiLabelMap.WebtoolsStatsViewBins}</a></td>
</tr>
<#if rowNum == "2">
<#assign rowNum = "1">
