From: "Hans Bakker" <[email protected]>
ok, i looked in he tomahawk theme, ....

we will correct it in the blue-gray theme....

no problem to get upset?

Regardsm'
Hans

FYI:  I saw the same with Tomahawk, did not look at others themes, could you 
please check?

Thanks

Jacques


On Thu, 2011-01-06 at 12:53 +0100, Jacques Le Roux wrote:
From: "Hans Bakker" <[email protected]>
> On Thu, 2011-01-06 at 12:06 +0100, Jacques Le Roux wrote:
>> Hans,
>>
>> Inline, but what about the 2 points below?
>>
>> Lookups buttons for category and product have been removed?
>
> can you tell me which url? i still see them on the main screen?

I have just updated the trunk demo (no need to load data no to compile for 
r1055790
http://svn.apache.org/viewvc?rev=1055790&view=rev )
and cleared the cache (labels). It's the same than locally there...
https://demo-trunk.ofbiz.apache.org/catalog/control/login/main?USERNAME=admin&PASSWORD=ofbiz

>> By default in the quick access dropdown, "-Product Jump-" is replaced by "Product" which means less. I mean, the 1st >> instanceof
>> the
>> dropdown was actually telling us its purpose, now it's less obvious, why 
have you changed it?
>
> can you give a url o sceendump, i do not see it is changed?

Right, only locally, not sure why...

Jacques

>>
>> From: "Hans Bakker" <[email protected]>
>> > Jacques,
>> >
>> > see inline
>> >
>> > On Thu, 2011-01-06 at 10:47 +0100, Jacques Le Roux wrote:
>> >> Sorry Hans,
>> >>
>> >> I think we should discuss this change. It seems we lost many information. 
At first glance:
>> >
>> > We just added an option, existing screens were not changed only the
>> > catalog/category tree is now using jquery which is working much better.
>> >
>> >>
>> >> Lookups buttons for category and product
>> >> By default in the quick access dropdown, "-Product Jump-" is replaced by 
"Product" which means less
>> >> No distinction between catalog and categories
>> >
>> > if you think we need 2 trees displaying the same info...sure w can add a
>> > jquey version for it....doesn;t ever catalog entry have the word
>> > 'catalog' in it?
>>
>> Yes I can agree on this point. But what if a catalog has no the catalog word in it, how the distinction can be made. I'd >> suggest
>> to
>> have different node icons for catalog and categories. And what about changing the 
title to "Browse Catalogs/Categories"?
>>
>> >> Only Id for tree nodes, no names
>> >>
>> >
>> > do not understand that.....
>>
>> Before you had the Id of the category and its name( like Gizmos [100]), now 
only the Id, ie 100
>>
>> >> What were the reasons that push you to change? I can't see the plus!
>> >>
>> >
>> > to be able to have a better catalog tree and search functions in
>> > categories.....we have a customer with many categories with often
>> > duplicates which are difficult to spot without a find....Also they think
>> > the magento interface is much better as ours, so we went a bit in that
>> > direction.
>>
>> I see, with the minor changes it needs it should be ok...
>>
>> Jacques
>>
>> >> Thanks
>> >>
>> >> Jacques
>> >>
>> >> > Author: hansbak
>> >> > Date: Thu Jan  6 08:36:23 2011
>> >> > New Revision: 1055790
>> >> >
>> >> > URL: http://svn.apache.org/viewvc?rev=1055790&view=rev
>> >> > Log:
>> >> > In the catalog manager, replace the category and catalog tree by a 
single jquery tree, add a category option to list and
>> >> > search
>> >> > on
>> >> > categories similar to the new product option
>> >> >
>> >> > Added:
>> >> >    
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy
>> >> >    
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl
>> >> > Modified:
>> >> >    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
>> >> >    
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
>> >> >    ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
>> >> >    ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml
>> >> >    ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
>> >> >    ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
>> >> >
>> >> > Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1055790&r1=1055789&r2=1055790&view=diff
>> >> > 
==============================================================================
>> >> > --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml 
(original)
>> >> > +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jan 
 6 08:36:23 2011
>> >> > @@ -7459,6 +7459,10 @@
>> >> >     <property key="PageTitleFacilityGeoLocation">
>> >> >         <value xml:lang="en">Facility Geo Location</value>
>> >> >     </property>
>> >> > +    <property key="PageTitleFindCategory">
>> >> > +        <value xml:lang="en">Find Category</value>
>> >> > +        <value 
xml:lang="th">ค้นหาหมวดหมู่</value>
>> >> > +    </property>
>> >> >     <property key="PageTitleFindConfigItems">
>> >> >         <value xml:lang="de">Konfigurationsposition suchen</value>
>> >> >         <value xml:lang="en">Find Config Items</value>
>> >> > @@ -7479,7 +7483,7 @@
>> >> >         <value xml:lang="it">Ricerca Stabilimento</value>
>> >> >         <value xml:lang="ro">Cauta Compartimento</value>
>> >> >         <value xml:lang="ru">Поиск объекта</value>
>> >> > -        <value 
xml:lang="th">ค้นหาคลังสินค้</value>
>> >> > +        <value 
xml:lang="th">ค้นหาคลังสินค้า</value>
>> >> >         <value xml:lang="zh">查找场所</value>
>> >> >         <value xml:lang="zh_TW">æŸ¥æ‰¾å ´æ‰€</value>
>> >> >     </property>
>> >> >
>> >> > Added: 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy?rev=1055790&view=auto
>> >> > 
==============================================================================
>> >> > --- 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy 
(added)
>> >> > +++ 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy 
Thu Jan  6 08:36:23 2011
>> >> > @@ -0,0 +1,64 @@
>> >> > +/*
>> >> > + * Licensed to the Apache Software Foundation (ASF) under one
>> >> > + * or more contributor license agreements.  See the NOTICE file
>> >> > + * distributed with this work for additional information
>> >> > + * regarding copyright ownership.  The ASF licenses this file
>> >> > + * to you under the Apache License, Version 2.0 (the
>> >> > + * "License"); you may not use this file except in compliance
>> >> > + * with the License.  You may obtain a copy of the License at
>> >> > + *
>> >> > + * http://www.apache.org/licenses/LICENSE-2.0
>> >> > + *
>> >> > + * Unless required by applicable law or agreed to in writing,
>> >> > + * software distributed under the License is distributed on an
>> >> > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> >> > + * KIND, either express or implied.  See the License for the
>> >> > + * specific language governing permissions and limitations
>> >> > + * under the License.
>> >> > + */
>> >> > +
>> >> > +import org.ofbiz.base.util.*;
>> >> > +import org.ofbiz.product.catalog.*;
>> >> > +import org.ofbiz.product.category.*;
>> >> > +import org.ofbiz.entity.GenericValue;
>> >> > +import javolution.util.FastMap;
>> >> > +import javolution.util.FastList;
>> >> > +import org.ofbiz.base.util.UtilMisc;
>> >> > +import org.ofbiz.base.util.UtilValidate;
>> >> > +import org.ofbiz.entity.GenericValue;
>> >> > +import org.ofbiz.entity.util.EntityUtil;
>> >> > +import javax.servlet.http.HttpSession;
>> >> > +
>> >> > +prodCatalogList = FastList.newInstance();
>> >> > +prodCatalogs = delegator.findByAnd("ProdCatalog");
>> >> > +if (prodCatalogs.size() > 0) {
>> >> > +    for (i = 0; i < prodCatalogs.size(); i++) {
>> >> > +
>> >> > +        prodCatalogMap = FastMap.newInstance();
>> >> > +        prodCatalog = prodCatalogs[i];
>> >> > +        prodCatalogId = prodCatalog.getString("prodCatalogId");
>> >> > +        prodCatalogMap.put("prodCatalogId", prodCatalogId);
>> >> > +        prodCatalogMap.put("catalogName", 
prodCatalog.getString("catalogName"));
>> >> > +        prodCatalogMap.put("catalogName", 
prodCatalog.getString("catalogName"));
>> >> > +
>> >> > +        //root category list of the catalog
>> >> > +        prodCategoryList = 
CatalogWorker.getProdCatalogCategories(request, prodCatalogId, null);
>> >> > +        rootCategoryList = FastList.newInstance();
>> >> > +        if (prodCategoryList.size() > 0) {
>> >> > +            for (j = 0; j < prodCategoryList.size(); j++) {
>> >> > +                prodCategory = prodCategoryList[j];
>> >> > +                rootCategory = delegator.findByPrimaryKey("ProductCategory", 
["productCategoryId" :
>> >> > prodCategory.getString("productCategoryId")]);
>> >> > +                rootCategoryList.add(rootCategory);
>> >> > +            }
>> >> > +        }
>> >> > +
>> >> > +        if (rootCategoryList) {
>> >> > +            catContentWrappers = [:];
>> >> > +            
CategoryWorker.getCategoryContentWrappers(catContentWrappers, rootCategoryList, request);
>> >> > +            prodCatalogMap.put("rootCategoryList", rootCategoryList);
>> >> > +            prodCatalogMap.put("catContentWrappers", 
catContentWrappers);
>> >> > +            prodCatalogList.add(prodCatalogMap);
>> >> > +        }
>> >> > +    }
>> >> > +}
>> >> > +context.prodCatalogList = prodCatalogList;
>> >> >
>> >> > Modified: 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1055790&r1=1055789&r2=1055790&view=diff
>> >> > 
==============================================================================
>> >> > --- 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
>> >> > +++ 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Jan  6 08:36:23 2011
>> >> > @@ -127,6 +127,10 @@ under the License.
>> >> >     </request-map>
>> >> >
>> >> >     <!-- ================ Category Requests ================= -->
>> >> > +    <request-map uri="FindCategory">
>> >> > +        <security https="true" auth="true"/>
>> >> > +        <response name="success" type="view" value="FindCategory"/>
>> >> > +    </request-map>
>> >> >     <request-map uri="EditCategory">
>> >> >         <security https="true" auth="true"/>
>> >> >         <response name="success" type="view" value="EditCategory"/>
>> >> > @@ -3040,6 +3044,7 @@ under the License.
>> >> > <view-map name="exportproducts" type="screen" >> >> > page="component://product/widget/catalog/FindScreens.xml#exportproducts"/>
>> >> >     <view-map name="FindProductById" type="screen"
>> >> > 
page="component://product/widget/catalog/FindScreens.xml#FindProductById"/>
>> >> >
>> >> > +    <view-map name="FindCategory" type="screen"
>> >> > 
page="component://product/widget/catalog/CategoryScreens.xml#FindCategory"/>
>> >> > <view-map name="EditCategory" type="screen" >> >> > page="component://product/widget/catalog/CategoryScreens.xml#EditCategory"/>
>> >> >     <view-map name="EditCategoryContent" type="screen"
>> >> > 
page="component://product/widget/catalog/CategoryScreens.xml#EditCategoryContent"/>
>> >> >     <view-map name="EditCategoryAttributes" type="screen"
>> >> > 
page="component://product/widget/catalog/CategoryScreens.xml#EditCategoryAttributes"/>
>> >> >
>> >> > Added: 
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl?rev=1055790&view=auto
>> >> > 
==============================================================================
>> >> > --- 
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl (added)
>> >> > +++ 
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl Thu Jan  6 08:36:23 
2011
>> >> > @@ -0,0 +1,132 @@
>> >> > +<#--
>> >> > +Licensed to the Apache Software Foundation (ASF) under one
>> >> > +or more contributor license agreements.  See the NOTICE file
>> >> > +distributed with this work for additional information
>> >> > +regarding copyright ownership.  The ASF licenses this file
>> >> > +to you under the Apache License, Version 2.0 (the
>> >> > +"License"); you may not use this file except in compliance
>> >> > +with the License.  You may obtain a copy of the License at
>> >> > +
>> >> > +http://www.apache.org/licenses/LICENSE-2.0
>> >> > +
>> >> > +Unless required by applicable law or agreed to in writing,
>> >> > +software distributed under the License is distributed on an
>> >> > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> >> > +KIND, either express or implied.  See the License for the
>> >> > +specific language governing permissions and limitations
>> >> > +under the License.
>> >> > +-->
>> >> > +<script language="javascript" type="text/javascript"
>> >> > 
src="<@ofbizContentUrl>/images/jquery/ui/development-bundle/external/jquery.cookie.js</@ofbizContentUrl>"></script>
>> >> > +
>> >> > +<script language="javascript" type="text/javascript"
>> >> > 
src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
>> >> > +
>> >> > +<script type="application/javascript">
>> >> > +<#-- some labels are not unescaped in the JSON object so we have to do 
this manuely -->
>> >> > +function unescapeHtmlText(text) {
>> >> > +    return jQuery('<div />').html(text).text()
>> >> > +}
>> >> > +
>> >> > +jQuery(document).ready(createTree());
>> >> > +<#-- creating the JSON Data -->
>> >> > +var rawdata = [
>> >> > +      <#if (prodCatalogList?has_content)>
>> >> > +          <@fillCatalogTree prodCatalogs = prodCatalogList/>
>> >> > +      </#if>
>> >> > +
>> >> > +      <#macro fillCatalogTree prodCatalogs>
>> >> > +          <#if (prodCatalogs?has_content)>
>> >> > +            <#list prodCatalogs as catalog>
>> >> > +                <#assign catalogId = catalog.prodCatalogId/>
>> >> > +                <#assign catalogName = catalog.catalogName/>
>> >> > +                <#assign categoryList = catalog.rootCategoryList/>
>> >> > +                <#assign catContentWrappers = 
catalog.catContentWrappers/>
>> >> > +                {
>> >> > +                <#if catalogId?has_content>
>> >> > +                    "data": {"title" : unescapeHtmlText("${catalogName!catalogId}"), 
"attr": {"href":
>> >> > "<@ofbizUrl>/EditProdCatalog?prodCatalogId=${catalogId}</@ofbizUrl>", 
"onClick" :
>> >> > 
"callDocument('<@ofbizUrl>/EditProdCatalog?prodCatalogId=${catalogId}</@ofbizUrl>');"}},
>> >> > + "attr": {"id" : "${catalogId}", "contentId" : "${catalogId}", "AssocType" : "${catalogId}", >> >> > "fromDate"
>> >> > :
>> >> > "${catalogId}"},
>> >> > +                </#if>
>> >> > +                <#if categoryList?has_content && 
catContentWrappers?has_content>
>> >> > +                    "children": [
>> >> > +                        <@fillCategoryTree childCategoryList = 
categoryList/>
>> >> > +                    ]
>> >> > +                </#if>
>> >> > +                <#if catalog_has_next>
>> >> > +                },
>> >> > +                <#else>
>> >> > +                }
>> >> > +                </#if>
>> >> > +            </#list>
>> >> > +          </#if>
>> >> > +        </#macro>
>> >> > +
>> >> > +        <#macro fillCategoryTree childCategoryList>
>> >> > +            <#if childCategoryList?exists>
>> >> > +                <#list childCategoryList as childCategory>
>> >> > +                    {
>> >> > +                    <#local productCategoryId = 
childCategory.productCategoryId/>
>> >> > +                    <#if childCategory.categoryName?has_content>
>> >> > +                        <#local categoryName = 
childCategory.categoryName>
>> >> > +                    <#elseif childCategory.description?has_content >
>> >> > +                        <#local categoryName = 
childCategory.description>
>> >> > +                    <#else>
>> >> > +                        <#local categoryName = 
childCategory.productCategoryId>
>> >> > +                    </#if>
>> >> > +                    <#local childCategorys =
>> >> > 
Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request,
>> >> > "childCategoryList", productCategoryId, true)>
>> >> > +                    "data": {"title" : unescapeHtmlText("${categoryName}"), 
"attr": {"href":
>> >> > "<@ofbizUrl>/EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>", 
"onClick" :
>> >> > 
"callDocument('<@ofbizUrl>/EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>');"}},
>> >> > +                    "attr": {"id" : "${productCategoryId}", "contentId" : 
"${productCategoryId}", "AssocType" :
>> >> > "${productCategoryId}", "fromDate" : "${productCategoryId}"},
>> >> > +                    <#if childCategoryList?exists>
>> >> > +                        "children": [
>> >> > +                            <@fillCategoryTree childCategoryList = 
childCategorys/>
>> >> > +                        ]
>> >> > +                    </#if>
>> >> > +                    <#if childCategory_has_next>
>> >> > +                        },
>> >> > +                    <#else>
>> >> > +                        }
>> >> > +                    </#if>
>> >> > +                </#list>
>> >> > +            </#if>
>> >> > +        </#macro>
>> >> > +     ];
>> >> > +
>> >> > + 
<#-------------------------------------------------------------------------------------create 
Tree-->
>> >> > +  function createTree() {
>> >> > +    jQuery(function () {
>> >> > +        var pageUrl = window.location.href
>> >> > +        if ((pageUrl.indexOf("productCategoryId") == -1) && 
(pageUrl.indexOf("showProductCategoryId") == -1)) {
>> >> > +            $.cookie('jstree_select', null);
>> >> > +            $.cookie('jstree_open', null);
>> >> > +        }
>> >> > +        jQuery("#tree").jstree({
>> >> > +        "plugins" : [ "themes", "json_data", "cookies", "ui"],
>> >> > +            "json_data" : {
>> >> > +                "data" : rawdata
>> >> > +            },
>> >> > +            "themes" : {
>> >> > +                "icons" : true
>> >> > +            },
>> >> > +            "cookies" : {
>> >> > +                "save_opened" : false
>> >> > +            }
>> >> > +        });
>> >> > +    });
>> >> > +  }
>> >> > +
>> >> > +  function callDocument(url) {
>> >> > +    $(location).attr('href', url);
>> >> > +  }
>> >> > +
>> >> > +</script>
>> >> > +
>> >> > +<style>
>> >> > +<#if tabButtonItem?has_content>
>> >> > +    <#if 
tabButtonItem=="LookupContentTree"||tabButtonItem=="LookupDetailContentTree">
>> >> > +        body{background:none;}
>> >> > +        .left-border{float:left;width:25%;}
>> >> > +        .contentarea{margin: 0 0 0 0.5em;padding:0 0 0 0.5em;}
>> >> > +        .leftonly{float:none;min-height:25em;}
>> >> > +    </#if>
>> >> > +</#if>
>> >> > +</style>
>> >> > +
>> >> > +<div id="tree"></div>
>> >> >
>> >> > Modified: 
ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=1055790&r1=1055789&r2=1055790&view=diff
>> >> > 
==============================================================================
>> >> > --- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml 
(original)
>> >> > +++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml 
Thu Jan  6 08:36:23 2011
>> >> > @@ -20,6 +20,7 @@ under the License.
>> >> > <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
>> >> > 
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
>> >> >     <menu name="CatalogAppBar" title="${uiLabelMap.ProductCatalogManager}" 
extends="CommonAppBarMenu"
>> >> > extends-resource="component://common/widget/CommonMenus.xml">
>> >> >         <menu-item name="products" title="${uiLabelMap.ProductProducts}"><link 
target="FindProduct"/></menu-item>
>> >> > +        <menu-item name="categories" title="${uiLabelMap.ProductCategories}"><link 
target="FindCategory"/></menu-item>
>> >> >         <menu-item name="featurecats" 
title="${uiLabelMap.ProductFeatureCats}"><link
>> >> > target="EditFeatureCategories"/></menu-item>
>> >> >         <menu-item name="promos" title="${uiLabelMap.ProductPromos}"><link 
target="FindProductPromo"/></menu-item>
>> >> >         <menu-item name="pricerules" 
title="${uiLabelMap.ProductPriceRules}"><link
>> >> > target="FindProductPriceRules"/></menu-item>
>> >> >
>> >> > Modified: 
ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml?rev=1055790&r1=1055789&r2=1055790&view=diff
>> >> > 
==============================================================================
>> >> > --- ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml 
(original)
>> >> > +++ ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml 
Thu Jan  6 08:36:23 2011
>> >> > @@ -220,4 +220,38 @@ under the License.
>> >> >         </field>
>> >> >         <field name="description"><display/></field>
>> >> >     </form>
>> >> > +
>> >> > +    <form name="FindCategory" type="single" target="FindCategory" title="" 
default-map-name="category"
>> >> > +        header-row-style="header-row" 
default-table-style="basic-table">
>> >> > + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query >> >> > will
>> >> > be
>> >> > done --></field>
>> >> > +        <field name="productCategoryId" 
title="${uiLabelMap.ProductCategoryId}"><text-find/></field>
>> >> > +        <field name="categoryName" 
title="${uiLabelMap.FormFieldTitle_categoryName}"><text-find/></field>
>> >> > +        <field name="submitButton" title="${uiLabelMap.CommonFind}" 
widget-style="smallSubmit">
>> >> > +            <submit button-type="button"/>
>> >> > +        </field>
>> >> > +    </form>
>> >> > +
>> >> > +    <form name="ListCategory" list-name="listIt" target="" title="" type="list" 
paginate-target="FindCategory"
>> >> > +        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" 
header-row-style="header-row-2">
>> >> > +        <actions>
>> >> > +            <set field="entityName" value="ProductCategory"/>
>> >> > +            <service service-name="performFind" result-map="result" 
result-map-list="listIt">
>> >> > +                <field-map field-name="inputFields" 
from-field="requestParameters"/>
>> >> > +                <field-map field-name="entityName" 
from-field="entityName"/>
>> >> > +                <field-map field-name="orderBy" 
from-field="parameters.sortField"/>
>> >> > +                <field-map field-name="viewIndex" 
from-field="viewIndex"/>
>> >> > +                <field-map field-name="viewSize" 
from-field="viewSize"/>
>> >> > +            </service>
>> >> > +        </actions>
>> >> > +        <field name="productCategoryId" sort-field="true">
>> >> > +            <hyperlink also-hidden="false" description="${productCategoryId}" 
target="EditCategory">
>> >> > +                <parameter param-name="productCategoryId"/>
>> >> > +            </hyperlink>
>> >> > +        </field>
>> >> > +
>> >> > +        <field name="productCategoryTypeId" 
sort-field="true"><display/></field>
>> >> > +        <field name="primaryParentCategoryId" 
sort-field="true"><display/></field>
>> >> > +        <field name="categoryName" sort-field="true"><display/></field>
>> >> > +        <field name="description" sort-field="true"><display/></field>
>> >> > +    </form>
>> >> > </forms>
>> >> >
>> >> > Modified: 
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1055790&r1=1055789&r2=1055790&view=diff
>> >> > 
==============================================================================
>> >> > --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml 
(original)
>> >> > +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml 
Thu Jan  6 08:36:23 2011
>> >> > @@ -40,7 +40,7 @@ under the License.
>> >> >                     </decorator-section>
>> >> >                     <decorator-section name="left-column">
>> >> >                         <include-screen name="leftbar" 
location="component://product/widget/catalog/CommonScreens.xml"/>
>> >> > -                    </decorator-section>
>> >> > +                    </decorator-section>
>> >> >                     <decorator-section name="body">
>> >> >                         <section>
>> >> >                             <!-- do check for CATALOG, _VIEW permission 
-->
>> >> > @@ -80,11 +80,53 @@ under the License.
>> >> >             </widgets>
>> >> >         </section>
>> >> >     </screen>
>> >> > +    <screen name="FindCategory">
>> >> > +        <section>
>> >> > +            <actions>
>> >> > +                <set field="titleProperty" 
value="PageTitleFindCategory"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> > +                <set field="tabButtonItem" value="FindCategory"/>
>> >> > +                <set field="labelTitleProperty" 
value="ProductCategory"/>
>> >> > +            </actions>
>> >> > +            <widgets>
>> >> > +                <decorator-screen name="CommonCategoryDecorator">
>> >> > +                    <decorator-section name="body">
>> >> > +                        <section>
>> >> > +                            <widgets>
>> >> > +                                <decorator-screen 
name="FindScreenDecorator"
>> >> > location="component://common/widget/CommonScreens.xml">
>> >> > +                                    <decorator-section name="menu-bar">
>> >> > +                                        <container style="button-bar">
>> >> > +                                            <link target="EditCategory" 
text="${uiLabelMap.ProductNewCategory}"
>> >> > style="buttontext
>> >> > create"/>
>> >> > +                                            <link 
target="createProductInCategoryStart"
>> >> > text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext 
create">
>> >> > +                                                <parameter 
param-name="productCategoryId"/>
>> >> > +                                            </link>
>> >> > +                                            <link target="advancedsearch" 
text="${uiLabelMap.ProductSearchInCategory}"
>> >> > style="buttontext search">
>> >> > + <parameter param-name="SEARCH_CATEGORY_ID" >> >> > from-field="productCategoryId"/>
>> >> > +                                            </link>
>> >> > +                                            <link 
target="/ecommerce/control/category" url-mode="plain"
>> >> > text="${uiLabelMap.ProductCategoryPage}" style="buttontext website">
>> >> > +                                                <parameter param-name="category_id" 
from-field="productCategoryId"/>
>> >> > +                                            </link>
>> >> > +                                        </container>
>> >> > +                                    </decorator-section>
>> >> > +                                    <decorator-section 
name="search-options">
>> >> > +                                        <include-form 
name="FindCategory"
>> >> > location="component://product/widget/catalog/CategoryForms.xml"/>
>> >> > +                                    </decorator-section>
>> >> > +                                    <decorator-section 
name="search-results">
>> >> > +                                        <include-form 
name="ListCategory"
>> >> > location="component://product/widget/catalog/CategoryForms.xml"/>
>> >> > +                                    </decorator-section>
>> >> > +                                </decorator-screen>
>> >> > +                            </widgets>
>> >> > +                        </section>
>> >> > +                    </decorator-section>
>> >> > +                </decorator-screen>
>> >> > +            </widgets>
>> >> > +        </section>
>> >> > +    </screen>
>> >> >     <screen name="EditCategory">
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditProductCategories"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" value="EditCategory"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCategory"/>
>> >> >
>> >> > @@ -112,7 +154,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryContent"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" value="EditCategoryContent"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCategoryContent"/>
>> >> >
>> >> > @@ -149,7 +191,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryContentContent"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" value="EditCategoryContent"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCategoryContent"/>
>> >> >
>> >> > @@ -193,7 +235,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryRollup"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" value="EditCategoryRollup"/>
>> >> >                 <set field="labelTitleProperty" value="ProductRollup"/>
>> >> >                 <set field="productCategoryId" 
from-field="parameters.showProductCategoryId"/>
>> >> > @@ -223,7 +265,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryProducts"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" 
value="EditCategoryProducts"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductProducts"/>
>> >> >
>> >> > @@ -246,7 +288,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryProductCatalogs"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" 
value="EditCategoryProdCatalogs"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCatalogs"/>
>> >> >
>> >> > @@ -282,7 +324,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryFeatureCategories"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" 
value="EditCategoryFeatureCats"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductFeatureCategoriesGroups"/>
>> >> >
>> >> > @@ -320,7 +362,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryParties"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" value="EditCategoryParties"/>
>> >> >                 <set field="labelTitleProperty" value="PartyParties"/>
>> >> >
>> >> > @@ -352,7 +394,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditCategoryAttributes"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" 
value="EditCategoryAttributes"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCategoryAttributes"/>
>> >> >                 <set field="productCategoryId" 
from-field="parameters.productCategoryId"/>
>> >> > @@ -380,7 +422,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleCreateProductCategoryStart"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCreateProductInCategory"/>
>> >> >
>> >> >                 <set field="productCategoryId" 
from-field="parameters.productCategoryId"/>
>> >> > @@ -401,7 +443,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleCreateProductCategoryCheckExisting"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCreateProductInCategory"/>
>> >> >
>> >> >                 <set field="productCategoryId" 
from-field="parameters.productCategoryId"/>
>> >> > @@ -426,7 +468,7 @@ under the License.
>> >> >         <section>
>> >> >             <actions>
>> >> >                 <set field="titleProperty" 
value="PageTitleEditProductCategoryLink"/>
>> >> > -                <set field="headerItem" value="category"/>
>> >> > +                <set field="headerItem" value="categories"/>
>> >> >                 <set field="tabButtonItem" 
value="EditProductCategoryLinks"/>
>> >> >                 <set field="labelTitleProperty" 
value="ProductCategoryLinks"/>
>> >> >
>> >> >
>> >> > Modified: 
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
>> >> > URL:
>> >> > 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1055790&r1=1055789&r2=1055790&view=diff
>> >> > 
==============================================================================
>> >> > --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml 
(original)
>> >> > +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml 
Thu Jan  6 08:36:23 2011
>> >> > @@ -329,8 +329,9 @@ under the License.
>> >> >         <section>
>> >> >             <widgets>
>> >> >                 <include-screen name="keywordsearchbox"/>
>> >> > -                <include-screen name="sidecatalogs"/>
>> >> > -                <include-screen name="sidedeepcategory"/>
>> >> > +                <!--<include-screen name="sidecatalogs"/>
>> >> > +                <include-screen name="sidedeepcategory"/>-->
>> >> > +                <include-screen name="categorytree"/>
>> >> >                 <include-screen name="miniproductlist"/>
>> >> >             </widgets>
>> >> >         </section>
>> >> > @@ -425,7 +426,22 @@ under the License.
>> >> >             </widgets>
>> >> >         </section>
>> >> >     </screen>
>> >> > -
>> >> > +
>> >> > +    <screen name="categorytree">
>> >> > +        <section>
>> >> > +            <actions>
>> >> > +                <set field="layoutSettings.javaScripts[+0]" 
value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
>> >> > +                <script
>> >> > 
location="component://product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy"></script>
>> >> > +            </actions>
>> >> > +            <widgets>
>> >> > +                <screenlet id="ProductBrowseCategoriesPanel" 
title="${uiLabelMap.ProductBrowseCategories}"
>> >> > collapsible="true">
>> >> > +                    <container id="EditDocumentTree"/>
>> >> > +                    <platform-specific><html><html-template
>> >> > 
location="component://product/webapp/catalog/category/CategoryTree.ftl"/></html></platform-specific>
>> >> > +                </screenlet>
>> >> > +            </widgets>
>> >> > +        </section>
>> >> > +    </screen>
>> >> > +
>> >> >     <screen name="main">
>> >> >         <section>
>> >> >             <actions>
>> >> >
>> >> >
>> >>
>> >>
>> >
>> > -- >> > Ofbiz on twitter: http://twitter.com/apache_ofbiz
>> > Myself on twitter: http://twitter.com/hansbak
>> > Antwebsystems.com: Quality services for competitive rates.
>> >
>>
>>
>
> -- > Ofbiz on twitter: http://twitter.com/apache_ofbiz
> Myself on twitter: http://twitter.com/hansbak
> Antwebsystems.com: Quality services for competitive rates.
>



--
Ofbiz on twitter: http://twitter.com/apache_ofbiz
Myself on twitter: http://twitter.com/hansbak
Antwebsystems.com: Quality services for competitive rates.



Reply via email to