OFBiz › OFBiz - Commits

svn commit: r804546 - in /ofbiz/trunk: applications/accounting/ applications/accounting/data/ applications/accounting/webapp/accounting/WEB-INF/ applications/commonext/ applications/commonext/config/ applications/commonext/data/ applications/commonext/...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r804546 - in /ofbiz/trunk: applications/accounting/ applications/accounting/data/ applications/accounting/webapp/accounting/WEB-INF/ applications/commonext/ applications/commonext/config/ applications/commonext/data/ applications/commonext/...

Author: hansbak
Date: Sun Aug 16 02:04:17 2009
New Revision: 804546

URL: http://svn.apache.org/viewvc?rev=804546&view=rev
Log:

The 'new' help system

A new help system is implemented which is compatible with the current system which uses the ofboz.docs.org site to store the data.

The new help system has a number of advantages over the old version:
1. complete multilanguage without config xml files, using the locale.
2. Having an automatic multilevel index of all help pages using the ContentAssoc entity
3. Using the content manager for retrieval.
4. Template driven, aware of the different visual themes.
5. A first step towards the storage of OFBiz documentation within the OFBiz system itself.
6. Easy update via normal svn in seed data.
7. Aware of portlets on (userdefined) Portal pages.
8. Create awareness of the capabilities of the content component

The reason of this development was the requirement to provide user documents to the customers of Antwebsystems Co.Ltd

Some of the possible extensions could be:
1. a search function
2. print all or specific help files in PDF format
3. make the help screens work better with the business theme
4. Explain how help can be extended
5. In the help screen be able to send a message to the local support team
6. But most of all, create more help content!

Added:
ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml (with props)
ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml (with props)
ofbiz/trunk/applications/content/data/ContentHelpData.xml (with props)
ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl (with props)
ofbiz/trunk/applications/product/data/ProductHelpData.xml (with props)
Modified:
ofbiz/trunk/applications/accounting/ofbiz-component.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml
ofbiz/trunk/applications/commonext/ofbiz-component.xml
ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
ofbiz/trunk/applications/content/data/TemplateData.xml
ofbiz/trunk/applications/content/ofbiz-component.xml
ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/product/ofbiz-component.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml
ofbiz/trunk/framework/common/data/CommonTypeData.xml
ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
ofbiz/trunk/themes/flatgrey/includes/header.ftl

