svn commit: r778991 - in /ofbiz/trunk: framework/common/webcommon/inc
Locked
 
|
Author: apatel
Date: Wed May 27 04:31:12 2009 New Revision: 778991 URL: http://svn.apache.org/viewvc?rev=778991&view=rev Log: Moved html body element start and end out of header and footer templates files. Added generic sections for body section of page. Added: ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl (with props) ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl (with props) Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/trunk/themes/multiflex/includes/footer.ftl ofbiz/trunk/themes/multiflex/includes/header.ftl Added: ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl?rev=778991&view=auto ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl (added) +++ ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl Wed May 27 04:31:12 2009 @@ -0,0 +1,20 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +</body> +</html> Propchange: ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/common/webcommon/includes/closehtmlbody.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl?rev=778991&view=auto ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl (added) +++ ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl Wed May 27 04:31:12 2009 @@ -0,0 +1,19 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<body> Propchange: ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/common/webcommon/includes/openhtmlbody.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl?rev=778991&r1=778990&r2=778991&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl Wed May 27 04:31:12 2009 @@ -31,5 +31,4 @@ </div> <br/> <div class="tabletext" align="center"><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div> -</body> -</html> + Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl?rev=778991&r1=778990&r2=778991&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/header.ftl Wed May 27 04:31:12 2009 @@ -16,9 +16,8 @@ specific language governing permissions and limitations under the License. --> -<#include "component://ecommerce/webapp/ecommerce/includes/headerHead.ftl" /> -<body> + <div id="ecom-header"> <div id="left"> <#if sessionAttributes.overrideLogo?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=778991&r1=778990&r2=778991&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Wed May 27 04:31:12 2009 @@ -60,25 +60,28 @@ <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/footer.ftl"/> </actions> <widgets> + <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/includes/headerHead.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/webcommon/includes/openhtmlbody.ftl"/></html></platform-specific> <!-- render header --> - <platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific> + <container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container> <container id="ecom-mainarea"> <!-- by default will render left-bar only if left/rightbarScreenName value not empty --> - <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> - <include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/> + <container id="div1" style="left"><include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/></container> + <container id="div2" style="right"><include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/></container> - <container style="${MainColumnStyle}"> + <container id="div3" style="${MainColumnStyle}"> <!-- render messages --> <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> <decorator-section-include name="body"/> </container> - <container style="endcolumns"/> + <container id="div4" style="endcolumns"/> </container> <!-- render footer --> - <platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific> + <container id="footer"><platform-specific><html><html-template location="${footerTemplateLocation}"/></html></platform-specific></container> + <platform-specific><html><html-template location="component://common/webcommon/includes/closehtmlbody.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -87,7 +90,6 @@ <screen name="leftbar"> <section> <widgets> - <container style="left"> <include-screen name="choosecatalog" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="keywordsearchbox" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="sidedeepcategory" location="component://ecommerce/widget/CatalogScreens.xml"/> @@ -97,14 +99,12 @@ <include-screen name="forums" location="component://ecommerce/widget/ForumScreens.xml"/> <include-screen name="content_categories" location="component://ecommerce/widget/ContentScreens.xml"/> <include-screen name="blogs" location="component://ecommerce/widget/blog/BlogScreens.xml"/> - </container> </widgets> </section> </screen> <screen name="rightbar"> <section> <widgets> - <container style="right"> <include-screen name="language"/> <include-screen name="minicart" location="component://ecommerce/widget/CartScreens.xml"/> <include-screen name="minipromotext" location="component://ecommerce/widget/CartScreens.xml"/> @@ -114,7 +114,6 @@ <include-screen name="minilastviewedproducts" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="minilastproductsearches" location="component://ecommerce/widget/CatalogScreens.xml"/> <include-screen name="recentlyviewed" location="component://ecommerce/widget/ContentScreens.xml"/> - </container> </widgets> </section> </screen> Modified: ofbiz/trunk/themes/multiflex/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/includes/footer.ftl?rev=778991&r1=778990&r2=778991&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/includes/footer.ftl (original) +++ ofbiz/trunk/themes/multiflex/includes/footer.ftl Wed May 27 04:31:12 2009 @@ -31,5 +31,3 @@ </#if> </div> </div> -</body> -</html> Modified: ofbiz/trunk/themes/multiflex/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/includes/header.ftl?rev=778991&r1=778990&r2=778991&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/includes/header.ftl (original) +++ ofbiz/trunk/themes/multiflex/includes/header.ftl Wed May 27 04:31:12 2009 @@ -16,12 +16,10 @@ specific language governing permissions and limitations under the License. --> -<#include "component://ecommerce/webapp/ecommerce/includes/headerHead.ftl" /> <!-- Global IE fix to avoid layout crash when single word size wider than column width --> <!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]--> -<body> <div class="page-container"> <div class="header"> <div class="header-top"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |