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/10 12:25:16 UTC
svn commit: r802724 - in /ofbiz/trunk: framework/common/webcommon/WEB-INF/
framework/common/widget/ specialpurpose/myportal/config/
themes/bizznesstime/includes/ themes/flatgrey/includes/
Author: hansbak
Date: Mon Aug 10 10:25:15 2009
New Revision: 802724
URL: http://svn.apache.org/viewvc?rev=802724&view=rev
Log:
added a special help for portal pages to provide help on portlets on that page
Modified:
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/config/MyPortalHelpUrls.xml
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl
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=802724&r1=802723&r2=802724&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Mon Aug 10 10:25:15 2009
@@ -123,11 +123,16 @@
<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/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=802724&r1=802723&r2=802724&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Mon Aug 10 10:25:15 2009
@@ -115,5 +115,13 @@
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
</form>
-
+
+ <form name="PortletList" type="list" list-name="portlets" separate-columns="true"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <field name="portletName">
+ <hyperlink also-hidden="false" target-type="plain" target="${parameters.helpUrlPrefix}${helpUrlsMap.PORTLET_${portalPortletId}}${parameters.helpUrlSuffix}?decorator=printable" description="${portletName}" ></hyperlink>
+ </field>
+ <field name="description"><display/></field>
+ </form>
+
</forms>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=802724&r1=802723&r2=802724&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Mon Aug 10 10:25:15 2009
@@ -181,5 +181,26 @@
</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/config/MyPortalHelpUrls.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalHelpUrls.xml?rev=802724&r1=802723&r2=802724&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalHelpUrls.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalHelpUrls.xml Mon Aug 10 10:25:15 2009
@@ -26,4 +26,7 @@
<property key="MYPORTAL_ManagePortalPages">
<value xml:lang="en">Manage My Portal</value>
</property>
+ <property key="PORTLET_SystemInfoNotes">
+ <value xml:lang="en">System Info Notes Portlet</value>
+ </property>
</resource>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=802724&r1=802723&r2=802724&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Mon Aug 10 10:25:15 2009
@@ -126,7 +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" />
- <span><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></span>
+ <#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>
+ <#else>
+ <span><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}?decorator=printable" target="_blank">${uiLabelMap.CommonHelp}</a></span>
+ </#if>
</#if>
</div>
</div>
\ No newline at end of file
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=802724&r1=802723&r2=802724&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Mon Aug 10 10:25:15 2009
@@ -182,8 +182,12 @@
</#if>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
- </#if>
+ <#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>
+ <#else>
+ <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}?decorator=printable" target="_blank">${uiLabelMap.CommonHelp}</a></li>
+ </#if>
+ </#if>
</ul>
</li>
</#if>