svn commit: r1744783 [2/2] - in /ofbiz/trunk: applications/accounting/widget/ap/ applications/commonext/data/helpdata/ applications/commonext/widget/ofbizsetup/ applications/manufacturing/widget/manufacturing/ applications/marketing/widget/sfa/ applica...

[Deepak Dixit-5]

Modified: ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml (original)
+++ ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml Fri May 20 18:52:54 2016
@@ -32,7 +32,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeSaphir.png" sequenceId="01"/>
@@ -80,7 +80,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeRuby.png" sequenceId="01"/>
@@ -124,7 +124,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeEmerald.png" sequenceId="01"/>
@@ -167,7 +167,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeAmber.png" sequenceId="01"/>

Modified: ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml (original)
+++ ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml Fri May 20 18:52:54 2016
@@ -63,5 +63,5 @@ under the License.
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://tomahawk/template/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://tomahawk/template/AppBarOpen.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://tomahawk/template/AppBarClose.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/tomahawk/template/AppBarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/template/AppBarClose.ftl?rev=1744783&r1=1744782&r2=1744783&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/template/AppBarClose.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/template/AppBarClose.ftl Fri May 20 18:52:54 2016
@@ -74,7 +74,7 @@ under the License.
     <#if userLogin??>
       <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
       <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
-        <#include "component://common/template/includes/helplink.ftl" />
+        <#include "component://common/template/includes/HelpLink.ftl" />
         <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
       </#if>
       <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>