svn commit: r815268 - in /ofbiz/trunk: framework/common/webcommon/includes/helplink.ftl themes/flatgrey/includes/header.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r815268 - in /ofbiz/trunk: framework/common/webcommon/includes/helplink.ftl themes/flatgrey/includes/header.ftl

hansbak-2
Author: hansbak
Date: Tue Sep 15 10:46:46 2009
New Revision: 815268

URL: http://svn.apache.org/viewvc?rev=815268&view=rev
Log:
make help button red when help screen available in the flatgrey scheme...could not get it to work in the business theme....anybody?

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
    ofbiz/trunk/themes/flatgrey/includes/header.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=815268&r1=815267&r2=815268&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Tue Sep 15 10:46:46 2009
@@ -26,10 +26,11 @@
 ${helpTopic}
 -->
   <#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")>
-    <#assign helpContent = "Y"> <!-- content in ofbiz -->
+    <#assign helpContent = "Y"/>
+    <#assign pageAvail = delegator.findByAnd("ContentAssoc", {"mapKey" : helpTopic})/>
   </#if>
   
-  <!-- content in confluence -->
+  <#-- content in confluence -->
   <#if helpUrlsMap["Prefix"] != "Prefix">
     <#assign helpUrlPrefix = helpUrlsMap["Prefix"] />
   </#if>

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=815268&r1=815267&r2=815268&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Tue Sep 15 10:46:46 2009
@@ -183,7 +183,7 @@
             <#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 href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
+                <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>
               <#else>
                 <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
               </#if>