OFBiz › OFBiz - Commits

svn commit: r804881 - in /ofbiz/trunk: applications/accounting/data/ applications/commonext/config/ applications/commonext/data/ applications/commonext/widget/ applications/content/ applications/content/data/ applications/product/data/ applications/wor...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r804881 - in /ofbiz/trunk: applications/accounting/data/ applications/commonext/config/ applications/commonext/data/ applications/commonext/widget/ applications/content/ applications/content/data/ applications/product/data/ applications/wor...

Author: hansbak
Date: Mon Aug 17 07:15:41 2009
New Revision: 804881

URL: http://svn.apache.org/viewvc?rev=804881&view=rev
Log:
several adjustments to the help system, now using contentId to select and use underscore in contentId

Modified:
ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml
ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
ofbiz/trunk/applications/content/data/ContentHelpData.xml
ofbiz/trunk/applications/content/data/TemplateData.xml
ofbiz/trunk/applications/content/ofbiz-component.xml
ofbiz/trunk/applications/product/data/ProductHelpData.xml
ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoTreeContent.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl

Modified: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml Mon Aug 17 07:15:41 2009
@@ -19,20 +19,24 @@
-->
<entity-engine-xml>

- <DataResource dataResourceId="HELP-ACCOUNTING" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Manager Help" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP-ACCOUNTING">
+ <DataResource dataResourceId="HELP_ACCOUNTING" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Manager Help" mimeTypeId="text/xml" isPublic="Y" />
+ <ElectronicText dataResourceId="HELP_ACCOUNTING">
<textData><![CDATA[
<root>
<generalTitle>
The Accounting Manager.
</generalTitle>
<general>
+ <section>
+ <text>
The Accounting Manager keeps track of financial charges, credit card processes, and receipts of payment.
The link from the Order Manager to the Accounting Manager is the Invoice Number, generated when the Order is processed.
+ </text>
+ </section>
</general>
</root>
]]></textData>
</ElectronicText>
- <Content contentId="HELP-ACCOUNTING" contentTypeId="DOCUMENT" contentName="Accounting Help" templateDataResourceId="HELP-TEMPL" dataResourceId="HELP-ACCOUNTING" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
- <ContentAssoc contentId="HELP-ROOT" contentIdTo="HELP-ACCOUNTING" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
+ <Content contentId="HELP_ACCOUNTING" contentTypeId="DOCUMENT" contentName="Accounting Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ACCOUNTING" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_ACCOUNTING" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
</entity-engine-xml>

Modified: ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml (original)
+++ ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml Mon Aug 17 07:15:41 2009
@@ -28,6 +28,9 @@
<property key="CommonExtHelpUsedFor">
<value xml:lang="en">What is it used for?</value>
</property>
+ <property key="CommonExtHelpOnScreen">
+ <value xml:lang="en">What's on the screen?</value>
+ </property>
<property key="CommonExtIndex">
<value xml:lang="en">Index</value>
</property>

Modified: ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml (original)
+++ ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml Mon Aug 17 07:15:41 2009
@@ -19,8 +19,10 @@
-->
<entity-engine-xml>

- <DataResource dataResourceId="HELP-TEMPL"/>
- <Content contentId="HELP-ROOT"/>
- <Content contentId="HELP-MYPORTAL"/>
+ <DataResource dataResourceId="HELP_TEMPL"/>
+ <Content contentId="HELP_ROOT"/>
+ <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/>
+ <ContentAssoc contentId="TREE_ROOT" contentIdTo="HELP_ROOT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
+ <Content contentId="HELP_MYPORTAL"/>

</entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Mon Aug 17 07:15:41 2009
@@ -64,7 +64,10 @@
<screen name="ShowHelp">
<section>
<condition>
- <if-compare field="parameters.helpTopic" operator="equals" value="navigateHelp"/>
+ <and>
+ <if-compare field="parameters.helpTopic" operator="equals" value="navigateHelp"/>
+ <if-empty field="parameters.portalPageId"/>
+ </and>
</condition>
<widgets>
<include-screen name="navigateHelp"/>
@@ -76,11 +79,8 @@
</condition>
<actions>
<set field="title" value="${uiLabelMap.CommonExtHelpTitle}"/>
- <entity-and entity-name="Content" list="contents">
- <field-map field-name="contentName" from-field="parameters.helpTopic"/>
- </entity-and>
- <set field="content" from-field="contents[0]"/>
- <set field="contentId" value="${parameters.contentId}" default-value="${content.contentId}"/>
+ <set field="contentId" value="${parameters.contentId}" default-value="HELP_ROOT"/>
+ <entity-one entity-name="Content" value-field="content"/>
</actions>
<widgets>
<section>
@@ -88,11 +88,7 @@
<if-empty field="content"/>
</condition>
<widgets>
- <decorator-screen name="LookupDecorator">
- <decorator-section name="body">
- <label style="h2" text="Content with content name: ${parameters.helpTopic} or contentId: ${contentId}(${parameters.contentId}} could not be found"></label>
- </decorator-section>
- </decorator-screen>
+ <include-screen name="navigateHelp"/>
</widgets>
<fail-widgets>
<decorator-screen name="LookupDecorator">
@@ -110,7 +106,7 @@
<decorator-screen name="LookupDecorator">
<decorator-section name="body">
<screenlet title="${uilabelMap.CommonExtHelpTitle}">
- <content content-id="HELP-MYPORTAL"/>
+ <content content-id="HELP_MYPORTAL"/>
</screenlet>
<screenlet title="Select a portlet you would like to have help on...." navigation-menu-name="lookupMenu">
<include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/>
@@ -153,11 +149,11 @@
<set field="layoutSettings.javaScripts[+0]" value="/images/dojo/dojo.js" global="true"/>
<set field="titleProperty" value="PageTitleNavigateContent"/>
<entity-and entity-name="ContentAssoc" list="contentAssoc">
- <field-map field-name="contentId" value="HELP-ROOT"/>
+ <field-map field-name="contentId" value="HELP_ROOT"/>
<field-map field-name="contentAssocTypeId" value="TREE_CHILD"/>
<order-by field-name="sequenceNum"/>
</entity-and>
- <set field="contentId" from-field="parameters.contentId" default-value="HELP-ROOT"/>
+ <set field="contentId" from-field="parameters.contentId" default-value="HELP_ROOT"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator">

Modified: ofbiz/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentHelpData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentHelpData.xml Mon Aug 17 07:15:41 2009
@@ -18,20 +18,46 @@
under the License.
-->
<entity-engine-xml>
- 
- <DataResource dataResourceId="HELP-CONTENT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager Help" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP-CONTENT">
+ 
+ <DataResource dataResourceId="HELP_ROOT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
+ <ElectronicText dataResourceId="HELP_ROOT">
+ <textData><![CDATA[
+ <root>
+ <generalTitle>
+ Welcome to the Apache OFBiz help system
+ </generalTitle>
+ <general>
+ <section>
+ <text>If you arrived at this page without selecting the index, then a specific help page was not yet available</text>
+ </section>
+ <section>
+ <text>This system will provide you context sensitive help throughout the system.</text>
+ </section>
+ <section>
+ <text>For more info on the help system itself check the </text>
+ </section>
+ </general>
+ </root>
+ ]]></textData>
+ </ElectronicText>
+ <Content contentId="HELP_ROOT" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_ROOT" statusId="CTNT_IN_PROGRESS" contentName="Help system root" mimeTypeId="text/html"/>
+
+ 
+ <DataResource dataResourceId="HELP_CONTENT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Content Manager Help" mimeTypeId="text/xml" isPublic="Y" />
+ <ElectronicText dataResourceId="HELP_CONTENT">
<textData><![CDATA[
<root>
<generalTitle>
The Content Manager.
</generalTitle>
<general>
- The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements.
+ <section>
+ <text>The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements.</text>
+ </section>
</general>
</root>
]]></textData>
</ElectronicText>
- <Content contentId="HELP-CONTENT" contentTypeId="DOCUMENT" contentName="Content Manager Help" templateDataResourceId="HELP-TEMPL" dataResourceId="HELP-CONTENT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
- <ContentAssoc contentId="HELP-ROOT" contentIdTo="HELP-CONTENT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="050"/>
+ <Content contentId="HELP_CONTENT" contentTypeId="DOCUMENT" contentName="Content Manager Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_CONTENT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_CONTENT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="050"/>
</entity-engine-xml>

Modified: ofbiz/trunk/applications/content/data/TemplateData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/TemplateData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/TemplateData.xml (original)
+++ ofbiz/trunk/applications/content/data/TemplateData.xml Mon Aug 17 07:15:41 2009
@@ -465,8 +465,8 @@