Added: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml?rev=804546&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml (added)
+++ ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml Sun Aug 16 02:04:17 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+ <textData><![CDATA[
+ <root>
+ <generalTitle>
+ The Accounting Manager.
+ </generalTitle>
+ <general>
+ 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.
+ </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"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/data/AccountingHelpData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Sun Aug 16 02:04:17 2009
@@ -36,6 +36,7 @@
<entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Accounting Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml (original)
+++ ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml Sun Aug 16 02:04:17 2009
@@ -28,7 +28,7 @@
<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 key="CommonExtIndex">
+ <value xml:lang="en">Index</value>
</property>
</resource>

Added: ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml?rev=804546&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml (added)
+++ ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml Sun Aug 16 02:04:17 2009
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<entity-engine-xml>
+ 
+ <DataResource dataResourceId="HELP-TEMPL"/>
+ <Content contentId="HELP-ROOT"/>
+ <Content contentId="HELP-MYPORTAL"/>
+
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/commonext/data/CommonExtHelpData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/ofbiz-component.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Sun Aug 16 02:04:17 2009
@@ -25,8 +25,9 @@
<classpath type="dir" location="config"/>

<entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
-
+
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>

Modified: ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -20,11 +20,19 @@

<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
- <description>Party Manager Module Site Configuration File</description>
+ <description>General Application CommonExt Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

-

+ <request-map uri="view">
+ <security https="false" auth="false"/>
+ <response name="success" type="request" value="main"/>
+ </request-map>
+ <request-map uri="views">
+ <security https="true" auth="false"/>
+ <response name="success" type="request" value="main"/>
+ </request-map>
+
<request-map uri="deleteAllSystemNotes">
<security https="true" auth="true"/>
<event type="service" invoke="deleteAllSystemNotes"/>
@@ -37,5 +45,6 @@
</request-map>

<view-map name="showHelp" type="screen" page="component://commonext/widget/HelpScreens.xml#ShowHelp"/>
+ <view-map name="ShowDocument" type="screen" page="component://commonext/widget/HelpScreens.xml#showDocument"/>

</site-conf>

Modified: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Sun Aug 16 02:04:17 2009
@@ -21,55 +21,163 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">

- <screen name="ShowHelp">
+ <screen name="LookupDecorator">
<section>
- <condition>
- <if-empty field="parameters.portalPageId"/>
- </condition>
<actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/>
- <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]"/>
+ <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+ <service service-name="getUserPreferenceGroup" result-map="prefResult">
+ <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
+ </service>
+ <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
+
+ <property-map resource="general" map-name="generalProperties" global="true"/>
+ <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/>
+ <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
+ <service service-name="getVisualThemeResources">
+ <field-map field-name="visualThemeId"/>
+ <field-map field-name="themeResources" from-field="layoutSettings"/>
+ </service>
+ <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
+ <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/>
</actions>
<widgets>
+ <platform-specific><html><html-template location="component://common/webcommon/includes/lookup.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific>
+ <container style="contentarea">
+ <container id="column-container">
+ 
+ <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/>
+ <container id="content-main-section" style="${MainColumnStyle}">
+ <decorator-section-include name="body"/>
+ </container>
+ </container>
+ </container>
+ <container style="clear"></container>
+
+ <platform-specific><html><html-template location="component://common/webcommon/includes/lookupFooter.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ShowHelp">
+ <section>
+ <condition>
+ <if-compare field="parameters.helpTopic" operator="equals" value="navigateHelp"/>
+ </condition>
+ <widgets>
+ <include-screen name="navigateHelp"/>
+ </widgets>
+ <fail-widgets>
<section>
<condition>
- <if-empty field="content"/>
+ <if-empty field="parameters.portalPageId"/>
</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}"/>
+ </actions>
<widgets>
- <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="search-options"/>
- <decorator-section name="search-results">
- <label style="h2" text="Content with content name: ${parameters.helpTopic} could not be found"></label>
- </decorator-section>
- </decorator-screen>
+ <section>
+ <condition>
+ <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>
+ </widgets>
+ <fail-widgets>
+ <decorator-screen name="LookupDecorator">
+ <decorator-section name="body">
+ <screenlet title="${uilabelMap.CommonExtHelpTitle}" navigation-menu-name="lookupMenu">
+ <include-menu name="lookupMenu" location="component://content/widget/content/ContentMenus.xml"/>
+ <include-screen name="showDocument"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </fail-widgets>
+ </section>
</widgets>
<fail-widgets>
- <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="search-options"/>
- <decorator-section name="search-results">
- <content content-id="${content.contentId}" templateResourceId="${layoutSettings.VT_HELP_TEMPL}"/>
- </decorator-section>
- </decorator-screen>
- </fail-widgets>
- </section>
- </widgets>
- <fail-widgets>
- <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="search-options">
- <content content-id="HELP-MY-PORTAL"/>
- </decorator-section>
- <decorator-section name="search-results">
- <screenlet title="Select a portlet you would like to have help on....">
+ <decorator-screen name="LookupDecorator">
+ <decorator-section name="body">
+ <screenlet title="${uilabelMap.CommonExtHelpTitle}">
+ <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"/>
<include-form name="PortletList" location="component://common/widget/PortalPageForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
+ </fail-widgets>
+ </section>
</fail-widgets>
</section>
</screen>

+ <screen name="showDocument">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="contentId" from-field="parameters.contentId" default-value="${contentId}"/>
+ <property-map resource="general" map-name="generalProperties" global="true"/>
+ <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/>
+ <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
+ <service service-name="getVisualThemeResources">
+ <field-map field-name="visualThemeId"/>
+ <field-map field-name="themeResources" from-field="layoutSettings"/>
+ </service>
+ <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
+ </actions>
+ <widgets>
+ <container id="Document">
+ <content content-id="${contentId}"/>
+ </container>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="navigateHelp">
+ <section>
+ <actions>
+ <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="contentAssocTypeId" value="TREE_CHILD"/>
+ <order-by field-name="sequenceNum"/>
+ </entity-and>
+ <set field="contentId" from-field="parameters.contentId" default-value="HELP-ROOT"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleNavigateContent}" >
+ <container style="left-border">
+ <container id="EditDocumentTree"/>
+ <platform-specific><html><html-template location="component://content/webapp/content/content/DisplayContentNav.ftl"/></html></platform-specific>
+ </container>
+ <container style="leftonly">
+ <include-screen name="showDocument"/>
+ </container>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file

Added: ofbiz/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentHelpData.xml?rev=804546&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentHelpData.xml (added)
+++ ofbiz/trunk/applications/content/data/ContentHelpData.xml Sun Aug 16 02:04:17 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+ <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.
+ </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"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/content/data/ContentHelpData.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/data/ContentHelpData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/content/data/ContentHelpData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/content/data/TemplateData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/TemplateData.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/TemplateData.xml (original)
+++ ofbiz/trunk/applications/content/data/TemplateData.xml Sun Aug 16 02:04:17 2009
@@ -465,14 +465,13 @@


-<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELP_TEMPL" resourceValue="HELP-TEMPL-FLAT_GREY" sequenceId="01"/>
-<DataResource dataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
-<ElectronicText dataResourceId="HELP-TEMPL-FLAT_GREY">
+<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">
<div id="column-container">
<div id="content-main-section">
-
<#if doc.root.definition?has_content>
<h1>${uiLabelMap.CommonExtHelpDefinition}</h1>
<p class=h2>${doc.root.definition}</p></br>
@@ -496,8 +495,48 @@
</div>
</div>
</div>
+</#if>
+
+<#if layoutSettings.VT_NAME[0] == "BIZZNESS_TIME">
+ <#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>
+ <p class=h2>${doc.root.general}</p>
+ </#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=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Sun Aug 16 02:04:17 2009
@@ -29,11 +29,13 @@
<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="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"/>

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Content Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

@@ -39,10 +40,6 @@
</postprocessor>
-->

- 
- <request-map uri="view"><security https="false" auth="false"/><response name="success" type="request" value="main"/></request-map>
- <request-map uri="views"><security https="true" auth="false"/><response name="success" type="request" value="main"/></request-map>
-
<request-map uri="chain">
<event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/>
<response name="success" type="request" value="/view"/>

