You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/08/12 10:48:20 UTC
svn commit: r803416 - in /ofbiz/trunk: applications/commonext/
applications/commonext/config/ applications/commonext/webapp/WEB-INF/
applications/commonext/widget/ applications/content/entitydef/
applications/content/src/org/ofbiz/content/content/ appl...
Author: hansbak
Date: Wed Aug 12 08:48:19 2009
New Revision: 803416
URL: http://svn.apache.org/viewvc?rev=803416&view=rev
Log:
extended the help system so that help pages can also be used from within the content component when available. If not found, the page within ofbiz.apache.org will be displayed. as is the case now. See the my portal component for an example. Still need to extend the <content tag so that an override template can be specified.
Added:
ofbiz/trunk/applications/commonext/config/
ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml (with props)
ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (with props)
Modified:
ofbiz/trunk/applications/commonext/ofbiz-component.xml
ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
ofbiz/trunk/applications/content/entitydef/entitymodel.xml
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
ofbiz/trunk/framework/common/data/CommonTypeData.xml
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/ofbiz-component.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/commonext/config/CommonExtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml?rev=803416&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml (added)
+++ ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml Wed Aug 12 08:48:19 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <property key="CommonExtHelpDefinition">
+ <value xml:lang="en">Definition, what is it?</value>
+ </property>
+ <property key="CommonExtHelpTitle">
+ <value xml:lang="en">Help screen.</value>
+ </property>
+ <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>
+</resource>
Propchange: ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.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=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Wed Aug 12 08:48:19 2009
@@ -22,6 +22,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
+ <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/SystemInfoPortletData.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=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml Wed Aug 12 08:48:19 2009
@@ -30,4 +30,12 @@
<event type="service" invoke="deleteAllSystemNotes"/>
<response name="success" type="view-last"/>
</request-map>
+
+ <request-map uri="showHelp">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="showHelp"/>
+ </request-map>
+
+ <view-map name="showHelp" type="screen" page="component://commonext/widget/HelpScreens.xml#ShowHelp"/>
+
</site-conf>
Added: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=803416&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (added)
+++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Wed Aug 12 08:48:19 2009
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="ShowHelp">
+ <section>
+ <condition>
+ <if-empty field="parameters.portalPageId"/>
+ </condition>
+ <actions>
+ <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]"/>
+ </actions>
+ <widgets>
+ <section>
+ <condition>
+ <if-empty field="content"/>
+ </condition>
+ <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>
+ </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....">
+ <include-form name="PortletList" location="component://common/widget/PortalPageForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </fail-widgets>
+ </section>
+ </screen>
+
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Wed Aug 12 08:48:19 2009
@@ -228,6 +228,9 @@
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
<key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
+ <index name="contentName">
+ <index-field name="contentName"/>
+ </index>
</entity>
<view-entity entity-name="ContentAndRole" package-name="org.ofbiz.content.content" title="Content And Role View Entity">
<member-entity entity-alias="CNT" entity-name="Content"/>
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Wed Aug 12 08:48:19 2009
@@ -210,7 +210,7 @@
String dataResourceId = content.getString("dataResourceId");
String contentId = content.getString("contentId");
if (UtilValidate.isEmpty(dataResourceId)) {
- Debug.logError("No dataResourceId found.", module);
+ Debug.logError("No dataResourceId found for contentId: " + content.getString("contentId"), module);
return;
}
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Wed Aug 12 08:48:19 2009
@@ -29,6 +29,24 @@
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">
+ <textData><![CDATA[
+ <root>
+ <definition>
+ This Calendar portler will show events for a certain person, facility or fixed asset
+ </defintion>
+ <usedFor>
+ It provides an overview on a dayly/weekly/or month period.
+ </usedFor>
+ <onScreen>
+ You will see the particular view with the ability to add an event.
+ </onScreen>
+ </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"/>
Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Wed Aug 12 08:48:19 2009
@@ -117,7 +117,8 @@
<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/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Wed Aug 12 08:48:19 2009
@@ -123,16 +123,10 @@
<response name="success" type="request" value="ManagePortalPages"/>
<response name="error" type="request" value="ManagePortalPages"/>
</request-map>
- <request-map uri="selectPortletForHelp">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="selectPortletForHelp"/>
- </request-map>
-
<!-- View Mappings -->
<view-map name="showPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
<view-map name="showPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortlet"/>
<view-map name="showPortletDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletDecorator"/>
<view-map name="ManagePortalPages" type="screen" page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
<view-map name="AddPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
- <view-map name="selectPortletForHelp" type="screen" page="component://common/widget/PortalPageScreens.xml#selectPortletForHelp"/>
</site-conf>
Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Wed Aug 12 08:48:19 2009
@@ -25,6 +25,9 @@
<#-- 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", {"contentId" : helpTopic})?if_exists>
+ </#if>
<#if helpUrlsMap["Prefix"] != "Prefix">
<#assign helpUrlPrefix = helpUrlsMap["Prefix"] />
Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Wed Aug 12 08:48:19 2009
@@ -25,7 +25,7 @@
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title}</title>
+ <title>${title?if_exists}</title>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Wed Aug 12 08:48:19 2009
@@ -116,13 +116,15 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
</form>
- <form name="PortletList" type="list" list-name="portlets" separate-columns="true"
+ <form name="PortletList" type="list" separate-columns="true" list-name="portlets"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <row-actions>
- <set field="portletHelp" value="${groovy:helpUrlsMap.get("PORTLET_".concat(portalPortletId)).equals("PORTLET_".concat(portalPortletId))?helpUrlsMap.MYPORTAL_showPortalPage:helpUrlsMap.("PORTLET_".concat(portalPortletId))}"/>
- </row-actions>
+ <actions>
+ <entity-and entity-name="PortalPagePortletView" list="portlets">
+ <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+ </entity-and>
+ </actions>
<field name="portletName">
- <hyperlink also-hidden="false" target-type="plain" target="${parameters.helpUrlPrefix}${portletHelp}${parameters.helpUrlSuffix}" description="${portletName}" ></hyperlink>
+ <hyperlink also-hidden="false" target="showHelp?helpTopic=PortLet${portalPortletId}" description="${portletName}" ></hyperlink>
</field>
<field name="description"><display/></field>
</form>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Wed Aug 12 08:48:19 2009
@@ -181,26 +181,4 @@
</widgets>
</section>
</screen>
-
- <screen name="selectPortletForHelp">
- <section>
- <actions>
- <entity-and entity-name="PortalPagePortletView" list="portlets">
- <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
- </entity-and>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
- <set field="title" value="${uiLabelMap.PageTitleLookupPortLetHelp}"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <label style="h2" text="Select a portlet you would like to have help on....."></label>
- <include-form name="PortletList" location="component://common/widget/PortalPageForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
</screens>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Wed Aug 12 08:48:19 2009
@@ -158,5 +158,25 @@
<PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/>
<WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/>
+
+ <!-- Myportal help pages -->
+ <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">
+ <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.
+ </general>
+ </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"/>
+
</entity-engine-xml>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml Wed Aug 12 08:48:19 2009
@@ -26,6 +26,7 @@
<entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalTypeData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Wed Aug 12 08:48:19 2009
@@ -126,11 +126,11 @@
<span><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <#if parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage">
- <span><a href="<@o...@ofbizUrl>?portalPageId=${parameters.portalPageId}&helpUrlPrefix=${helpUrlPrefix}&helpUrlSuffix=${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></span>
+ <#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>
<#else>
<span><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></span>
</#if>
- </#if>
+ </#if>
</div>
</div>
\ No newline at end of file
Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Wed Aug 12 08:48:19 2009
@@ -29,4 +29,40 @@
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.gif" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELP_TEMPL" resourceValue="HELP-TEMPL-FLAT_GREY" sequenceId="01"/>
+
+ <!-- help template -->
+ <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">
+ <textData><![CDATA[
+<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>
+ </#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>
+
+ </div>
+ </div>
+</div>
+ ]]></textData>
+ </ElectronicText>
+
</entity-engine-xml>
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=803416&r1=803415&r2=803416&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Wed Aug 12 08:48:19 2009
@@ -182,8 +182,8 @@
</#if>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <#if parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage">
- <li><a href="<@o...@ofbizUrl>?portalPageId=${parameters.portalPageId}&helpUrlPrefix=${helpUrlPrefix}&helpUrlSuffix=${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
+ <#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>
<#else>
<li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
</#if>