svn commit: r903589 - in /ofbiz/trunk: applications/accounting/config
Locked
svn commit: r903589 - in /ofbiz/trunk: applications/accounting/config
 
|
Author: hansbak
Date: Wed Jan 27 10:09:49 2010 New Revision: 903589 URL: http://svn.apache.org/viewvc?rev=903589&view=rev Log: moved the helpscreens into the framework: a first step. core parts of the content manager to follow. Removed the references to the help screens in confluence Added: ofbiz/trunk/framework/common/widget/HelpScreens.xml (props changed) - copied unchanged from r903062, ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Removed: ofbiz/trunk/applications/accounting/config/AccountingHelpUrls.xml ofbiz/trunk/applications/commonext/widget/HelpScreens.xml ofbiz/trunk/applications/humanres/config/HumanResHelpUrls.xml ofbiz/trunk/applications/party/config/PartyHelpUrls.xml ofbiz/trunk/framework/common/config/CommonHelpUrls.xml ofbiz/trunk/specialpurpose/myportal/config/MyPortalHelpUrls.xml ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrHelpUrls.xml Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/trunk/framework/common/config/CommonUiLabels.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/themes/bizznesstime/includes/header.ftl ofbiz/trunk/themes/bluelight/includes/header.ftl ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl ofbiz/trunk/themes/flatgrey/includes/header.ftl Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed Jan 27 10:09:49 2010 @@ -31,8 +31,6 @@ <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingHelpUrls" map-name="helpUrlsMap" global="true"/> - <set field="layoutSettings.companyName" from-field="uiLabelMap.AccountingCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/> <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, Modified: ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml (original) +++ ofbiz/trunk/applications/commonext/config/CommonExtUiLabels.xml Wed Jan 27 10:09:49 2010 @@ -34,26 +34,6 @@ <value xml:lang="fr">Dernière date de changement</value> <value xml:lang="it">Data ultimo cambiamento</value> </property> - <property key="CommonExtHelpDefinition"> - <value xml:lang="en">Definition, what is it?</value> - <value xml:lang="it">Definizione, che cose'è ?</value> - </property> - <property key="CommonExtHelpTitle"> - <value xml:lang="en">Help screen.</value> - <value xml:lang="it">Videata di aiuto.</value> - </property> - <property key="CommonExtHelpUsedFor"> - <value xml:lang="en">What is it used for?</value> - <value xml:lang="it">Per cosa verrà usato ?</value> - </property> - <property key="CommonExtHelpOnScreen"> - <value xml:lang="en">What's on the screen?</value> - <value xml:lang="it">Che cosa ci sarà in questa videata ?</value> - </property> - <property key="CommonExtIndex"> - <value xml:lang="en">Index</value> - <value xml:lang="it">Indice</value> - </property> <property key="CommonExtSystemInfoNote"> <value xml:lang="en">System Info Note</value> <value xml:lang="fr">Message d'information système</value> 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=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml Wed Jan 27 10:09:49 2010 @@ -24,15 +24,6 @@ <owner>Copyright 2001-2009 The Apache Software Foundation</owner> <!-- Request Mappings --> - <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"/> @@ -45,12 +36,4 @@ <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"/> - <view-map name="ShowDocument" type="screen" page="component://commonext/widget/HelpScreens.xml#showDocument"/> - </site-conf> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Wed Jan 27 10:09:49 2010 @@ -35,7 +35,6 @@ <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. --> <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>--> - <property-map resource="HumanResHelpUrls" map-name="helpUrlsMap" global="true"/> <set field="activeApp" value="humanres" global="true"/> <set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/> <set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Wed Jan 27 10:09:49 2010 @@ -33,7 +33,6 @@ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="PartyHelpUrls" map-name="helpUrlsMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.PartyCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/> Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Wed Jan 27 10:09:49 2010 @@ -9460,6 +9460,26 @@ <value xml:lang="zh">ä¿å å©äºè¯</value> <value xml:lang="zh_CN">ä¿å å©äºè¯</value> </property> + <property key="CommonExtHelpDefinition"> + <value xml:lang="en">Definition, what is it?</value> + <value xml:lang="it">Definizione, che cose'è ?</value> + </property> + <property key="CommonExtHelpTitle"> + <value xml:lang="en">Help screen.</value> + <value xml:lang="it">Videata di aiuto.</value> + </property> + <property key="CommonExtHelpUsedFor"> + <value xml:lang="en">What is it used for?</value> + <value xml:lang="it">Per cosa verrà usato ?</value> + </property> + <property key="CommonExtHelpOnScreen"> + <value xml:lang="en">What's on the screen?</value> + <value xml:lang="it">Che cosa ci sarà in questa videata ?</value> + </property> + <property key="CommonExtIndex"> + <value xml:lang="en">Index</value> + <value xml:lang="it">Indice</value> + </property> <property key="cz"> <value xml:lang="ar">تشÙÙÙØ©</value> <value xml:lang="de">Tschechisch</value> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Wed Jan 27 10:09:49 2010 @@ -96,6 +96,14 @@ <response name="success" type="view" value="forgotPassword"/> <response name="error" type="view" value="forgotPassword"/> </request-map> + <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> <!-- Common Mappings used for locales and timezones --> <request-map uri="LookupLocales"><security https="true" auth="false"/><response name="success" type="view" value="LookupLocales" save-last-view="true"/></request-map> @@ -177,6 +185,11 @@ <event type="java" path="org.ofbiz.common.CommonEvents" invoke="jsonResponseFromRequestAttributes"/> <response name="success" type="none"/> </request-map> + + <request-map uri="showHelp"> + <security https="true" auth="true"/> + <response name="success" type="view" value="showHelp"/> + </request-map> <!-- View Mappings --> <view-map name="error" page="/error/error.jsp"/> @@ -194,6 +207,8 @@ <view-map name="ajaxAutocompleteOptions" type="screen" page="component://common/widget/CommonScreens.xml#ajaxAutocompleteOptions"/> <view-map name="help" type="screen" page="component://common/widget/CommonScreens.xml#help"/> + <view-map name="showHelp" type="screen" page="component://common/widget/HelpScreens.xml#ShowHelp"/> + <view-map name="ShowDocument" type="screen" page="component://common/widget/HelpScreens.xml#showDocument"/> <view-map name="geoLocation" type="screen" page="component://common/widget/CommonScreens.xml#geoLocation"/> <view-map name="viewBlocked" type="screen" page="component://common/widget/CommonScreens.xml#viewBlocked"/> Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Wed Jan 27 10:09:49 2010 @@ -18,25 +18,9 @@ --> <#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ /> - <#assign helpUrlPrefix = "" /> - <#assign helpUrlSuffix = "" /> - <#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files ${helpTopic} --> - <#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")> - <#assign helpContent = "Y"/> - <#assign pageAvail = delegator.findByAnd("ContentAssoc", {"mapKey" : helpTopic})/> - </#if> - - <#-- content in confluence --> - <#if helpUrlsMap["Prefix"] != "Prefix"> - <#assign helpUrlPrefix = helpUrlsMap["Prefix"] /> - </#if> - <#if helpUrlsMap["Suffix"] != "Suffix"> - <#assign helpUrlSuffix = helpUrlsMap["Suffix"] /> - </#if> - <#if helpUrlsMap[helpTopic] != helpTopic > - <#assign helpUrlTopic = helpUrlsMap[helpTopic] /> - </#if> + <#assign pageAvail = delegator.findByAnd("ContentAssoc", {"mapKey" : helpTopic})/> + Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Jan 27 10:09:49 2010 @@ -135,7 +135,6 @@ <set field="appbarOpenTemplateLocation" from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]"/> <set field="appbarCloseTemplateLocation" from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]"/> <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]"/> - <property-map resource="CommonHelpUrls" map-name="helpUrlsMap" global="true"/> <script location="component://commonext/script/changeOrgPartyId.groovy"/> </actions> <widgets> Propchange: ofbiz/trunk/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jan 27 10:09:49 2010 @@ -0,0 +1 @@ +/ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 Propchange: ofbiz/trunk/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Wed Jan 27 10:09:49 2010 @@ -202,10 +202,6 @@ <response name="success" type="view" value="printExampleFOPFonts"/> </request-map> - <request-map uri="showHelp"> - <security https="true" auth="true"/> - <response name="success" type="view" value="showHelp"/> - </request-map> <request-map uri="views"> <security https="true" auth="false"/> <response name="success" type="request" value="main"/> @@ -244,7 +240,6 @@ <!-- View Mappings --> <view-map name="main" type="screen" page="component://example/widget/example/CommonScreens.xml#main"/> - <view-map name="help" type="screen" page="component://example/widget/example/ExampleScreens.xml#help"/> <view-map name="FindExample" type="screen" page="component://example/widget/example/ExampleScreens.xml#FindExample"/> <view-map name="EditExample" type="screen" page="component://example/widget/example/ExampleScreens.xml#EditExample"/> @@ -265,10 +260,6 @@ <view-map name="ListExampleFormOnly" type="screen" page="component://example/widget/example/ExampleAjaxScreens.xml#ListExampleFormOnly"/> <view-map name="CreateExampleFormOnly" type="screen" page="component://example/widget/example/ExampleAjaxScreens.xml#CreateExampleFormOnly"/> <view-map name="printExampleFOPFonts" type="screenfop" page="component://example/widget/example/FormWidgetExampleScreens.xml#printExampleFOPFonts" content-type="application/pdf" encoding="none"/> - <!-- Commenting these out because commonext is an application component and shouldn't be referred to from the framework - <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"/> - --> <view-map name="ExampleGeoLocationPointSet1" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationPointSet1"/> <view-map name="ExampleGeoLocationPointSet2" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleGeoLocationPointSet2"/> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Wed Jan 27 10:09:49 2010 @@ -35,7 +35,6 @@ <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="MyPortalHelpUrls" map-name="helpUrlsMap" global="true"/> <set field="headerItem" value="${parameters._HOME_VIEW_PARAMS_.portalPageId}"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.MyPortalInformation" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Jan 27 10:09:49 2010 @@ -32,8 +32,6 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ProjectMgrHelpUrls" map-name="helpUrlsMap" global="true"/> - <!-- The two default (global) stylesheets are added to the list of stylesheets to the first and second position --> Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Wed Jan 27 10:09:49 2010 @@ -126,11 +126,7 @@ <span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span> <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> - <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> - <#else> - <span><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></span> - </#if> + <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> </#if> </div> </div> \ No newline at end of file Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Wed Jan 27 10:09:49 2010 @@ -151,11 +151,7 @@ </#if> <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> - <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title=${uiLabelMap.CommonHelp}></a></li> - <#else> - <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li> - </#if> + <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title=${uiLabelMap.CommonHelp}></a></li> </#if> <#if userLogin?exists> <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y"> Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original) +++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Wed Jan 27 10:09:49 2010 @@ -151,11 +151,7 @@ </#if> <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> - <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> - <#else> - <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li> - </#if> + <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> <#if userLogin?exists> <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y"> Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=903589&r1=903588&r2=903589&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original) +++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Wed Jan 27 10:09:49 2010 @@ -182,11 +182,7 @@ </#if> <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> - <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> - <#else> - <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li> - </#if> + <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> </#if> </ul> </li> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |