You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2007/12/29 01:18:39 UTC
svn commit: r607360 - in /ofbiz/trunk/applications/product:
webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
widget/catalog/ThesaurusScreens.xml
Author: mrisaliti
Date: Fri Dec 28 16:18:38 2007
New Revision: 607360
URL: http://svn.apache.org/viewvc?rev=607360&view=rev
Log:
Product Thesaurus forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1544)
Modified:
ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml
Modified: ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=607360&r1=607359&r2=607360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Fri Dec 28 16:18:38 2007
@@ -16,56 +16,71 @@
specific language governing permissions and limitations
under the License.
-->
-<h1>${uiLabelMap.ProductAlternateKeyWordThesaurus}</h1>
-<form method="post" action="<@o...@ofbizUrl>">
- <div class="tabletext">
- ${uiLabelMap.ProductKeyword} :<input type="text" name="enteredKeyword" size="10" class="inputBox"/>
- ${uiLabelMap.ProductAlternate} :<input type="text" name="alternateKeyword" size="10" class="inputBox"/>
- ${uiLabelMap.ProductRelationship} :<select name="relationshipEnumId" class="selectBox"><#list relationshipEnums as relationshipEnum><option value="${relationshipEnum.enumId}">${relationshipEnum.get("description",locale)}</option></#list></select>
- <input type="submit" value="${uiLabelMap.CommonAdd}"/>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.ProductAlternateKeyWordThesaurus}</h3>
</div>
-</form>
-
-<div class="tabletext">
- <#list letterList as letter>
- <#if letter == firstLetter><#assign highlight=true><#else><#assign highlight=false></#if>
- <a href="<@o...@ofbizUrl>" class="buttontext"><#if highlight>[</#if>[${letter}]<#if highlight>]</#if></a>
- </#list>
-</div>
-<br/>
-
-<#assign lastkeyword = "">
-<table border="1" cellpadding="2" cellspacing="0">
- <#list keywordThesauruses as keyword>
- <#assign relationship = keyword.getRelatedOneCache("RelationshipEnumeration")>
- <#if keyword.enteredKeyword == lastkeyword><#assign sameRow=true><#else><#assign lastkeyword=keyword.enteredKeyword><#assign sameRow=false></#if>
- <#if sameRow == false>
- <#if (keyword_index > 0)>
- </td>
- </tr>
- </#if>
- <tr>
- <td>
- <form method="post" action="<@o...@ofbizUrl>">
- <div class="tabletext">
- <b>${keyword.enteredKeyword}</b>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDeleteAll}]</a>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>">
+ <div>
+ <span class="label">${uiLabelMap.ProductKeyword}</span><input type="text" name="enteredKeyword" size="10"/>
+ <span class="label">${uiLabelMap.ProductAlternate}</span><input type="text" name="alternateKeyword" size="10"/>
+ <span class="label">${uiLabelMap.ProductRelationship}</span><select name="relationshipEnumId">
+ <#list relationshipEnums as relationshipEnum>
+ <option value="${relationshipEnum.enumId}">${relationshipEnum.get("description",locale)}</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonAdd}"/>
+ </div>
+ </form>
+ <div>
+ <#list letterList as letter>
+ <#if letter == firstLetter><#assign highlight=true><#else><#assign highlight=false></#if>
+ <a href="<@o...@ofbizUrl>" class="buttontext"><#if highlight>[</#if>${letter}<#if highlight>]</#if></a>
+ </#list>
+ </div>
+ <br/>
+ <#assign lastkeyword = "">
+ <table cellspacing="0" class="basic-table">
+ <#assign rowClass = "2">
+ <#list keywordThesauruses as keyword>
+ <#assign relationship = keyword.getRelatedOneCache("RelationshipEnumeration")>
+ <#if keyword.enteredKeyword == lastkeyword><#assign sameRow=true><#else><#assign lastkeyword=keyword.enteredKeyword><#assign sameRow=false></#if>
+ <#if sameRow == false>
+ <#if (keyword_index > 0)>
+ </td>
+ </tr>
+ </#if>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td>
+ <form method="post" action="<@o...@ofbizUrl>">
+ <div>
+ ${keyword.enteredKeyword}
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDeleteAll}</a>
+ </div>
+ <div>
+ <input type="hidden" name="enteredKeyword" value=${keyword.enteredKeyword}>
+ <span class="label">${uiLabelMap.ProductAlternate}</span><input type="text" name="alternateKeyword" size="10">
+ <span class="label">${uiLabelMap.ProductRelationship}</span><select name="relationshipEnumId"><#list relationshipEnums as relationshipEnum><option value="${relationshipEnum.enumId}">${relationshipEnum.get("description",locale)}</option></#list></select>
+ <input type="submit" value="${uiLabelMap.CommonAdd}">
+ </div>
+ </form>
+ </td>
+ <td align="left">
+ </#if>
+ <div>
+ <a href="<@o...@ofbizUrl>" class="buttontext">X</a>
+ ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)})
</div>
- <div class="tabletext">
- <input type="hidden" name="enteredKeyword" value=${keyword.enteredKeyword}>
- ${uiLabelMap.ProductAlternate} : <input type="text" name="alternateKeyword" size="10">
- ${uiLabelMap.ProductRelationship} :<select name="relationshipEnumId" class="selectBox"><#list relationshipEnums as relationshipEnum><option value="${relationshipEnum.enumId}">${relationshipEnum.get("description",locale)}</option></#list></select>
- <input type="submit" value="${uiLabelMap.CommonAdd}">
- </div>
- </form>
- </td>
- <td align="left">
- </#if>
- <div class="tabletext">
- <a href="<@o...@ofbizUrl>" class="buttontext">[X]</a>
- <b>${keyword.alternateKeyword}</b> (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)})
- </div>
- </#list>
- </td>
- </tr>
-</table>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
+ </#list>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml?rev=607360&r1=607359&r2=607360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml Fri Dec 28 16:18:38 2007
@@ -50,7 +50,7 @@
<screen name="EditKeywordThesaurus">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditProductStore"/>
+ <set field="titleProperty" value="ProductAlternateKeyWordThesaurus"/>
<set field="tabButtonItem" value="EditKeywordThesaurus"/>
<set field="headerItem" value="thesaurus"/>