svn commit: r1173274 [13/13] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/script/org/ofbiz/accounting...

[sascharodekamp]

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml Tue Sep 20 17:46:13 2011
@@ -4,11 +4,6 @@
     <description>scrum Component of the Open For Business Project</description>
 
     <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>scrumSite</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
         <param-name>localDispatcherName</param-name><param-value>scrum</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Tue Sep 20 17:46:13 2011
@@ -28,7 +28,7 @@ while (countHoliday < dayNumber) {
     var conditionTimestampFrom = new Timestamp(actualStartDate.getTime() + (countHoliday*1000*60*60*24));
     // get public holiday
     var holidayConds = FastList.newInstance();
-    holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "SCRUM_HOLIDAY"));
+    holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "PUBLIC_HOLIDAY"));
     holidayConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.EQUALS, conditionTimestampFrom));
     var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate");
     var holidayList = delegator.findList("WorkEffort", EntityCondition.makeCondition(holidayConds), fieldsToSelect, null, null, false);
@@ -234,7 +234,7 @@ if (nowTimestamp.getTime() >= conditionT
 
 // get public holiday
 var holidayConds = FastList.newInstance();
-holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "SCRUM_HOLIDAY"));
+holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "PUBLIC_HOLIDAY"));
 holidayConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.EQUALS, conditionTimestampFrom));
 var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate");
 var holidayList = delegator.findList("WorkEffort", EntityCondition.makeCondition(holidayConds), fieldsToSelect, null, null, false);

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumForms.xml Tue Sep 20 17:46:13 2011
@@ -3208,49 +3208,4 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
     </form>
-    <form name="AddPublicHoliday" type="single" target="createPublicHoliday" default-map-name="workEffort">
-        <alt-target use-when="workEffort!=null" target="updatePublicHoliday"/>
-        <field name="workEffortId" use-when="workEffort!=null"><hidden/></field>
-        <field name="partyId"><hidden value="${parameters.userLogin.partyId}"/></field>
-        <field name="roleTypeId" use-when="workEffort==null"><hidden value="CAL_OWNER"/></field>
-        <field name="statusId" use-when="workEffort==null"><hidden value="PRTYASGN_ASSIGNED"/></field>
-        <field name="workEffortTypeId"><hidden value="SCRUM_HOLIDAY"/></field>
-        <field name="currentStatusId" use-when="workEffort==null"><hidden value="CAL_TENTATIVE"/></field>
-        <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field>
-        <field name="workEffortName" title="${uiLabelMap.ScrumHolidayName}" tooltip="${uiLabelMap.CommonRequired}"><text size="50"/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
-        <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time type="date"/></field>
-        <field name="addButton" use-when="workEffort==null"><submit/></field>
-        <field name="updateButton" use-when="workEffort!=null"><submit/></field>
-    </form>
-    <form name="ListPublicHoliday" type="list" target="PublicHoliday" list-name="listIt" separate-columns="true"
-        odd-row-style="alternate-row" default-table-style="hover-bar basic-table">
-        <actions>
-            <entity-and entity-name="WorkEffort" list="listIt">
-                <field-map field-name="workEffortTypeId" value="SCRUM_HOLIDAY"/>
-                <order-by field-name="-estimatedStartDate"/>
-            </entity-and>
-        </actions>
-        <row-actions>
-            <entity-and entity-name="WorkEffortPartyAssignment" list="assignmentList">
-                <field-map field-name="workEffortId" from-field="workEffortId"/>
-            </entity-and>
-            <set field="partyId" from-field="assignmentList[0].partyId"/>
-        </row-actions>
-        <field name="workEffortId"><hidden/></field>
-        <field name="workEffortTypeId"><hidden value="SCRUM_HOLIDAY"/></field>
-        <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field>
-        <field name="workEffortName" title="${uiLabelMap.ScrumHolidayName}"><display/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
-        <field name="partyId" title="${uiLabelMap.CommonBy}">
-            <display-entity entity-name="PartyNameView"  description="${lastName}, ${firstName} ${middleName}" key-field-name="partyId"/>
-        </field>
-        <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit/></field>
-        <field name="removeHoliday" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePublicHoliday">
-                <parameter param-name="workEffortId" from-field="workEffortId"/>
-            </hyperlink>
-        </field>
-    </form>
 </forms>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml Tue Sep 20 17:46:13 2011
@@ -109,12 +109,6 @@
             </condition>
             <link target="ProductStatistics"/>
         </menu-item>
-        <menu-item name="publicHoliday" title="${uiLabelMap.PageTitlePublicHoliday}">
-            <condition>
-                <if-has-permission permission="SCRUM" action="_ADMIN"/>
-            </condition>
-            <link target="PublicHoliday"/>
-        </menu-item>
     </menu>
     
     <menu name="SprintMenu" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumScreens.xml Tue Sep 20 17:46:13 2011
@@ -2753,35 +2753,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="PublicHoliday">
-        <section>
-            <condition>
-                <if-has-permission permission="SCRUM" action="_ADMIN"/>
-            </condition>
-            <actions>
-                <set field="titleProperty" value="PageTitlePublicHoliday"/>
-                <set field="headerItem" value="admin"/>
-                <set field="tabButtonItem" value="publicHoliday"/>
-                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <screenlet id="addPublicHoliday" title="${uiLabelMap.PageTitleAddPublicHoliday}" collapsible="true">
-                                    <include-form name="AddPublicHoliday" location="component://scrum/widget/scrumForms.xml"/>
-                                </screenlet>
-                                <screenlet id="listPublicHoliday" title="${uiLabelMap.PageTitlePublicHolidayList}" collapsible="true">
-                                    <include-form name="ListPublicHoliday" location="component://scrum/widget/scrumForms.xml"/>
-                                </screenlet>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="QuickAddBacklog">
         <section>
             <condition>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Tue Sep 20 17:46:13 2011
@@ -32,6 +32,7 @@ import org.ofbiz.base.util.GeneralExcept
 import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -310,7 +311,7 @@ public class WfApplicationServices {
 
         try {
             final List<GenericValue> assigments = delegator.findByAnd("WorkEffortPartyAssignment", expresions, orderBy);
-            if (assigments.isEmpty()) {
+            if (UtilValidate.isEmpty(assigments)) {
                 Debug.logError("No accepted activities found for the workEffortId=" + workEffortId, module);
                 throw new GenericServiceException("Can not find WorkEffortPartyAssignment for the Workflow service. WorkEffortId=" + workEffortId);
             }

Modified: ofbiz/branches/jackrabbit20100709/startofbiz.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/startofbiz.sh?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/startofbiz.sh (original)
+++ ofbiz/branches/jackrabbit20100709/startofbiz.sh Tue Sep 20 17:46:13 2011
@@ -36,8 +36,9 @@ ADMIN="-Dofbiz.admin.port=$ADMIN_PORT -D
 #IPADDR=`/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
 #RMIIF="-Djava.rmi.server.hostname=$IPADDR"
 MEMIF="-Xms128M -Xmx512M -XX:MaxPermSize=512m"
+#JMX="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=33333 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
 #MISC="-Duser.language=en"
-VMARGS="$MEMIF $MISC $DEBUG $RMIIF $ADMIN"
+VMARGS="$MEMIF $MISC $JMX $DEBUG $RMIIF $ADMIN"
 
 # Worldpay Config
 #VMARGS="-Xbootclasspath/p:applications/accounting/lib/cryptix.jar $VMARGS"

Modified: ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/appbar.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/appbar.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/appbar.ftl Tue Sep 20 17:46:13 2011
@@ -43,6 +43,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl Tue Sep 20 17:46:13 2011
@@ -127,7 +127,9 @@ under the License.
             </#if>
             </span>
             <span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+            
+            <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
+            <#if parameters.componentName?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/branches/jackrabbit20100709/themes/bizznesstime/includes/secondary-appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/secondary-appbar.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/secondary-appbar.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/secondary-appbar.ftl Tue Sep 20 17:46:13 2011
@@ -42,6 +42,7 @@ under the License.
         <#if thisApp == contextPath || contextPath + "/" == thisApp>
           <#assign selected = true>
         </#if>
+        <#assign thisApp = StringUtil.wrapString(thisApp)>
         <#assign thisURL = thisApp>
         <#if thisApp != "/">
           <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/appbarOpen.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/appbarOpen.ftl Tue Sep 20 17:46:13 2011
@@ -54,6 +54,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">
@@ -83,6 +84,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl Tue Sep 20 17:46:13 2011
@@ -162,7 +162,8 @@ under the License.
             <#else>
               <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
             </#if>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+            <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
+            <#if parameters.componentName?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/branches/jackrabbit20100709/themes/droppingcrumbs/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/appbarOpen.ftl Tue Sep 20 17:46:13 2011
@@ -54,6 +54,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">
@@ -83,6 +84,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl Tue Sep 20 17:46:13 2011
@@ -152,7 +152,8 @@ under the License.
             <#else>
               <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
             </#if>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+            <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
+            <#if parameters.componentName?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/branches/jackrabbit20100709/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/appbar.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/appbar.ftl Tue Sep 20 17:46:13 2011
@@ -44,6 +44,7 @@ under the License.
           <#if thisApp == contextPath || contextPath + "/" == thisApp>
             <#assign selected = true>
           </#if>
+          <#assign thisApp = StringUtil.wrapString(thisApp)>
           <#assign thisURL = thisApp>
           <#if thisApp != "/">
             <#assign thisURL = thisURL + "/control/main">
@@ -80,6 +81,7 @@ under the License.
         <#if thisApp == contextPath || contextPath + "/" == thisApp>
           <#assign selected = true>
         </#if>
+        <#assign thisApp = StringUtil.wrapString(thisApp)>
         <#assign thisURL = thisApp>
         <#if thisApp != "/">
           <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl Tue Sep 20 17:46:13 2011
@@ -123,7 +123,8 @@ under the License.
       <#else/>
         <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
       </#if>
-      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+      <#---if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
+      <#if parameters.componentName?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/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarClose.ftl Tue Sep 20 17:46:13 2011
@@ -72,7 +72,8 @@ under the License.
       </#if>
     </#if>
     <#if userLogin?exists>
-      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+      <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
+      <#if parameters.componentName?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/branches/jackrabbit20100709/themes/tomahawk/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarOpen.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/appbarOpen.ftl Tue Sep 20 17:46:13 2011
@@ -58,9 +58,10 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
-                  <#assign thisURL = StringUtil.wrapString(thisURL) + "/control/main">
+                  <#assign thisURL = thisURL + "/control/main">
                 </#if>
                 <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
                   <!-- do not display this component-->
@@ -87,9 +88,10 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
-                  <#assign thisURL = StringUtil.wrapString(thisURL) + "/control/main">
+                  <#assign thisURL = thisURL + "/control/main">
                 </#if>
                 <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
                   <!-- do not display this component-->