Author: lektran
Date: Thu Sep 24 00:45:14 2009
New Revision: 818329
URL: http://svn.apache.org/viewvc?rev=818329&view=rev
Log:
Fixed indentation, separated FreeMarker formatting from html
Modified:
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
Modified:
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=818329&r1=818328&r2=818329&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
Thu Sep 24 00:45:14 2009
@@ -17,170 +17,170 @@
under the License.
-->
<#if product?exists>
- <script language="JavaScript" type="text/javascript">
+<script language="JavaScript" type="text/javascript">
function insertNowTimestamp(field) {
- eval('document.productForm.' + field +
'.value="${nowTimestampString}";');
+ eval('document.productForm.' + field +
'.value="${nowTimestampString}";');
};
function insertImageName(type,nameValue) {
- eval('document.productForm.' + type + 'ImageUrl.value=nameValue;');
+ eval('document.productForm.' + type + 'ImageUrl.value=nameValue;');
};
- </script>
+</script>
<#if fileType?has_content>
- <h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
+<h3>${uiLabelMap.ProductResultOfImageUpload}</h3>
<#if !(clientFileName?has_content)>
- <div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
+ <div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
<#else>
- <div>${uiLabelMap.ProductTheFileOnYourComputer}:
<b>${clientFileName?if_exists}</b></div>
- <div>${uiLabelMap.ProductServerFileName}:
<b>${fileNameToUse?if_exists}</b></div>
- <div>${uiLabelMap.ProductServerDirectory}:
<b>${imageServerPath?if_exists}</b></div>
- <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a
href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
+ <div>${uiLabelMap.ProductTheFileOnYourComputer}:
<b>${clientFileName?if_exists}</b></div>
+ <div>${uiLabelMap.ProductServerFileName}:
<b>${fileNameToUse?if_exists}</b></div>
+ <div>${uiLabelMap.ProductServerDirectory}:
<b>${imageServerPath?if_exists}</b></div>
+ <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a
href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
</#if>
<br/>
</#if>
<form action="<@ofbizUrl>updateProductContent</@ofbizUrl>" method="post"
style="margin: 0;" name="productForm">
- <input type="hidden" name="productId" value="${productId?if_exists}"/>
- <table cellspacing="0" class="basic-table">
- <tr>
- <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductProductName}</b></td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="productName"
value="${(product.productName?html)?if_exists}" size="30" maxlength="60"/>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductProductDescription}</b></td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <textarea name="description" cols="60"
rows="2">${(product.description)?if_exists}</textarea>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductLongDescription}</b></td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <textarea class="dojo-ResizableTextArea" name="longDescription"
cols="60" rows="7">${(product.longDescription)?if_exists}</textarea>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductDetailScreen}</b></td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="detailScreen"
value="${(product.detailScreen)?if_exists}" size="60" maxlength="250"/>
- <br/><span
class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail}
"productdetail", ${uiLabelMap.ProductDetailScreenMessage}:
"component://ecommerce/widget/CatalogScreens.xml#productdetail"</span>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right" valign="top">
- <div><b>${uiLabelMap.ProductSmallImage}</b></div>
- <#if (product.smallImageUrl)?exists>
- <a
href="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>"
target="_blank"><img alt="Small Image"
src="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>"
height="40" width="40"/></a>
- </#if>
- </td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="smallImageUrl"
value="${(product.smallImageUrl)?default('')}" size="60" maxlength="255"/>
- <#if productId?has_content>
- <div>
- <span>${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
- <a
href="javascript:insertImageName('small','${imageNameSmall}.jpg');"
class="buttontext">.jpg</a>
- <a
href="javascript:insertImageName('small','${imageNameSmall}.gif');"
class="buttontext">.gif</a>
- <a href="javascript:insertImageName('small','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
- </div>
- </#if>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right" valign="top">
- <div><b>${uiLabelMap.ProductMediumImage}</b></div>
- <#if (product.mediumImageUrl)?exists>
- <a
href="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Medium Image"
src="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>"
height="40" width="40"/></a>
- </#if>
- </td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="mediumImageUrl"
value="${(product.mediumImageUrl)?default('')}" size="60" maxlength="255"/>
- <#if productId?has_content>
- <div>
- <span>${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
- <a
href="javascript:insertImageName('medium','${imageNameMedium}.jpg');"
class="buttontext">.jpg</a>
- <a
href="javascript:insertImageName('medium','${imageNameMedium}.gif');"
class="buttontext">.gif</a>
- <a href="javascript:insertImageName('medium','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
- </div>
- </#if>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right" valign="top">
- <div><b>${uiLabelMap.ProductLargeImage}</b></div>
- <#if (product.largeImageUrl)?exists>
- <a
href="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Large Image"
src="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" height="40"
width="40"/></a>
- </#if>
- </td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="largeImageUrl"
value="${(product.largeImageUrl)?default('')}" size="60" maxlength="255"/>
- <#if productId?has_content>
- <div>
- <span>${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
- <a
href="javascript:insertImageName('large','${imageNameLarge}.jpg');"
class="buttontext">.jpg</a>
- <a
href="javascript:insertImageName('large','${imageNameLarge}.gif');"
class="buttontext">.gif</a>
- <a href="javascript:insertImageName('large','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
- </div>
- </#if>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right" valign="top">
- <div><b>${uiLabelMap.ProductDetailImage}</b></div>
- <#if (product.detailImageUrl)?exists>
- <a
href="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Detail Image"
src="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>"
height="40" width="40"/></a>
- </#if>
- </td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="detailImageUrl"
value="${(product.detailImageUrl)?default('')}" size="60" maxlength="255"/>
- <#if productId?has_content>
- <div>
- <span>${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
- <a
href="javascript:insertImageName('detail','${imageNameDetail}.jpg');"
class="buttontext">.jpg</a>
- <a
href="javascript:insertImageName('detail','${imageNameDetail}.gif');"
class="buttontext">.gif</a>
- <a href="javascript:insertImageName('detail','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
- </div>
- </#if>
- </td>
- </tr>
- <tr>
- <td width="20%" align="right" valign="top">
- <div><b>${uiLabelMap.ProductOriginalImage}</b></div>
- <#if (product.originalImageUrl)?exists>
- <a
href="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Original Image"
src="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>"
height="40" width="40"/></a>
- </#if>
- </td>
- <td> </td>
- <td width="80%" colspan="4" valign="top">
- <input type="text" name="originalImageUrl"
value="${(product.originalImageUrl)?default('')}" size="60" maxlength="255"/>
- <#if productId?has_content>
- <div>
- <span>${uiLabelMap.ProductInsertDefaultImageUrl}: </span>
- <a
href="javascript:insertImageName('original','${imageNameOriginal}.jpg');"
class="buttontext">.jpg</a>
- <a
href="javascript:insertImageName('original','${imageNameOriginal}.gif');"
class="buttontext">.gif</a>
- <a href="javascript:insertImageName('original','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
- </div>
- </#if>
- </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- <td><input type="submit" name="Update"
value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td>
- <td colspan="3"> </td>
- </tr>
- </table>
+ <input type="hidden" name="productId" value="${productId?if_exists}"/>
+ <table cellspacing="0" class="basic-table">
+ <tr>
+ <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductProductName}</b></td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="productName"
value="${(product.productName?html)?if_exists}" size="30" maxlength="60"/>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductProductDescription}</b></td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <textarea name="description" cols="60"
rows="2">${(product.description)?if_exists}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductLongDescription}</b></td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <textarea class="dojo-ResizableTextArea"
name="longDescription" cols="60"
rows="7">${(product.longDescription)?if_exists}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right"
valign="top"><b>${uiLabelMap.ProductDetailScreen}</b></td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="detailScreen"
value="${(product.detailScreen)?if_exists}" size="60" maxlength="250"/>
+ <br/><span
class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail}
"productdetail", ${uiLabelMap.ProductDetailScreenMessage}:
"component://ecommerce/widget/CatalogScreens.xml#productdetail"</span>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right" valign="top">
+ <div><b>${uiLabelMap.ProductSmallImage}</b></div>
+ <#if (product.smallImageUrl)?exists>
+ <a
href="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>"
target="_blank"><img alt="Small Image"
src="<@ofbizContentUrl>${(product.smallImageUrl)?if_exists}</@ofbizContentUrl>"
height="40" width="40"/></a>
+ </#if>
+ </td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="smallImageUrl"
value="${(product.smallImageUrl)?default('')}" size="60" maxlength="255"/>
+ <#if productId?has_content>
+ <div>
+ <span>${uiLabelMap.ProductInsertDefaultImageUrl}:
</span>
+ <a
href="javascript:insertImageName('small','${imageNameSmall}.jpg');"
class="buttontext">.jpg</a>
+ <a
href="javascript:insertImageName('small','${imageNameSmall}.gif');"
class="buttontext">.gif</a>
+ <a href="javascript:insertImageName('small','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
+ </div>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right" valign="top">
+ <div><b>${uiLabelMap.ProductMediumImage}</b></div>
+ <#if (product.mediumImageUrl)?exists>
+ <a
href="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Medium Image"
src="<@ofbizContentUrl>${product.mediumImageUrl}</@ofbizContentUrl>"
height="40" width="40"/></a>
+ </#if>
+ </td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="mediumImageUrl"
value="${(product.mediumImageUrl)?default('')}" size="60" maxlength="255"/>
+ <#if productId?has_content>
+ <div>
+ <span>${uiLabelMap.ProductInsertDefaultImageUrl}:
</span>
+ <a
href="javascript:insertImageName('medium','${imageNameMedium}.jpg');"
class="buttontext">.jpg</a>
+ <a
href="javascript:insertImageName('medium','${imageNameMedium}.gif');"
class="buttontext">.gif</a>
+ <a href="javascript:insertImageName('medium','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
+ </div>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right" valign="top">
+ <div><b>${uiLabelMap.ProductLargeImage}</b></div>
+ <#if (product.largeImageUrl)?exists>
+ <a
href="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Large Image"
src="<@ofbizContentUrl>${product.largeImageUrl}</@ofbizContentUrl>" height="40"
width="40"/></a>
+ </#if>
+ </td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="largeImageUrl"
value="${(product.largeImageUrl)?default('')}" size="60" maxlength="255"/>
+ <#if productId?has_content>
+ <div>
+ <span>${uiLabelMap.ProductInsertDefaultImageUrl}:
</span>
+ <a
href="javascript:insertImageName('large','${imageNameLarge}.jpg');"
class="buttontext">.jpg</a>
+ <a
href="javascript:insertImageName('large','${imageNameLarge}.gif');"
class="buttontext">.gif</a>
+ <a href="javascript:insertImageName('large','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
+ </div>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right" valign="top">
+ <div><b>${uiLabelMap.ProductDetailImage}</b></div>
+ <#if (product.detailImageUrl)?exists>
+ <a
href="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Detail Image"
src="<@ofbizContentUrl>${product.detailImageUrl}</@ofbizContentUrl>"
height="40" width="40"/></a>
+ </#if>
+ </td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="detailImageUrl"
value="${(product.detailImageUrl)?default('')}" size="60" maxlength="255"/>
+ <#if productId?has_content>
+ <div>
+ <span>${uiLabelMap.ProductInsertDefaultImageUrl}:
</span>
+ <a
href="javascript:insertImageName('detail','${imageNameDetail}.jpg');"
class="buttontext">.jpg</a>
+ <a
href="javascript:insertImageName('detail','${imageNameDetail}.gif');"
class="buttontext">.gif</a>
+ <a href="javascript:insertImageName('detail','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
+ </div>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td width="20%" align="right" valign="top">
+ <div><b>${uiLabelMap.ProductOriginalImage}</b></div>
+ <#if (product.originalImageUrl)?exists>
+ <a
href="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>"
target="_blank"><img alt="Original Image"
src="<@ofbizContentUrl>${product.originalImageUrl}</@ofbizContentUrl>"
height="40" width="40"/></a>
+ </#if>
+ </td>
+ <td> </td>
+ <td width="80%" colspan="4" valign="top">
+ <input type="text" name="originalImageUrl"
value="${(product.originalImageUrl)?default('')}" size="60" maxlength="255"/>
+ <#if productId?has_content>
+ <div>
+ <span>${uiLabelMap.ProductInsertDefaultImageUrl}:
</span>
+ <a
href="javascript:insertImageName('original','${imageNameOriginal}.jpg');"
class="buttontext">.jpg</a>
+ <a
href="javascript:insertImageName('original','${imageNameOriginal}.gif');"
class="buttontext">.gif</a>
+ <a href="javascript:insertImageName('original','');"
class="buttontext">${uiLabelMap.CommonClear}</a>
+ </div>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ <td><input type="submit" name="Update"
value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td>
+ <td colspan="3"> </td>
+ </tr>
+ </table>
</form>
<script language="JavaScript" type="text/javascript">
function setUploadUrl(newUrl) {
- var toExec = 'document.imageUploadForm.action="' + newUrl + '";';
- eval(toExec);
+ var toExec = 'document.imageUploadForm.action="' + newUrl + '";';
+ eval(toExec);
};
</script>
<h3>${uiLabelMap.ProductUploadImage}</h3>