Added: ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl?rev=804546&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl (added)
+++ ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl Sun Aug 16 02:04:17 2009
@@ -0,0 +1,233 @@
+<#--
+ 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 type="text/javascript">
+
+ dojo.require("dojo.widget.*");
+ dojo.require("dojo.event.*");
+ dojo.require("dojo.io.*");
+
+ var treeSelected = false;
+ var editDocumentTreeUrl = '<@ofbizUrl>/views/EditDocumentTree</@ofbizUrl>';
+ var listDocument = '<@ofbizUrl>/views/ShowDocument</@ofbizUrl>';
+ var editDocumentUrl = '<@ofbizUrl>/views/EditDocument</@ofbizUrl>';
+ var deleteDocumentUrl = '<@ofbizUrl>removeDocumentFromTree</@ofbizUrl>';
+<#-------------------------------------------------------------------------------------Load function-->
+ dojo.addOnLoad(function() {
+ dojo.event.topic.subscribe("showDocument",
+ function(message) {
+ treeSelected = true;
+ var ctx = new Array();
+ ctx['contentId'] = message.node.widgetId;
+ callDocument(ctx);
+ }
+
+ );
+ dojo.event.topic.subscribe("NewDocumentTree/engage",
+ function (menuItem) {
+ var node = menuItem.getTreeNode();
+ callCreateDocumentTree(node.widgetId);
+ }
+
+ );
+ dojo.event.topic.subscribe("NewDocument/engage",
+ function (menuItem) {
+ var node = menuItem.getTreeNode();
+ callCreateDocument(node.widgetId);
+ }
+
+ );
+ dojo.event.topic.subscribe("EditDocument/engage",
+ function (menuItem) {
+ var node = menuItem.getTreeNode();
+ callEditDocument(node.widgetId);
+ }
+ );
+ dojo.event.topic.subscribe("RenameDocumentTree/engage",
+ function (menuItem) {
+ var node = menuItem.getTreeNode();
+ callRenameDocumentTree(node.widgetId);
+ }
+
+ );
+ dojo.event.topic.subscribe("DeleteDocument/engage",
+ function (menuItem) {
+ var node = menuItem.getTreeNode();
+ callDeleteDocument(node.widgetId, node.object);
+ }
+ );
+ }
+ );
+
+<#-------------------------------------------------------------------------------------call ofbiz function-->
+ function callDocument(ctx) {
+ var bindArgs = {
+ url: listDocument,
+ method: 'POST',
+ mimetype: 'text/html',
+ content: ctx,
+ error: function(type, data, evt) {
+ alert("An error occured loading content! : " + data);
+ },
+ load: function(type, data, evt) {
+ var innerPage = dojo.byId('Document');
+ innerPage.innerHTML = data;
+ }
+ };
+ dojo.io.bind(bindArgs);
+ }
+<#-------------------------------------------------------------------------------------callCreateFolder function-->
+ function callCreateDocumentTree(contentId) {
+ var bindArgs = {
+ url: editDocumentTreeUrl,
+ method: 'POST',
+ mimetype: 'text/html',
+ content: { contentId: contentId,
+ contentAssocTypeId:'TREE_CHILD'},
+ error: function(type, data, evt) {
+ alert("An error occured loading content! : " + data);
+ },
+ load: function(type, data, evt) {
+ var innerPage = dojo.byId('EditDocumentTree');
+ innerPage.innerHTML = data;
+ }
+ };
+ dojo.io.bind(bindArgs);
+ }
+<#-------------------------------------------------------------------------------------callCreateSection function-->
+ function callCreateDocument(ctx) {
+ var bindArgs = {
+ url: editDocumentUrl,
+ method: 'POST',
+ mimetype: 'text/html',
+ content: {contentId: ctx},
+ error: function(type, data, evt) {
+ alert("An error occured loading content! : " + data);
+ },
+ load: function(type, data, evt) {
+ var innerPage = dojo.byId('Document');
+ innerPage.innerHTML = data;
+ }
+ };
+ dojo.io.bind(bindArgs);
+ }
+<#-------------------------------------------------------------------------------------callEditSection function-->
+ function callEditDocument(ctx) {
+
+ var bindArgs = {
+ url: editDocumentUrl,
+ method: 'POST',
+ mimetype: 'text/html',
+ content: {contentIdTo: ctx},
+ error: function(type, data, evt) {
+ alert("An error occured loading content! : " + data);
+ },
+ load: function(type, data, evt) {
+ var innerPage = dojo.byId('Document');
+ innerPage.innerHTML = data;
+ }
+ };
+ dojo.io.bind(bindArgs);
+
+ }
+<#-------------------------------------------------------------------------------------callDeleteItem function-->
+ function callDeleteDocument(contentIdTo,objstr) {
+ var ctx = new Array();
+ if (objstr != null && objstr.length > 0) {
+ var obj = objstr.split("|");
+ ctx['contentId'] = obj[0];
+ ctx['contentAssocTypeId'] = obj[1];
+ ctx['fromDate'] = obj[2];
+ }
+ ctx['contentIdTo']=contentIdTo;
+ var bindArgs = {
+ url: deleteDocumentUrl,
+ method: 'POST',
+ mimetype: 'text/html',
+ content: ctx,
+ error: function(type, data, evt) {
+ alert("An error occured loading content! : " + data);
+ },
+ load: function(type, data, evt) {
+ location.reload();
+ }
+ };
+ dojo.io.bind(bindArgs);
+ }
+ <#-------------------------------------------------------------------------------------callRename function-->
+ function callRenameDocumentTree(contentId) {
+ var bindArgs = {
+ url: editDocumentTreeUrl,
+ method: 'POST',
+ mimetype: 'text/html',
+ content: { contentId: contentId,
+ contentAssocTypeId:'TREE_CHILD',
+ rename: 'Y'
+ },
+ error: function(type, data, evt) {
+ alert("An error occured loading content! : " + data);
+ },
+ load: function(type, data, evt) {
+ var innerPage = dojo.byId('EditDocumentTree');
+ innerPage.innerHTML = data;
+ }
+ };
+ dojo.io.bind(bindArgs);
+ }
+</script>
+
+<style>
+.dojoContextMenu {
+ background-color: #ccc;
+ font-size: 10px;
+}
+</style>
+
+<#-- looping macro -->
+<#macro fillTree assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = delegator.findByPrimaryKey("Content",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",assoc.contentIdTo))/>
+ <div dojoType="TreeNode" title="${content.contentName?default(assoc.contentIdTo)}" widgetId="${assoc.contentIdTo}"
+ object="${assoc.contentId}|${assoc.contentAssocTypeId}|${assoc.fromDate}">
+ <#assign assocChilds = delegator.findByAnd("ContentAssoc",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",assoc.contentIdTo,"contentAssocTypeId", "TREE_CHILD"))/>
+ <#if assocChilds?has_content>
+ <@fillTree assocList = assocChilds/>
+ </#if>
+ </div>
+ </#list>
+ </#if>
+</#macro>
+
+<dl dojoType="TreeContextMenu" id="contentContextMenu" style="font-size: 1em; color: #ccc;">
+ <dt dojoType="TreeMenuItem" id="NewDocumentTree" caption="${uiLabelMap.ContentNewFolder}"/>
+ <dt dojoType="TreeMenuItem" id="NewDocument" caption="${uiLabelMap.ContentNewContentInFolder}"/>
+ <#--<dt dojoType="TreeMenuItem" id="EditDocument" caption="Edit Document"/> -->
+ <dt dojoType="TreeMenuItem" id="RenameDocumentTree" caption="${uiLabelMap.ContentRenameFolder}"/>
+ <dt dojoType="TreeMenuItem" id="DeleteDocument" caption="${uiLabelMap.ContentDeleteFolder}"/>
+</dl>
+
+
+<dojo:TreeSelector widgetId="contentTreeSelector" eventNames="select:showDocument"></dojo:TreeSelector>
+<div dojoType="Tree" menu="contentContextMenu" widgetId="contentTree" selector="contentTreeSelector" toggler="fade" toggleDuration="500">
+ <#if (contentAssoc?has_content)>
+ <@fillTree assocList = contentAssoc/>
+ </#if>
+</div>
+

Propchange: ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Sun Aug 16 02:04:17 2009
@@ -243,4 +243,12 @@
<link target="navigateContent"/>
</menu-item>
</menu>
+ <menu name="lookupMenu" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="close" title="${uiLabelMap.CommonClose}">
+ <link target="javascript:window.close();" url-mode="plain"/>
+ </menu-item>
+ <menu-item name="index" title="${uiLabelMap.CommonExtIndex}">
+ <link target="showHelp?helpTopic=navigateHelp"/>
+ </menu-item>
+ </menu>
</menus>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Manufacturing Component Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Marketing Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Order Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Party Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Added: ofbiz/trunk/applications/product/data/ProductHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductHelpData.xml?rev=804546&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductHelpData.xml (added)
+++ ofbiz/trunk/applications/product/data/ProductHelpData.xml Sun Aug 16 02:04:17 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+ <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.
+ </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"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/product/data/ProductHelpData.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/product/data/ProductHelpData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/product/data/ProductHelpData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Sun Aug 16 02:04:17 2009
@@ -33,6 +33,7 @@
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ProductScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ProductUserDemoData.xml"/>

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=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Catalog Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Facility Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Sun Aug 16 02:04:17 2009
@@ -45,8 +45,8 @@
</root>
]]></textData>
</ElectronicText>
- <DataResource dataResourceId="HELP-TEMPL-FLAT_GREY"/>
- <Content contentId="HELP-PortLetCalendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceId="HELP-PortLetCalendar" statusId="CTNT_IN_PROGRESS" contentName="PortLetCalendar" mimeTypeId="text/html"/>
+ <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"/>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include location="component://workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml"/>
<description>Work Manager Module Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/bi/webapp/bi/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -22,6 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">

<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Business Intelligence Component Site Configuration File</description>



Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Sun Aug 16 02:04:17 2009
@@ -105,6 +105,7 @@