-<DataResource dataResourceId="HELP-TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
-<ElectronicText dataResourceId="HELP-TEMPL">
+<DataResource dataResourceId="HELP_TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
+<ElectronicText dataResourceId="HELP_TEMPL">
<textData><![CDATA[
<#if layoutSettings.VT_NAME[0] == "FLAT_GREY">
<div class="contentarea">
@@ -489,15 +489,16 @@

<#if doc.root.general?has_content>
<h1>${doc.root.generalTitle?if_exists}</h1>
- <p class=h2>${doc.root.general}</p>
+ <#list doc.root.general.section as section>
+ <p class=h2>${section.text}</p>
+ </#list>
</#if>

</div>
</div>
</div>
-</#if>

-<#if layoutSettings.VT_NAME[0] == "BIZZNESS_TIME">
+<#elseif layoutSettings.VT_NAME[0] == "BIZZNESS_TIME">
<#if doc.root.definition?has_content>
<h1>${uiLabelMap.CommonExtHelpDefinition}</h1>
<p class=h2>${doc.root.definition}</p></br>
@@ -515,28 +516,36 @@

<#if doc.root.general?has_content>
<h1>${doc.root.generalTitle?if_exists}</h1>
- <p class=h2>${doc.root.general}</p>
+ <#list doc.root.general.section as section>
+ <p class=h2>${section.text}</p>
+ </#list>
+ </#if>
+<#else>
+ <#if doc.root.definition?has_content>
+ <h1>${uiLabelMap.CommonExtHelpDefinition}</h1>
+ <p class=h2>${doc.root.definition}</p></br>
+ </#if>
+
+ <#if doc.root.usedFor?has_content>
+ <h1>${uiLabelMap.CommonExtHelpUsedFor}</h1>
+ <p class=h2>${doc.root.usedFor}</p></br>
+ </#if>
+
+ <#if doc.root.onScreen?has_content>
+ <h1>${uiLabelMap.CommonExtHelpOnScreen}</h1>
+ <p class=h2>${doc.root.onScreen}</p>
</#if>

+ <#if doc.root.general?has_content>
+ <h1>${doc.root.generalTitle?if_exists}</h1>
+ <#list doc.root.general.section as section>
+ <p class=h2>${section.text}</p>
+ </#list>
+ </#if>
</#if>

]]></textData>
</ElectronicText>
-<DataResource dataResourceId="HELP-ROOT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
-<ElectronicText dataResourceId="HELP-ROOT">
- <textData><![CDATA[
- <root>
- <generalTitle>
- Welcome to the Apache OFBiz help system
- </generalTitle>
- <general>
- This system will provide you context sensitive help throughout the system.
- </general>
- </root>
- ]]></textData>
- </ElectronicText>
- <Content contentId="HELP-ROOT" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL" dataResourceId="HELP-ROOT" statusId="CTNT_IN_PROGRESS" contentName="Help system root" mimeTypeId="text/html"/>
-

</entity-engine-xml>

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Mon Aug 17 07:15:41 2009
@@ -29,21 +29,21 @@
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ContentTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ContentOperationData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MimeTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MimeTypeTemplate.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SeedBlogData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/HelpTypeData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogUsersData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogMiscData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogEntryData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/WebSitePublishPointData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CompDocData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ForumDemoData.xml"/>

Modified: ofbiz/trunk/applications/product/data/ProductHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductHelpData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductHelpData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductHelpData.xml Mon Aug 17 07:15:41 2009
@@ -19,19 +19,23 @@
-->
<entity-engine-xml>

- <DataResource dataResourceId="HELP-PRODUCT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Catalog Manager Help" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP-PRODUCT">
+ <DataResource dataResourceId="HELP_PRODUCT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Catalog Manager Help" mimeTypeId="text/xml" isPublic="Y" />
+ <ElectronicText dataResourceId="HELP_PRODUCT">
<textData><![CDATA[
<root>
<generalTitle>
The Catalog Manager.
</generalTitle>
<general>
- The Catalog Manager creates and provides access to a variety of information related to Products, Catalogs, or Categories.
+ <section>
+ <text>
+ The Catalog Manager creates and provides access to a variety of information related to Products, Catalogs, or Categories.
+ </text>
+ </section>
</general>
</root>
]]></textData>
</ElectronicText>
- <Content contentId="HELP-PRODUCT" contentTypeId="DOCUMENT" contentName="Catalog Manager Help" templateDataResourceId="HELP-TEMPL" dataResourceId="HELP-PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
- <ContentAssoc contentId="HELP-ROOT" contentIdTo="HELP-PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="020"/>
+ <Content contentId="HELP_PRODUCT" contentTypeId="DOCUMENT" contentName="Catalog Manager Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="020"/>
</entity-engine-xml>

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Mon Aug 17 07:15:41 2009
@@ -29,8 +29,8 @@
editFormLocation="component://workeffort/widget/CalendarForms.xml"
screenshot="/images/portlets/Calendar.png"/>
<PortletPortletCategory portalPortletId="Calendar" portletCategoryId="EVENTSTASKS"/>
- <DataResource dataResourceId="HELP-PortLetCalendar" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP-PortLetCalendar">
+ <DataResource dataResourceId="HELP_Calendar" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
+ <ElectronicText dataResourceId="HELP_Calendar">
<textData><![CDATA[
<root>
<definition>
@@ -45,8 +45,8 @@
</root>
]]></textData>
</ElectronicText>
- <Content contentId="HELP-PortLetCalendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL" dataResourceId="HELP-PortLetCalendar" statusId="CTNT_IN_PROGRESS" contentName="PortLetCalendar" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP-MYPORTAL" contentIdTo="HELP-PortLetCalendar" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
+ <Content contentId="HELP_Calendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_Calendar" statusId="CTNT_IN_PROGRESS" contentName="Help portlet Celendar" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_MYPORTAL" contentIdTo="HELP_Calendar" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Mon Aug 17 07:15:41 2009
@@ -21,13 +21,19 @@
<#assign helpUrlPrefix = "" />
<#assign helpUrlSuffix = "" />

-<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
-${helpTopic}
--->
<#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")>
- <#assign helpContent = delegator.findByAnd("Content", {"contentName" : helpTopic})?if_exists>
+ <#if (helpTopic?length > 20)>
+ <#assign helpTopic = helpTopic?substring(0,20)>
+ </#if>
+ <#assign helpContent = delegator.findByAnd("Content", {"contentId" : helpTopic})>
+ <#if !helpContent?has_content>
+ <#assign helpContent = delegator.findByAnd("Content", {"contentId" : webSiteId})>
+ </#if>
</#if>

+<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
+${helpTopic}
+-->
<#if helpUrlsMap["Prefix"] != "Prefix">
<#assign helpUrlPrefix = helpUrlsMap["Prefix"] />
</#if>

Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Mon Aug 17 07:15:41 2009
@@ -124,7 +124,7 @@
</entity-and>
</actions>
<field name="portletName">
- <hyperlink also-hidden="false" target="showHelp?helpTopic=PortLet${portalPortletId}" description="${portletName}" ></hyperlink>
+ <hyperlink also-hidden="false" target="showHelp?helpTopic=HELP_${portalPortletId}" description="${portletName}" ></hyperlink>
</field>
<field name="description"><display/></field>
</form>

Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoTreeContent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoTreeContent.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoTreeContent.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoTreeContent.xml Mon Aug 17 07:15:41 2009
@@ -18,7 +18,6 @@
under the License.
-->
<entity-engine-xml>
- <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/>
<Content contentId="PICTURE" contentTypeId="DOCUMENT" contentName="Picture" dataResourceId=""/>
<Content contentId="PROD_DESCRIPTION" contentTypeId="DOCUMENT" contentName="Product Description" dataResourceId=""/>
<Content contentId="GENERAL" contentTypeId="DOCUMENT" contentName="General" dataResourceId=""/>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Aug 17 07:15:41 2009
@@ -160,23 +160,26 @@
<WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/>


- <DataResource dataResourceId="HELP-MYPORTAL" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP-MYPORTAL">
+ <DataResource dataResourceId="HELP_MYPORTAL" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
+ <ElectronicText dataResourceId="HELP_MYPORTAL">
<textData><![CDATA[
<root>
<generalTitle>
The My portal Component introduction.
</generalTitle>
<general>
- Within the 'my portal' component it is possible to create a collection of screens for a specific type of user of the system.
- Examples are a general employee, an account manager, a customer, a supplier etc...
- The system makes use of special portlets which can be arranged and selected/hidden by the logged on user.
+ <section>
+ <text>
+ Within the 'my portal' component it is possible to create a collection of screens for a specific type of user of the system.
+ Examples are a general employee, an account manager, a customer, a supplier etc...
+ The system makes use of special portlets which can be arranged and selected/hidden by the logged on user.
+ </text>
+ </section>
</general>
</root>
]]></textData>
</ElectronicText>
- <Content contentId="HELP-MYPORTAL" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL" dataResourceId="HELP-MYPORTAL" statusId="CTNT_IN_PROGRESS" contentName="My Portal help" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP-ROOT" contentIdTo="HELP-MYPORTAL" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
-
+ <Content contentId="HELP_MYPORTAL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_MYPORTAL" statusId="CTNT_IN_PROGRESS" contentName="My Portal help" mimeTypeId="text/html"/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_MYPORTAL" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>

</entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Mon Aug 17 07:15:41 2009
@@ -126,7 +126,7 @@
<span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")>
+ <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")>
<span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span>
<#else>
<span><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></span>

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=804881&r1=804880&r2=804881&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Mon Aug 17 07:15:41 2009
@@ -182,7 +182,7 @@
</#if>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")>
+ <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")>
<li><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
<#else>
<li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>