svn commit: r1082023 - in /ofbiz/trunk/themes: bizznesstime/includes/header.ftl bluelight/includes/header.ftl droppingcrumbs/includes/header.ftl flatgrey/includes/header.ftl tomahawk/includes/appbarClose.ftl

[adrianc]

Author: adrianc
Date: Wed Mar 16 01:06:23 2011
New Revision: 1082023

URL: http://svn.apache.org/viewvc?rev=1082023&view=rev
Log:
Updated visual themes to check for optional helpTopic field.

Modified:
    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
    ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl

Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1082023&r1=1082022&r2=1082023&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Wed Mar 16 01:06:23 2011
@@ -127,7 +127,7 @@ under the License.
             </#if>
             </span>
             <span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
               <#include "component://common/webcommon/includes/helplink.ftl" />
               <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span>
            </#if>

Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1082023&r1=1082022&r2=1082023&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Wed Mar 16 01:06:23 2011
@@ -162,7 +162,7 @@ under the License.
             <#else>
               <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
             </#if>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
               <#include "component://common/webcommon/includes/helplink.ftl" />
               <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
             </#if>

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1082023&r1=1082022&r2=1082023&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Wed Mar 16 01:06:23 2011
@@ -152,7 +152,7 @@ under the License.
             <#else>
               <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
             </#if>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
               <#include "component://common/webcommon/includes/helplink.ftl" />
               <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
             </#if>

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1082023&r1=1082022&r2=1082023&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Wed Mar 16 01:06:23 2011
@@ -123,7 +123,7 @@ under the License.
       <#else/>
         <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
       </#if>
-      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
         <#include "component://common/webcommon/includes/helplink.ftl" />
         <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
       </#if>

Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=1082023&r1=1082022&r2=1082023&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Wed Mar 16 01:06:23 2011
@@ -72,7 +72,7 @@ under the License.
       </#if>
     </#if>
     <#if userLogin?exists>
-      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
         <#include "component://common/webcommon/includes/helplink.ftl" />
         <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
       </#if>