<EnumerationType description="Visual Theme Resource Type (stylesheet, javascript file, etc)" enumTypeId="VT_RES_TYPE" hasTable="N"/>
+ <Enumeration enumId="VT_NAME" description="Visual Theme name" enumTypeId="VT_RES_TYPE" sequenceId="00"/>
<Enumeration enumId="VT_STYLESHEET" description="Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="01"/>
<Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
<Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/>
@@ -117,8 +118,7 @@
<Enumeration enumId="VT_NAV_TMPLT_LOC" description="Main Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="10"/>
<Enumeration enumId="VT_MSG_TMPLT_LOC" description="Main Messages Template Location" enumTypeId="VT_RES_TYPE" sequenceId="11"/>
<Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" enumTypeId="VT_RES_TYPE" sequenceId="12"/>
- <Enumeration enumId="VT_HELP_TEMPL" description="Help screen template" enumTypeId="VT_RES_TYPE" sequenceId="13"/>
-
+
<VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/>
<VisualThemeSet visualThemeSetId="ECOMMERCE" description="Themes to be used for ECommerce applications"/>

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Sun Aug 16 02:04:17 2009
@@ -18,7 +18,6 @@
-->

<#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ />
- <#assign helpUrlTopic = helpUrlsMap["HelpNotFound"]/>
<#assign helpUrlPrefix = "" />
<#assign helpUrlSuffix = "" />

@@ -26,7 +25,7 @@
${helpTopic}
-->
<#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")>
- <#assign helpContent = delegator.findByAnd("Content", {"contentId" : helpTopic})?if_exists>
+ <#assign helpContent = delegator.findByAnd("Content", {"contentName" : helpTopic})?if_exists>
</#if>

<#if helpUrlsMap["Prefix"] != "Prefix">
@@ -37,4 +36,6 @@
</#if>
<#if helpUrlsMap[helpTopic] != helpTopic >
<#assign helpUrlTopic = helpUrlsMap[helpTopic] />
+ <#else>
+ <#assign helpTopic = "navigateHelp"/>
</#if>

Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Sun Aug 16 02:04:17 2009
@@ -31,6 +31,17 @@
<script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
+ <#if layoutSettings.javaScripts?has_content>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#list>
+ </#if>
<#if layoutSettings.styleSheets?has_content>
<#list layoutSettings.styleSheets as styleSheet>
<link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun Aug 16 02:04:17 2009
@@ -21,6 +21,7 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include location="component://common/webcommon/WEB-INF/tempexpr-controller.xml"/>
<description>WebTools Site Configuration File</description>
<owner>Copyright 2001-2009 The Apache Software Foundation</owner>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sun Aug 16 02:04:17 2009
@@ -160,8 +160,8 @@
<WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/>


- <DataResource dataResourceId="HELP-MY-PORTAL" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP-MY-PORTAL">
+ <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>
@@ -175,8 +175,8 @@
</root>
]]></textData>
</ElectronicText>
- <DataResource dataResourceId="HELP-TEMPL-FLAT_GREY"/>
- <Content contentId="HELP-MY-PORTAL" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceId="HELP-MY-PORTAL" statusId="CTNT_IN_PROGRESS" contentName="My Portal General help" mimeTypeId="text/html"/>
+ <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/data/BizznessTimeThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
+++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Sun Aug 16 02:04:17 2009
@@ -20,6 +20,7 @@

<entity-engine-xml>
<VisualTheme visualThemeId="BIZZNESS_TIME" visualThemeSetId="BACKOFFICE" description="It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down"/>
+ <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAME" resourceValue="BIZZNESS_TIME" sequenceId="01"/>
<VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bizznesstime/css/style.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="01"/>
<VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>

Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Sun Aug 16 02:04:17 2009
@@ -126,8 +126,8 @@
<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 || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")>
- <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span>
+ <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")>
+ <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>
</#if>

Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Sun Aug 16 02:04:17 2009
@@ -20,6 +20,7 @@

<entity-engine-xml>
<VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=804546&r1=804545&r2=804546&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Sun Aug 16 02:04:17 2009
@@ -182,8 +182,8 @@
</#if>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <#if helpContent?has_content || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")>
- <li><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
+ <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")>
+ <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>
</#if>