OFBiz › OFBiz - Commits

svn commit: r1740682 - in /ofbiz/trunk/themes: bizznesstime/data/ bizznesstime/includes/ bizznesstime/template/ bluelight/data/ bluelight/includes/ bluelight/template/ droppingcrumbs/data/ droppingcrumbs/includes/ droppingcrumbs/template/ flatgrey/data...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
Deepak Dixit-5
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1740682 - in /ofbiz/trunk/themes: bizznesstime/data/ bizznesstime/includes/ bizznesstime/template/ bluelight/data/ bluelight/includes/ bluelight/template/ droppingcrumbs/data/ droppingcrumbs/includes/ droppingcrumbs/template/ flatgrey/data...

Deepak Dixit-5
Author: deepak
Date: Sun Apr 24 08:45:28 2016
New Revision: 1740682

URL: http://svn.apache.org/viewvc?rev=1740682&view=rev
Log:
(OFBIZ-7022) relocate .ftl files for all the theme component.

Added:
    ofbiz/trunk/themes/bizznesstime/template/
      - copied from r1740680, ofbiz/trunk/themes/bizznesstime/includes/
    ofbiz/trunk/themes/bluelight/template/
      - copied from r1740680, ofbiz/trunk/themes/bluelight/includes/
    ofbiz/trunk/themes/droppingcrumbs/template/
      - copied from r1740680, ofbiz/trunk/themes/droppingcrumbs/includes/
    ofbiz/trunk/themes/flatgrey/template/
      - copied from r1740680, ofbiz/trunk/themes/flatgrey/includes/
    ofbiz/trunk/themes/multiflex/template/
      - copied from r1740680, ofbiz/trunk/themes/multiflex/includes/
    ofbiz/trunk/themes/rainbowstone/template/
      - copied from r1740680, ofbiz/trunk/themes/rainbowstone/includes/templates/
    ofbiz/trunk/themes/rainbowstone/template/includes/
      - copied from r1740680, ofbiz/trunk/themes/rainbowstone/includes/
    ofbiz/trunk/themes/tomahawk/template/
      - copied from r1740680, ofbiz/trunk/themes/tomahawk/includes/
Removed:
    ofbiz/trunk/themes/bizznesstime/includes/
    ofbiz/trunk/themes/bluelight/includes/
    ofbiz/trunk/themes/droppingcrumbs/includes/
    ofbiz/trunk/themes/flatgrey/includes/
    ofbiz/trunk/themes/multiflex/includes/
    ofbiz/trunk/themes/rainbowstone/includes/
    ofbiz/trunk/themes/rainbowstone/template/includes/templates/
    ofbiz/trunk/themes/tomahawk/includes/
Modified:
    ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
    ofbiz/trunk/themes/bizznesstime/template/appbar.ftl
    ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml
    ofbiz/trunk/themes/bluelight/template/footer.ftl
    ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
    ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
    ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml
    ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml
    ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl

Modified: ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=1740682&r1=1740681&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
+++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Sun Apr 24 08:45:28 2016
@@ -59,8 +59,8 @@ under the License.
     <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="30"/>
     
     <!-- ftl references -->
-    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bizznesstime/includes/header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bizznesstime/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bizznesstime/includes/appbar.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bizznesstime/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bizznesstime/template/header.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bizznesstime/template/footer.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bizznesstime/template/appbar.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bizznesstime/template/messages.ftl" sequenceId="01"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/bizznesstime/template/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/template/appbar.ftl?rev=1740682&r1=1740680&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/template/appbar.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/template/appbar.ftl Sun Apr 24 08:45:28 2016
@@ -47,7 +47,7 @@ under the License.
             </#list>
                 </ul>
                 
-                <#include "component://bizznesstime/includes/secondary-appbar.ftl" />
+                <#include "component://bizznesstime/template/secondary-appbar.ftl" />
             </div>
         </div>
 </#if>
\ No newline at end of file

Modified: ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=1740682&r1=1740681&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml (original)
+++ ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml Sun Apr 24 08:45:28 2016
@@ -59,10 +59,10 @@ under the License.
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bluelight/dropdown.js" sequenceId="30"/>
     
     <!-- ftl references -->
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bluelight/includes/header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bluelight/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://bluelight/includes/appbarOpen.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://bluelight/includes/appbarClose.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bluelight/includes/messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bluelight/template/header.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bluelight/template/footer.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://bluelight/template/appbarOpen.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://bluelight/template/appbarClose.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bluelight/template/messages.ftl" sequenceId="01"/>
     
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/bluelight/template/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/template/footer.ftl?rev=1740682&r1=1740680&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/template/footer.ftl (original)
+++ ofbiz/trunk/themes/bluelight/template/footer.ftl Sun Apr 24 08:45:28 2016
@@ -24,4 +24,4 @@ under the License.
   </div>
 </div>
 
-<#include "component://flatgrey/includes/footer.ftl" />
+<#include "component://flatgrey/template/footer.ftl" />

Modified: ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml?rev=1740682&r1=1740681&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml (original)
+++ ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml Sun Apr 24 08:45:28 2016
@@ -59,10 +59,10 @@ under the License.
     <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/droppingcrumbs/js/dropdown.js" sequenceId="30"/>
     
     <!-- ftl references -->
-    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://droppingcrumbs/includes/header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://droppingcrumbs/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarOpen.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarClose.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://droppingcrumbs/template/header.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://droppingcrumbs/template/footer.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://droppingcrumbs/template/appbarOpen.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://droppingcrumbs/template/appbarClose.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
     
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1740682&r1=1740681&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Sun Apr 24 08:45:28 2016
@@ -60,8 +60,8 @@ under the License.
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/flatgrey/js/application.js" sequenceId="30"/>
     
     <!-- ftl references -->
-    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/includes/header.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/template/header.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/messages.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/template/footer.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/template/appbar.ftl" sequenceId="01"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml?rev=1740682&r1=1740681&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml (original)
+++ ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml Sun Apr 24 08:45:28 2016
@@ -25,7 +25,7 @@ under the License.
     <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="04"/>
     <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://multiflex/includes/header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://multiflex/includes/footer.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://multiflex/template/header.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://multiflex/template/footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="MULTIFLEX" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/multiflex/screenshot.jpg" sequenceId="01"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml?rev=1740682&r1=1740681&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml (original)
+++ ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml Sun Apr 24 08:45:28 2016
@@ -31,16 +31,16 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_FTR_JAVASCRIPT" resourceValue="/rainbowstone/js/rainbowstone.js" sequenceId="01"/>
     <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/includes/header.ftl" 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_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.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"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/includes/templates/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/changePassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/forgotPassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/getSecurityQuestion.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/login.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/template/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/changePassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/forgotPassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/template/getSecurityQuestion.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/template/login.ftl" sequenceId="01"/>
 
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/rainbowstone/js/less.min.js" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="02"/>
@@ -79,16 +79,16 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_FTR_JAVASCRIPT" resourceValue="/rainbowstone/js/rainbowstone.js" sequenceId="01"/>
     <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/includes/header.ftl" 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_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.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"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/includes/templates/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/changePassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/forgotPassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/getSecurityQuestion.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/login.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/template/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/changePassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/forgotPassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/template/getSecurityQuestion.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/template/login.ftl" sequenceId="01"/>
 
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="02"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="03"/>
@@ -123,16 +123,16 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_FTR_JAVASCRIPT" resourceValue="/rainbowstone/js/rainbowstone.js" sequenceId="01"/>
     <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/includes/header.ftl" 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_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.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"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/includes/templates/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/changePassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/forgotPassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/getSecurityQuestion.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/login.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/template/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/changePassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/forgotPassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/template/getSecurityQuestion.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/template/login.ftl" sequenceId="01"/>
 
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="02"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="03"/>
@@ -166,16 +166,16 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_FTR_JAVASCRIPT" resourceValue="/rainbowstone/js/rainbowstone.js" sequenceId="01"/>
     <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/includes/header.ftl" 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_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/includes/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/includes/topappbar.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"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/includes/templates/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/changePassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/forgotPassword.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/getSecurityQuestion.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/includes/templates/login.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MENU_MACRO_LIB" resourceValue="component://rainbowstone/template/htmlMenuMacroLibrary.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_CHPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/changePassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_FGPWD_TMPLT_LOC" resourceValue="component://rainbowstone/template/forgotPassword.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_GSQUE_TMPLT_LOC" resourceValue="component://rainbowstone/template/getSecurityQuestion.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_LOGIN_TMPLT_LOC" resourceValue="component://rainbowstone/template/login.ftl" sequenceId="01"/>
 
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="02"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="03"/>

Modified: ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl?rev=1740682&r1=1740680&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl (original)
+++ ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl Sun Apr 24 08:45:28 2016
@@ -91,7 +91,7 @@ under the License.
         </div> <!-- main-nav-bar-left -->
         <div id="main-nav-bar-right">
             <div id="company-logo"></div>
-            <#include "component://rainbowstone/includes/avatar.ftl"/>
+            <#include "component://rainbowstone/template/includes/avatar.ftl"/>
         </div>  <!-- main-nav-bar-right -->
     </div> <!-- main navigation bar -->
     <div id="nav-bar-offset"></div>

Modified: ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl?rev=1740682&r1=1740680&r2=1740682&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl (original)
+++ ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl Sun Apr 24 08:45:28 2016
@@ -217,7 +217,7 @@ under the License.
                 <a class="dark-color" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a>
             </#if>
 
-            <#include "component://rainbowstone/includes/avatar.ftl"/>
+            <#include "component://rainbowstone/template/includes/avatar.ftl"/>
         </div>
     </div> <!-- main navigation bar -->
     <div id="app-bar-line"></div>


Free forum by Nabble Edit this page