svn commit: r1160101 - in /ofbiz/trunk: applications/commonext/widget/ applications/content/data/ applications/content/webapp/co
Locked
svn commit: r1160101 - in /ofbiz/trunk: applications/commonext/widget/ applications/content/data/ applications/content/webapp/co
 
|
Author: hansbak
Date: Mon Aug 22 03:35:18 2011 New Revision: 1160101 URL: http://svn.apache.org/viewvc?rev=1160101&view=rev Log: the help text was dependent on the websiteId which is now removed. changed it to the component name which is a better choice anyway Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml ofbiz/trunk/applications/content/data/ContentHelpData.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml ofbiz/trunk/applications/order/data/OrderHelpData.xml ofbiz/trunk/applications/product/data/ProductHelpData.xml ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreHelpData.xml ofbiz/trunk/specialpurpose/scrum/data/scrumHelpData.xml ofbiz/trunk/themes/bizznesstime/includes/header.ftl ofbiz/trunk/themes/bluelight/includes/header.ftl ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl ofbiz/trunk/themes/flatgrey/includes/header.ftl ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Mon Aug 22 03:35:18 2011 @@ -44,7 +44,8 @@ under the License. <set field="layoutSettings.middleTopMessage3" value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16) + " " + resultNote.lastSystemInfoNote3.noteInfo:""}"/> <set field="layoutSettings.middleTopLink3" value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&amp;id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/> <!-- Help link actions --> - <set field="helpTopic" value="${groovy: webSiteId + '_' + requestAttributes._CURRENT_VIEW_}"/> + <!--<set field="helpTopic" value="${groovy: webSiteId + '_' + requestAttributes._CURRENT_VIEW_}"/>--> + <set field="helpTopic" value="${groovy: parameters.componentName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/> <entity-and list="pageAvail" entity-name="ContentAssoc"> <field-map field-name="mapKey" from-field="helpTopic"/> </entity-and> Modified: ofbiz/trunk/applications/content/data/ContentHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentHelpData.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/ContentHelpData.xml (original) +++ ofbiz/trunk/applications/content/data/ContentHelpData.xml Mon Aug 22 03:35:18 2011 @@ -59,6 +59,6 @@ under the License. <DataResource dataResourceId="CONTENT_SITE_FindWeb" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="CONTENT_SITE_FindWeb" contentTypeId="DOCUMENT" contentName="Content Main Help" templateDataResourceId="HELP_TEMPL" dataResourceId="CONTENT_SITE_FindWeb" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="CONTENT_SITE_FindWebSite"/> + <ContentAssoc contentId="HELP_CONTENT" contentIdTo="CONTENT_SITE_FindWeb" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="CONTENT_FindWebSite"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml Mon Aug 22 03:35:18 2011 @@ -25,11 +25,6 @@ under the License. <description>Content Manager Module of the Open For Business Project</description> <context-param> - <param-name>webSiteId</param-name> - <param-value>CONTENT_SITE</param-value> - <description>A unique ID used to look up the WebSite entity</description> - </context-param> - <context-param> <param-name>entityDelegatorName</param-name> <param-value>default</param-value> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> Modified: ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml (original) +++ ofbiz/trunk/applications/humanres/data/HumanResHelpData.xml Mon Aug 22 03:35:18 2011 @@ -28,12 +28,12 @@ under the License. <DataResource dataResourceId="HR_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/humanres/data/helpdata/HELP_HR_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Main Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HR_main" contentTypeId="DOCUMENT" contentName="Human Resources Main." templateDataResourceId="HELP_TEMPL" dataResourceId="HR_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_HR" contentIdTo="HR_main" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HR_main"/> + <ContentAssoc contentId="HELP_HR" contentIdTo="HR_main" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HUMANRES_main"/> <!-- training --> <DataResource dataResourceId="HR_training" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/humanres/data/helpdata/HELP_HR_training.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Training Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HR_training" contentTypeId="DOCUMENT" contentName="Training." templateDataResourceId="HELP_TEMPL" dataResourceId="HR_training" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HR_training"/> + <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HUMANRES_training"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/order/data/OrderHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderHelpData.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/applications/order/data/OrderHelpData.xml (original) +++ ofbiz/trunk/applications/order/data/OrderHelpData.xml Mon Aug 22 03:35:18 2011 @@ -29,11 +29,11 @@ under the License. <DataResource dataResourceId="HELP_ORDER_VIEW" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/order/data/helpdata/HELP_ORDER_View.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_ORDER_VIEW" contentTypeId="DOCUMENT" contentName="Order View Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ORDER_VIEW" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_VIEW" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="OrderEntry_orderview"/> + <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_VIEW" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ORDER_overview"/> <!-- Reports --> <DataResource dataResourceId="HELP_ORDER_REPORT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/order/data/helpdata/HELP_ORDER_Report.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_ORDER_REPORT" contentTypeId="DOCUMENT" contentName="Order Reports Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ORDER_REPORT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_REPORT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="OrderEntry_OrderPurchaseReportOptions"/> + <ContentAssoc contentId="HELP_ORDER" contentIdTo="HELP_ORDER_REPORT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ORDER_OrderPurchaseReportOptions"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/product/data/ProductHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductHelpData.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/applications/product/data/ProductHelpData.xml (original) +++ ofbiz/trunk/applications/product/data/ProductHelpData.xml Mon Aug 22 03:35:18 2011 @@ -24,11 +24,11 @@ under the License. <DataResource dataResourceId="PRODCATALOG_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/product/data/helpdata/HELP_PRODCATALOG_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="PRODCATALOG_main" contentTypeId="DOCUMENT" contentName="Main Catalog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="PRODCATALOG_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_PRODUCT" contentIdTo="PRODCATALOG_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="PRODCATALOG_main"/> + <ContentAssoc contentId="HELP_PRODUCT" contentIdTo="PRODCATALOG_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="PRODUCT_main"/> <!-- Image Management --> <DataResource dataResourceId="IMAGEMANAGEMENT_MAIN" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Image Management" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="IMAGEMANAGEMENT_MAIN" contentTypeId="DOCUMENT" contentName="Image Management" templateDataResourceId="HELP_TEMPL" dataResourceId="IMAGEMANAGEMENT_MAIN" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="PRODCATALOG_main" contentIdTo="IMAGEMANAGEMENT_MAIN" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="01" mapKey="PRODCATALOG_Imagemanagement"/> + <ContentAssoc contentId="PRODCATALOG_main" contentIdTo="IMAGEMANAGEMENT_MAIN" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="01" mapKey="PRODUCT_Imagemanagement"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreHelpData.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreHelpData.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreHelpData.xml Mon Aug 22 03:35:18 2011 @@ -24,53 +24,53 @@ under the License. dataResourceName="eBay Store" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_EBAY_STORE" contentTypeId="DOCUMENT" contentName="eBay Store" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_EBAY_STORE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EBAY_STORE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_main"/> + <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EBAY_STORE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_main"/> <DataResource dataResourceId="EBAY_NewEbayAccount" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_NewEbayAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_NewEbayAccount" contentTypeId="DOCUMENT" contentName="EBay store new ebay Account" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_NewEbayAccount" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_NewEbayAccount" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_NewEbayAccount"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_NewEbayAccount" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_NewEbayAccount"/> <DataResource dataResourceId="EBAY_StoreSetting" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_StoreSetting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_StoreSetting" contentTypeId="DOCUMENT" contentName="EBay store setting" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_StoreSetting" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_StoreSetting" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_ebayStoreDetail"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_StoreSetting" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_ebayStoreDetail"/> <DataResource dataResourceId="EBAY_ExpCatToEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_ExpCatToEbay" contentTypeId="DOCUMENT" contentName="EBay export categories to store" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ExpCatToEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_ExpCatToEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_exportCategoryEbayStore"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_ExpCatToEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_exportCategoryEbayStore"/> <!-- ebay feedback --> <DataResource dataResourceId="EBAY_LeaveFeedback" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_LeaveFeedback" contentTypeId="DOCUMENT" contentName="EBay Leave Feedback" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_LeaveFeedback" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_LeaveFeedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_LeaveFeedback"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_LeaveFeedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_LeaveFeedback"/> <DataResource dataResourceId="EBAY_Feedback" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_Feedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_Feedback" contentTypeId="DOCUMENT" contentName="EBay Feedback" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_Feedback" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_Feedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_Feedback"/> + <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_Feedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_Feedback"/> <DataResource dataResourceId="EBAY_AutoPref" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_AutoPref.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_AutoPref" contentTypeId="DOCUMENT" contentName="EBay Automation Preferences" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AutoPref" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_AutoPref" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_AutomationPreferences"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_AutoPref" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_AutomationPreferences"/> <!-- block out of stock --> <DataResource dataResourceId="EBAY_BlockItem" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_BlockItemOutStock.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_BlockItem" contentTypeId="DOCUMENT" contentName="Block item that out of stock on eBay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_BlockItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_BlockItem" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_blockItemOutOfStock"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_BlockItem" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_blockItemOutOfStock"/> <!-- ebay product inventory --> <DataResource dataResourceId="EBAY_ProdInventory" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ProductInventory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_ProdInventory" contentTypeId="DOCUMENT" contentName="handle ebay store inventory by ofbiz inventory" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ProdInventory" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_ProdInventory" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_ebayStoreInventory"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_ProdInventory" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_ebayStoreInventory"/> <DataResource dataResourceId="EBAY_reserveProd" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ReserveProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_reserveProd" contentTypeId="DOCUMENT" contentName="reserve product from ofbiz inventory" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_reserveProd" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_reserveProd" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_STORE_reserveEbayProductInventory"/> + <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_reserveProd" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_reserveEbayProductInventory"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/scrum/data/scrumHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/data/scrumHelpData.xml?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/data/scrumHelpData.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/data/scrumHelpData.xml Mon Aug 22 03:35:18 2011 @@ -24,170 +24,170 @@ dataResourceName="SCRUM Help system root" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_SCRUM" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SCRUM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Scrum" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SCRUM" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" mapKey="scrumSite_Sprints"/> + <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SCRUM" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" mapKey="SCRUM_Sprints"/> <!-- === Project === --> <DataResource dataResourceId="HELP_SCRUM_PROJECT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_Project.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Project" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_SCRUM_PROJECT" contentTypeId="DOCUMENT" contentName="Project" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SCRUM_PROJECT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PROJECT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_viewScrumProject"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PROJECT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_viewScrumProject"/> <DataResource dataResourceId="HELP_SCRUM_PRODUCT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductView.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="HELP_SCRUM_PRODUCT" contentTypeId="DOCUMENT" contentName="Product" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SCRUM_PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_main"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_main"/> <DataResource dataResourceId="SCRUM_CreteScrProj" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_CreateScrumProject.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Project Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_CreteScrProj" contentTypeId="DOCUMENT" contentName="Create Scrum Project Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_CreteScrProj" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_CreteScrProj" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_editScrumProject"/> + <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_CreteScrProj" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_editScrumProject"/> <DataResource dataResourceId="SCRUM_AddProdBacklog" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Backlog Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_AddProdBacklog" contentTypeId="DOCUMENT" contentName="Create Scrum Product Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddProdBacklog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProdBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddProdBacklog"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProdBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddProdBacklog"/> <DataResource dataResourceId="SCRUM_EditProduct" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Scrum Product Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditProduct" contentTypeId="DOCUMENT" contentName="Create Scrum Product Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddProdBacklog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProduct"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProduct"/> <DataResource dataResourceId="SCRUM_EditProBacklog" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Backlog Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditProBacklog" contentTypeId="DOCUMENT" contentName="Edit Scrum Product Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditProBacklog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProdBacklog"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProdBacklog"/> <DataResource dataResourceId="SCRUM_EDIT_SPB" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Sprint Backlog Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EDIT_SPB" contentTypeId="DOCUMENT" contentName="Edit Sprint Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EDIT_SPB" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EDIT_SPB" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditSprintBacklog"/> + <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EDIT_SPB" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditSprintBacklog"/> <DataResource dataResourceId="SCRUM_EditSprint" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Sprint" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditSprint" contentTypeId="DOCUMENT" contentName="Edit Sprint" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditSprint" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditSprint"/> + <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditSprint"/> <DataResource dataResourceId="SCRUM_AddSprintBL" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprintBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Add Sprint Backlog Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_AddSprintBL" contentTypeId="DOCUMENT" contentName="Add Sprint Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddSprintBL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprintBL" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddSprintBacklog"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprintBL" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddSprintBacklog"/> <DataResource dataResourceId="SCRUM_AddSprint" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Add Sprint Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_AddSprint" contentTypeId="DOCUMENT" contentName="Add Sprint Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddSprint" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddSprint"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddSprint"/> <DataResource dataResourceId="SCRUM_AddProduct" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_AddProduct" contentTypeId="DOCUMENT" contentName="Create Scrum Product Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddProduct" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddProduct"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddProduct"/> <DataResource dataResourceId="SCRUM_SprintList" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintList.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint List Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_SprintList" contentTypeId="DOCUMENT" contentName="Sprint List Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_SprintList" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_SprintList" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_SprintList"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_SprintList" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_SprintList"/> <DataResource dataResourceId="SCRUM_ViewSprint" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint View Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ViewSprint" contentTypeId="DOCUMENT" contentName="Sprint View Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewSprint" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_ViewSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewSprint"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_ViewSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewSprint"/> <DataResource dataResourceId="SCRUM_OpenTest" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_OpenTest.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Open Test" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_OpenTest" contentTypeId="DOCUMENT" contentName="Open Test" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_OpenTest" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_OpenTest" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_openTest"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_OpenTest" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_openTest"/> <DataResource dataResourceId="SCRUM_TaskView" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_TaskView.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Task" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_TaskView" contentTypeId="DOCUMENT" contentName="View Task" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_TaskView" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_TaskView" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_taskView"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_TaskView" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_taskView"/> <DataResource dataResourceId="SCRUM_FindResource" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindResource.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Member" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_FindResource" contentTypeId="DOCUMENT" contentName="Member" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_FindResource" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindResource" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_FindResource"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindResource" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_FindResource"/> <DataResource dataResourceId="SCRUM_MyWork" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_MyWork.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MyWork" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_MyWork" contentTypeId="DOCUMENT" contentName="MyWork" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_MyWork" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_MyWork" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_MyWork"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_MyWork" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_MyWork"/> <DataResource dataResourceId="SCRUM_FindTimeSheet" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="TimeSheet" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_FindTimeSheet" contentTypeId="DOCUMENT" contentName="TimeSheet" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_FindTimeSheet" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindTimeSheet" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_FindTimeSheet"/> + <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindTimeSheet" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_FindTimeSheet"/> <DataResource dataResourceId="SCRUM_ViewProduct" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Overview" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ViewProduct" contentTypeId="DOCUMENT" contentName="Product Overview" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewProduct" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewProduct"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewProduct"/> <DataResource dataResourceId="SCRUM_defaultTasks" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Default Tasks" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_defaultTasks" contentTypeId="DOCUMENT" contentName="Default Tasks" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_defaultTasks" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_defaultTasks" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_defaultTasks"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_defaultTasks" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_defaultTasks"/> <DataResource dataResourceId="SCRUM_editDefTask" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Default Task" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_editDefTask" contentTypeId="DOCUMENT" contentName="Edit Default Task" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_editDefTask" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_editDefTask" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_editDefaultTask"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_editDefTask" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_editDefaultTask"/> <DataResource dataResourceId="SCRUM_ListBackCate" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Product Backlog Categories" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ListBackCate" contentTypeId="DOCUMENT" contentName="List Product Backlog Categories" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ListBackCate" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ListBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ListProductBacklogCategories"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ListBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ListProductBacklogCategories"/> <DataResource dataResourceId="SCRUM_EditBackCate" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Backlog Categories" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditBackCate" contentTypeId="DOCUMENT" contentName="Edit Product Backlog Categories" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditBackCate" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProductBacklogCategory"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProductBacklogCategory"/> <DataResource dataResourceId="SCRUM_EditProContent" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProductContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Contents" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditProContent" contentTypeId="DOCUMENT" contentName="Edit Product Contents" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditProContent" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProContent" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProductContents"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProContent" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProductContents"/> <DataResource dataResourceId="SCRUM_ProductEmails" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Communication Product Emails" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ProductEmails" contentTypeId="DOCUMENT" contentName="Communication Product Emails" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ProductEmails" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProductEmails" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ProductEmails"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProductEmails" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ProductEmails"/> <DataResource dataResourceId="SCRUM_NewProEmail" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Emails" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_NewProEmail" contentTypeId="DOCUMENT" contentName="New Emails" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_NewProEmail" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_NewProEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_NewProductEmail"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_NewProEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_NewProductEmail"/> <DataResource dataResourceId="SCRUM_EditProjCon" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProjectContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Content" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditProjCon" contentTypeId="DOCUMENT" contentName="Edit Product Content" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditProjCon" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditProjCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProjectContents"/> + <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditProjCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProjectContents"/> <DataResource dataResourceId="SCRUM_EditBkItemCon" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditBacklogItemContent.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Item Content" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_EditBkItemCon" contentTypeId="DOCUMENT" contentName="Edit Product Item Content" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditBkItemCon" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBkItemCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditBacklogItemContent"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBkItemCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditBacklogItemContent"/> <DataResource dataResourceId="SCRUM_ViewBkItem" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Product Backlog Item" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ViewBkItem" contentTypeId="DOCUMENT" contentName="View Product Backlog Item" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewBkItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewProdBacklogItem"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewProdBacklogItem"/> <DataResource dataResourceId="SCRUM_ViewBkItem" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Product Backlog Item" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ViewBkItem" contentTypeId="DOCUMENT" contentName="View Product Backlog Item" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewBkItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewProdBacklogItem"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewProdBacklogItem"/> <DataResource dataResourceId="SCRUM_ProdBKEmail" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductBacklogEmails.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Backlog Communications" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_ProdBKEmail" contentTypeId="DOCUMENT" contentName="Product Backlog Communications" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ProdBKEmail" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProdBKEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ProductBacklogEmails"/> + <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProdBKEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ProductBacklogEmails"/> <DataResource dataResourceId="SCRUM_SprintMember" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintMember.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint Member" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_SprintMember" contentTypeId="DOCUMENT" contentName="Sprint Member" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_SprintMember" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_SprintMember" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_SprintMember"/> + <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_SprintMember" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_SprintMember"/> <DataResource dataResourceId="SCRUM_Minute" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_DailyScrumMeetingMinute.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Daily Scrum Meeting Minute" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="SCRUM_Minute" contentTypeId="DOCUMENT" contentName="Daily Scrum Meeting Minute" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_Minute" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_Minute" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_DailyScrumMeetingMinute"/> + <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_Minute" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_DailyScrumMeetingMinute"/> </entity-engine-xml> Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Mon Aug 22 03:35:18 2011 @@ -127,7 +127,9 @@ under the License. </#if> </span> <span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span> - <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> + + <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists--> + <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> </#if> Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Mon Aug 22 03:35:18 2011 @@ -162,7 +162,8 @@ under the License. <#else> <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> </#if> - <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> + <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists--> + <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original) +++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Mon Aug 22 03:35:18 2011 @@ -152,7 +152,8 @@ under the License. <#else> <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> </#if> - <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> + <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists--> + <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original) +++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Mon Aug 22 03:35:18 2011 @@ -123,7 +123,8 @@ under the License. <#else/> <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> </#if> - <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> + <#---if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists--> + <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> </#if> Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=1160101&r1=1160100&r2=1160101&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original) +++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Mon Aug 22 03:35:18 2011 @@ -72,7 +72,8 @@ under the License. </#if> </#if> <#if userLogin?exists> - <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> + <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists--> + <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |