svn commit: r1744777 - in /ofbiz/trunk/themes: bizznesstime/data/ bizznesstime/template/ bluelight/data/ bluelight/template/ droppingcrumbs/template/ flatgrey/data/ flatgrey/template/ multiflex/data/ multiflex/template/ rainbowstone/data/ rainbowstone/...

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

svn commit: r1744777 - in /ofbiz/trunk/themes: bizznesstime/data/ bizznesstime/template/ bluelight/data/ bluelight/template/ droppingcrumbs/template/ flatgrey/data/ flatgrey/template/ multiflex/data/ multiflex/template/ rainbowstone/data/ rainbowstone/...

Deepak Dixit-5
Author: deepak
Date: Fri May 20 17:36:41 2016
New Revision: 1744777

URL: http://svn.apache.org/viewvc?rev=1744777&view=rev
Log:
(OFBIZ-7021) Renamed theme component ftl file name from lower case to upper camel case pattern.

Added:
    ofbiz/trunk/themes/bizznesstime/template/AppBar.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bizznesstime/template/appbar.ftl
    ofbiz/trunk/themes/bizznesstime/template/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bizznesstime/template/footer.ftl
    ofbiz/trunk/themes/bizznesstime/template/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bizznesstime/template/header.ftl
    ofbiz/trunk/themes/bizznesstime/template/Messages.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bizznesstime/template/messages.ftl
    ofbiz/trunk/themes/bizznesstime/template/SecondaryAppBar.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bizznesstime/template/secondary-appbar.ftl
    ofbiz/trunk/themes/bluelight/template/AppBarClose.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bluelight/template/appbarClose.ftl
    ofbiz/trunk/themes/bluelight/template/AppBarOpen.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bluelight/template/appbarOpen.ftl
    ofbiz/trunk/themes/bluelight/template/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bluelight/template/footer.ftl
    ofbiz/trunk/themes/bluelight/template/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bluelight/template/header.ftl
    ofbiz/trunk/themes/bluelight/template/Messages.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/bluelight/template/messages.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/AppBarClose.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/droppingcrumbs/template/appbarClose.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/AppBarOpen.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/droppingcrumbs/template/appbarOpen.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/droppingcrumbs/template/footer.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/droppingcrumbs/template/header.ftl
    ofbiz/trunk/themes/flatgrey/template/AppBar.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/flatgrey/template/appbar.ftl
    ofbiz/trunk/themes/flatgrey/template/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/flatgrey/template/footer.ftl
    ofbiz/trunk/themes/flatgrey/template/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/flatgrey/template/header.ftl
    ofbiz/trunk/themes/multiflex/template/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/multiflex/template/footer.ftl
    ofbiz/trunk/themes/multiflex/template/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/multiflex/template/header.ftl
    ofbiz/trunk/themes/rainbowstone/template/ChangePassword.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/changePassword.ftl
    ofbiz/trunk/themes/rainbowstone/template/ForgotPassword.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/forgotPassword.ftl
    ofbiz/trunk/themes/rainbowstone/template/GetSecurityQuestion.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/getSecurityQuestion.ftl
    ofbiz/trunk/themes/rainbowstone/template/HtmlMenuMacroLibrary.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/htmlMenuMacroLibrary.ftl
    ofbiz/trunk/themes/rainbowstone/template/Login.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/login.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/Avatar.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/includes/avatar.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/includes/footer.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/rainbowstone/template/includes/header.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
      - copied, changed from r1744765, ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl
    ofbiz/trunk/themes/tomahawk/template/AppBarClose.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/tomahawk/template/appbarClose.ftl
    ofbiz/trunk/themes/tomahawk/template/AppBarOpen.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/tomahawk/template/appbarOpen.ftl
    ofbiz/trunk/themes/tomahawk/template/Footer.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/tomahawk/template/footer.ftl
    ofbiz/trunk/themes/tomahawk/template/Header.ftl
      - copied unchanged from r1744765, ofbiz/trunk/themes/tomahawk/template/header.ftl
Removed:
    ofbiz/trunk/themes/bizznesstime/template/appbar.ftl
    ofbiz/trunk/themes/bizznesstime/template/footer.ftl
    ofbiz/trunk/themes/bizznesstime/template/header.ftl
    ofbiz/trunk/themes/bizznesstime/template/messages.ftl
    ofbiz/trunk/themes/bizznesstime/template/secondary-appbar.ftl
    ofbiz/trunk/themes/bluelight/template/appbarClose.ftl
    ofbiz/trunk/themes/bluelight/template/appbarOpen.ftl
    ofbiz/trunk/themes/bluelight/template/footer.ftl
    ofbiz/trunk/themes/bluelight/template/header.ftl
    ofbiz/trunk/themes/bluelight/template/messages.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/appbarClose.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/appbarOpen.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/footer.ftl
    ofbiz/trunk/themes/droppingcrumbs/template/header.ftl
    ofbiz/trunk/themes/flatgrey/template/appbar.ftl
    ofbiz/trunk/themes/flatgrey/template/footer.ftl
    ofbiz/trunk/themes/flatgrey/template/header.ftl
    ofbiz/trunk/themes/multiflex/template/footer.ftl
    ofbiz/trunk/themes/multiflex/template/header.ftl
    ofbiz/trunk/themes/rainbowstone/template/changePassword.ftl
    ofbiz/trunk/themes/rainbowstone/template/forgotPassword.ftl
    ofbiz/trunk/themes/rainbowstone/template/getSecurityQuestion.ftl
    ofbiz/trunk/themes/rainbowstone/template/htmlMenuMacroLibrary.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/avatar.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/footer.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/header.ftl
    ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl
    ofbiz/trunk/themes/rainbowstone/template/login.ftl
    ofbiz/trunk/themes/tomahawk/template/appbarClose.ftl
    ofbiz/trunk/themes/tomahawk/template/appbarOpen.ftl
    ofbiz/trunk/themes/tomahawk/template/footer.ftl
    ofbiz/trunk/themes/tomahawk/template/header.ftl
Modified:
    ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
    ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.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/tomahawk/data/TomahawkThemeData.xml

Modified: ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
+++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Fri May 20 17:36:41 2016
@@ -60,7 +60,7 @@ under the License.
     
     <!-- ftl references -->
     <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"/>
+    <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/bluelight/data/BlueLightThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml (original)
+++ ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml Fri May 20 17:36:41 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/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_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/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri May 20 17:36:41 2016
@@ -62,6 +62,6 @@ under the License.
     <!-- ftl references -->
     <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/template/footer.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/template/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=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml (original)
+++ ofbiz/trunk/themes/multiflex/data/MultiflexThemeData.xml Fri May 20 17:36:41 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/template/header.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=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml (original)
+++ ofbiz/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml Fri May 20 17:36:41 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/template/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/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_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/template/htmlMenuMacroLibrary.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_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/template/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/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_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/template/htmlMenuMacroLibrary.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_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/template/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/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_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/template/htmlMenuMacroLibrary.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_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/template/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/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_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/template/htmlMenuMacroLibrary.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_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=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl (original)
+++ ofbiz/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl Fri May 20 17:36:41 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/template/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>

Copied: ofbiz/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl (from r1744765, ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl?p2=ofbiz/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl&p1=ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl&r1=1744765&r2=1744777&rev=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/template/includes/topappbar.ftl (original)
+++ ofbiz/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl Fri May 20 17:36:41 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/template/includes/avatar.ftl"/>
+            <#include "component://rainbowstone/template/includes/Avatar.ftl"/>
         </div>
     </div> <!-- main navigation bar -->
     <div id="app-bar-line"></div>

Modified: ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml?rev=1744777&r1=1744776&r2=1744777&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml (original)
+++ ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml Fri May 20 17:36:41 2016
@@ -59,9 +59,9 @@ under the License.
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/tomahawk/js/dropdown.js" sequenceId="30"/>
     
     <!-- ftl references -->
-    <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://tomahawk/template/header.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://tomahawk/template/Header.ftl" sequenceId="01"/>
     <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_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"/>
 </entity-engine-xml>