Re: svn commit: r567090 - in /ofbiz/trunk: applications/content/config/ applications/ecommerce/config/ applications/ecommerce/data/ applications/ecommerce/webapp/
Locked
Re: svn commit: r567090 - in /ofbiz/trunk: applications/content/config/ applications/ecommerce/config/ applications/ecommerce/data/ applications/ecommerce/webapp/
 
|
Do we really want to do this? The point of having all static resources under the images component is so they can be easily moved to another server or even a third party content hosting service like Akamai or CacheFly. This is what the ofbizContentUrl transform facilitates. If we want multiple static content areas like this we will need to change that to support multiple content areas, which makes configuration and management significantly more complex. I'd like to hear from others, but my vote is to revert this. -David [hidden email] wrote: > Author: adrianc > Date: Fri Aug 17 10:22:04 2007 > New Revision: 567090 > > URL: http://svn.apache.org/viewvc?view=rev&rev=567090 > Log: > Moved the ecommain.css file to the ecommerce component. Existing installations will need to update the stylesheet field in their ProductStore entity. > > Moved forum.properties file to the content component. > > Added: > ofbiz/trunk/applications/content/config/forum.properties > ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css > Removed: > ofbiz/trunk/applications/ecommerce/config/forum.properties > ofbiz/trunk/framework/images/webapp/images/ecommain.css > Modified: > ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml > ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml > ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml > ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl > ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl > > Added: ofbiz/trunk/applications/content/config/forum.properties > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/forum.properties?view=auto&rev=567090 > ============================================================================== > --- ofbiz/trunk/applications/content/config/forum.properties (added) > +++ ofbiz/trunk/applications/content/config/forum.properties Fri Aug 17 10:22:04 2007 > @@ -0,0 +1 @@ > +descriptLen=80 > \ No newline at end of file > > Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original) > +++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Fri Aug 17 10:22:04 2007 > @@ -52,7 +52,7 @@ > authFraudMessage="Your order has been rejected and your account has been disabled due to fraud." > authErrorMessage="Problem connecting to payment processor; we will continue to retry and notify you by email." > storeCreditValidDays="90" > - styleSheet="/images/ecommain.css" headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/> > + styleSheet="/ecommerce/images/ecommain.css" headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/> > > <!-- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="testRandomAuthorize"/> --> > <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor"/> > > Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml (original) > +++ ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml Fri Aug 17 10:22:04 2007 > @@ -28,7 +28,7 @@ > authDeclinedMessage="There has been a problem with your method of payment. Please try a different method or call customer service." > authFraudMessage="Your order has been rejected and your account has been disabled due to fraud." > authErrorMessage="Problem connecting to payment processor; we will continue to retry and notify you by email." > - styleSheet="/images/ecommain.css" headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/> > + styleSheet="/ecommerce/images/ecommain.css" headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/> > <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor"/> > <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease"/> > <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture"/> > > Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css?view=auto&rev=567090 > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css (added) > +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css Fri Aug 17 10:22:04 2007 > @@ -0,0 +1,990 @@ > +/* > + * 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. > + */ > + > +/* ===== This file contains the eCommerce specific styles ===== */ > + > +/* ===== Basic Element Styles ===== */ > +BODY { > +background: #FFFFFF; > +margin-top: 10px; > +margin-right: 10px; > +margin-bottom: 10px; > +margin-left: 10px; > +} > + > +FORM { > +margin: 0px; > +} > + > +UL { > +margin-top: 0; > +margin-bottom: 0; > +} > + > +img { > +behavior: url("/images/pngbehavior.htc"); > +} > + > +.endcolumns { > +clear: both; > +height: 0px; > +visibility: hidden; > +} > + > +TH { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000000; > +} > + > +TD { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: normal; > +text-decoration: none; > +color: #000000; > +} > + > +/* ===== Header Styles ===== */ > +#ecom-header { > +position: relative; > +background: #ffffff; > +height: 80px; > +voice-family: "\"}\""; > +voice-family: inherit; > +height: 80px; > +/* border:1px solid #000; */ > +} > +#ecom-header #left { > +position: absolute; > +top: 0px; > +left: 0px; > +width: 280px; > +} > +#ecom-header #middle { > +margin-left: 290px; > +margin-right: 210px; > +padding-top: 10px; > +width: auto; > + > +text-align: center; > +} > +#ecom-header #right { > +position: absolute; > +top: 0px; > +right: 0px; > +width: 200px; > +padding: 0px; > +margin-top: 20px; > + > +text-align: right; > +} > + > +#welcome-message { > +padding-right: 10px; > +padding-left: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000000; > +} > +#welcome-message a { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +} > +#welcome-message a:hover { > +color: black; > +text-decoration: underline; > +} > +#company-name { > +margin: 0px; > +font-size: 12pt; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-weight: bold; > +color: #000099; > +white-space: nowrap; > +} > +#company-subtitle { > +margin: 0px; > +font-size: 6pt; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +color: #330099; > +white-space: nowrap; > +} > + > +#microcart { > +font-size: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-weight: bold; > +text-decoration: none; > +color: black; > +} > +#microcart a { > +text-decoration: none; > +color: #000099; > +} > +#microcart a:hover { > +color: black; > +text-decoration: underline; > +} > +#microcart .disabled { > +color: #666666; > +} > + > +/* ===== Header-Bar Styles ===== */ > +#ecom-header-bar { > +background: #B4B0AA; > +text-align: center; > +overflow: visible; > +height: 14px; > +} > + > +#ecom-header-bar ul { > +display: block; > +overflow: visible; > +list-style: none; > +background: transparent; > +vertical-align: middle; > +margin: 0px; > +padding: 0px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 12px; > +} > + > +#ecom-header-bar ul li { > +height: 14px; > +padding: 0px 8px 0px 8px; > +} > +#ecom-header-bar ul#left-links li { > +float: left; > +border-right: 1px solid #FFFFFF; > +} > +#ecom-header-bar ul#right-links li { > +float: right; > +border-left: 1px solid #FFFFFF; > +} > + > +#ecom-header-bar ul li a { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +} > +#ecom-header-bar ul li:hover a { > +color: black; > +text-decoration: underline; > +} > + > + > +/* ===== Layout/Formatting Styles ===== */ > +/* NOTE: using a combination of a float left/right for the side bars AND > + wide margins for the center to get 2 desired effects: 1. be able to end > + columns and put the footer at the bottom of the page and 2. not have the > + center column expand to full width below the columns. > + > + The downside to this is that in some browsers we can't effectively use floats > + within divs in the main column. > +*/ > + > +/* ecom-mainarea wraps what is below the header including the divs for left, main, right columns as applicable */ > +#ecom-mainarea { > +position: relative; > +background: #FFFFFF; > +width: 100%; > +margin-top: 10px; > +} > + > +#ecom-mainarea .left { > +/* alt: position: absolute; left: 0px; top: 0px; */ > +float: left; > +width: 150px; > +background: #ffffff; > +/* border:1px solid #000; */ > +} > +#ecom-mainarea .right { > +/* alt: position: absolute; right: 0px; top: 0px; */ > +float: right; > +width: 200px; > +background: #ffffff; > +} > + > + > +#ecom-mainarea .center, #ecom-mainarea .leftonly, #ecom-mainarea .rightonly, #ecom-mainarea .nocolumns { > +background:#fff; > +text-align: left; > +vertical-align: top; > +} > +#ecom-mainarea .center { > +margin-left: 160px; > +margin-right: 210px; > +voice-family: "\"}\""; > +voice-family: inherit; > +margin-left: 161px; > +margin-right: 211px; > +} > +#ecom-mainarea .leftonly { > +margin-left: 160px; > +voice-family: "\"}\""; > +voice-family: inherit; > +margin-left: 161px; > +} > +#ecom-mainarea .rightonly { > +margin-right: 210px; > +voice-family: "\"}\""; > +voice-family: inherit; > +margin-right: 211px; > +} > + > +/* ====== eCommerce "Screenlet" Styles ====== */ > +#ecom-mainarea .screenlet { > +background: #FFFFFF; > +border: 1px solid #999999; > +margin-bottom: 10px; > +height:auto !important; > +height:1% > +} > +#ecom-mainarea .screenlet-header { > +background: #000099; > +padding-top: 1px; > +padding-bottom: 3px; > +padding-right: 4px; > +padding-left: 4px; > +height:auto !important; > +height:1% > +} > +#ecom-mainarea .screenlet-body { > +background: #FFFFFF; > +padding: 4px; > +height:auto !important; > +height:1% > +} > + > +.boxhead { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 8pt; > +font-weight: bold; > +text-decoration: none; > +color: #FFFFFF; > +} > + > +.boxlink { > + float:right; > +} > + > +A.boxheadbutton { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 8pt; > +font-weight: bold; > +text-decoration: none; > +color: #FFFFFF; > +} > + > +A.boxheadbutton:hover { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 8pt; > +font-weight: bold; > +text-decoration: none; > +color: red; > +} > + > +/* Form layout styles to simulate a table-style layout */ > +#ecom-mainarea .form-row { > +clear: both; > +padding-top: 2px; > +} > +#ecom-mainarea .form-label { > +float: left; > +width: 180px; > +text-align: right; > +padding-top: 5px; > +} > +#ecom-mainarea .form-field { > +float: left; > +margin-left: 10px; > +text-align: left; > +} > + > +/* ===== Text/Label Styles ===== */ > +.tabletext, div.form-label, div.form-field { > +font-size: 10px; > +text-decoration: none; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +} > + > +A.tabletext:hover { > +font-size: 10px; > +text-decoration: underline; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +} > + > +.tablebuttontext { > +font-size: 10px; > +color: #1E3C66; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +} > + > +.contenttext { > +font-size: 8pt; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +} > + > +DIV.tabletexthidden { > +font-size: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +visibility: hidden; > +} > + > +h1 { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 12pt; > +font-weight: bold; > +color: #000099; > +} > + > +h2 { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 10pt; > +font-weight: bold; > +color: #000000; > +} > + > +h3 { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 8pt; > +font-weight: bold; > +color: #000000; > +} > + > +.info { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 10px; > +font-style: normal; > +color: #000000; > +} > + > +DIV.graybox { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +background: #CCCCCC; > +border: 1px solid #000000; > +text-align: center; > +margin: 2px auto; > +width: auto; > +padding: 4px; > +} > + > + > +.boxoutside { > +background: #FFFFFF; > +padding: 0px; > +border-color: #999999; > +border-style: solid; > +border-width: 1px 1px 1px 1px; > +} > + > +.boxtop { > +background: #000099; > +padding-top: 1px; > +padding-bottom: 1px; > +padding-right: 4px; > +padding-left: 4px; > +border-color: #999999; > +border-style: solid; > +border-width: 0px 0px 0px 0px; > +} > + > +.boxbottom { > +background: #FFFFFF; > +padding: 4px; > +border-color: #999999; > +border-style: solid; > +border-width: 0px 0px 0px 0px; > +} > + > +.button { > +border-style: outset; border-color: #9999CC; border-width: 2px; > +background: #dddddd; > +padding-right: 5px; padding-left: 5px; > +} > + > + > +.tableheadtext { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: black; > +} > + > +A.tableheadbutton { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: black; > +} > + > +A.tableheadbutton:hover { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: underline; > +color: red; > +} > + > +.browsecategorytext { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +text-indent: -10px; > +} > + > +A.browsecategorybutton { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +} > + > +A.browsecategorybutton:hover { > +color: #000099; > +text-decoration: underline; > +} > + > +.browsecategorybuttondisabled { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #333333; > +} > + > +A.buttontext, .buttontextdisabled { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +background: white; > +border: #999999 solid 1px; > +margin: 2px 1px 2px 1px; > +padding: 1px 4px 1px 4px; > +} > + > +A.buttontext { > +color: #000099; > +} > + > +A.buttontext:hover { > +color: red; > +text-decoration: underline; > +} > + > +A.linktext { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +} > + > +A.linktext:hover { > +color: red; > +text-decoration: underline; > +} > + > +.buttontextdisabled { > +color: #333333; > +} > + > +.submenutextinfo { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: white; > +padding-left: 6px; > +padding-right: 5px; > +border-right: 1px solid #5886C6 > +} > + > +.submenutext, A.submenutext, A.submenutext:visited { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: yellow; > +padding-left: 6px; > +padding-right: 5px; > +border-right: 1px solid #5886C6 > +} > + > +A.submenutext:hover { > +color: yellow; > +text-decoration: underline; > +} > + > +.submenutextdisabled, A.submenutextdisabled { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #CCCCCC; > +padding-left: 6px; > +padding-right: 5px; > +border-right: 1px solid #5886C6 > +} > + > +A.submenutextdisabled:hover { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: underline; > +color: yellow; > +} > + > +.submenutextinforight { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: white; > +padding-left: 6px; > +} > + > +.submenutextright, A.submenutextright { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: yellow; > +padding-left: 6px; > +} > + > +A.submenutextright:hover { > +color: yellow; > +text-decoration: underline; > +} > + > +.submenutextrightdisabled, A.submenutextrightdisabled { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #CCCCCC; > +padding-left: 6px; > +} > + > +A.submenutextrightdisabled:hover { > +text-decoration: underline; > +color: yellow; > +} > + > +A.lightbuttontext { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: yellow; > +border: none; > +} > + > +A.lightbuttontext:hover { > +color: yellow; > +text-decoration: underline; > +} > + > +A.lightbuttontextsmall { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 8px; > +font-weight: bold; > +text-decoration: none; > +color: yellow; > +border: none; > +} > + > +A.lightbuttontextsmall:hover { > +color: yellow; > +text-decoration: underline; > +} > + > +.lightbuttontextdisabled { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10px; > +font-weight: bold; > +text-decoration: none; > +color: #CCCCCC; > +} > + > +A.buttontextbig, .buttontextbigdisabled { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 15px; > +font-weight: bold; > +text-decoration: none; > +background: white; > +border: #999999 solid 1px; > +margin: 2px 2px 2px 2px; > +padding: 1px 4px 1px 4px; > +} > +A.buttontextbig { > +color: #000099; > +} > +.buttontextbigdisabled { > +color: #CCCCCC; > +} > +A.buttontextbig:hover { > +color: red; > +text-decoration: underline; > +} > + > +A IMG.imageborder { > +border-style: solid; > +border-width: 1px; > +border-color: #999999; > +} > + > +/* ===== Other Header Styles ===== */ > + > + > +.headersmalltext { > +font-size: 8pt; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-weight: bold; > +color: black; > +} > +a.headersmalllink { > +font-size: 8pt; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-weight: bold; > +color: #000099; > +text-decoration: none; > +} > +a.headersmalllink:hover { > +color: red; > +} > + > +/* ===== Misc/General Styles ===== */ > +HR.sepbar { > +font-size: xx-small; > +width: 100%; > +height: 1px; > +background: #999999; > +border-width: 0px; > +} > + > +.errorMessage { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 8pt; > +font-weight: bold; > +color: red; > +} > + > +.eventMessage { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +margin: 0px; > +font-size: 8pt; > +font-weight: bold; > +color: #000099; > +} > + > +.ontab { > +font-size: 8pt; > +background: black; > +padding: 2px; > +border-style: inset; > +border-width: 3px; > +} > + > +a.onlnk { > +font-size: 8pt; > +font-weight: bold; > +color: #FFFFFF; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +text-decoration: none; > +padding: 2px; > +} > + > +.offtab { > +font-size: 10px; > +background: #CCCCCC; > +padding: 2px; > +border-style: outset; > +border-width: 3px; > +} > + > +a.offlnk { > +font-size: 10px; > +font-weight: bold; > +color: #000099; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +text-decoration: none; > +padding: 2px; > +} > + > +a.offlnk:hover { > +color: red; > +} > + > +.areaheader { > +font-size: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-weight: bold; > +color: #FFFFFF; > +width: 100%; > +background: black; > +padding: 2px; > +} > + > +.edittable { > +border-color: #000000 #000000 #003333; > +border-style: solid; > +border-top-width: thin; > +border-right-width: thin; > +border-bottom-width: thin; > +border-left-width: thin > +} > + > +.editInputBox { > +font-size: 8pt; > +background: #FFFFFF; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +background: white; > +border: #999999 solid 1px; > +margin: 2px; > +} > + > +.inputBox { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +background: #FFFFFF; > +font-size: 8pt; > +background: white; > +border: #999999 solid 1px; > +margin: 2px; > +} > + > +.selectBox { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +background: #FFFFFF; > +font-size: 8pt; > +background: white; > +border: #999999 solid 1px; > +margin: 2px; > +} > + > +.textAreaBox { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +background: #FFFFFF; > +font-size: 8pt; > +background: white; > +border: #999999 solid 1px; > +margin: 2px; > +} > + > +.radioButton { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +background: #FFFFFF; > +font-size: 8pt; > +} > + > +.checkBox { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +background: #FFFFFF; > +font-size: 8pt; > +} > + > +.smallSubmit { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 8pt; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +background: white; > +border: #999999 solid 1px; > +margin: 2px; > +} > + > +.mediumSubmit,.largeSubmit,.loginButton { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 10pt; > +font-weight: bold; > +text-decoration: none; > +color: #000099; > +background: white; > +border: #999999 solid 1px; > +margin: 2px; > +} > + > +.smallSubmit:hover,.mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover { > +color: red; > +text-decoration: underline; > +} > + > +.smallAltSubmit,.mediumAltSubmit,.largeAltSubmit { > +font-family: Verdana, Arial, Helvetica, sans-serif; > +font-size: 8pt; > +} > + > +.basePrice { > +font-size: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +color: black; > +} > + > +.normalPrice { > +font-size: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +color: green; > +} > + > +.salePrice { > +font-size: 10px; > +font-family: Verdana, Arial, Helvetica, sans-serif; > +color: red; > +} > + > +/* ===== Product Summary Styles ===== */ > +.product-prevnext { > +text-align: right; > +} > + > +.productcategorylink-container { > +position: relative; > +margin-top: 10px; > +margin-bottom: 5px; > +border-top: #999 solid 1px; > +} > + > +.productcategorylink { > +position: relative; > +padding: 5px; > +border-bottom: #999 solid 1px; > +height: 60px; > +} > + > +.productcategorylink .smallimage { > +float: left; > +/* position: absolute; top: 5px; left: 5px; */ > +margin: 0px 5px 5px 0px; > +} > +.productcategorylink .smallimage img { > +border: #CCC solid 1px; > +height: 50px; > +} > + > +.productsummary-container { > +position: relative; > +margin-top: 10px; > +margin-bottom: 5px; > +border-top: #999 solid 1px; > +} > + > +.productsummary { > +position: relative; > +padding: 5px; > +border-bottom: #999 solid 1px; > +height: 60px; > +} > + > +.productsummary .smallimage { > +float: left; > +/* position: absolute; top: 5px; left: 5px; */ > +margin: 0px 5px 5px 0px; > +} > +.productsummary .smallimage img { > +border: #CCC solid 1px; > +height: 50px; > +} > + > +.productsummary .productbuy { > +float: right; > +width: 160px; > +margin: 5px; > +text-align: right; > +} > + > +.productsummary .productinfo { > +/* margin-left: 60px; */ > +text-align: left; > +} > + > +/* ===== Product Detail Styles ===== */ > +#productdetail #download-files { > +margin-top: 10px; > +padding-top: 5px; > +border-top: #999 solid 1px; > +} > + > +#productdetail #long-description { > +margin-top: 10px; > +padding-top: 5px; > +border-top: #999 solid 1px; > +} > + > +#productdetail #reviews { > +margin-top: 10px; > +padding-top: 5px; > +border-top: #999 solid 1px; > +} > + > +#productdetail #associated-products { > +margin-top: 10px; > +padding-top: 5px; > +border-top: #999 solid 1px; > +} > + > +.lefthalf{ > +left:0; > +width:49%; > +height:1%; > +margin:0% 1% 1% 0%; > +float:left; > +} > +.righthalf { > +float:right; > +height:1%; > +width:49%; > +right:0; > +margin:0 0 1% 1%; > +} > +.leftclear{ > +height:1%; > +clear: left; > +} > +.bothclear{ > +height:1%; > +clear: both; > +} > \ No newline at end of file > > Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?view=diff&rev=567090&r1=567089&r2=567090 > ============================================================================== > --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Fri Aug 17 10:22:04 2007 > @@ -48,7 +48,7 @@ > > <!-- The default (main) stylesheets --> > <set field="layoutSettings.styleSheets[+0]" value="/ecommerce/images/blog.css" global="true"/> > - <set field="layoutSettings.styleSheets[+0]" value="${productStore.styleSheet}" default-value="/images/ecommain.css" global="true"/> > + <set field="layoutSettings.styleSheets[+0]" value="${productStore.styleSheet}" default-value="/ecommerce/images/ecommain.css" global="true"/> > </actions> > <widgets> > <!-- render header --> > > Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?view=diff&rev=567090&r1=567089&r2=567090 > ============================================================================== > --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original) > +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Fri Aug 17 10:22:04 2007 > @@ -18,9 +18,8 @@ > --> > > <#if productCategory?exists> > - <h1> > - <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div> > - <div>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</div> > + <h1>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</h1> > + <h1>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</h1> > <#if hasQuantities?exists> > <form method="post" action="<@ofbizUrl>addCategoryDefaults<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="thecategoryform" style='margin: 0;'> > <input type='hidden' name='add_category_id' value='${productCategory.productCategoryId}'/> > @@ -33,7 +32,6 @@ > </form> > </#if> > <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchinCategory}</a> > - </h1> > <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> > <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> > <#if categoryImageUrl?has_content || longDescription?has_content> > > Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?view=diff&rev=567090&r1=567089&r2=567090 > ============================================================================== > --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original) > +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Aug 17 10:22:04 2007 > @@ -23,7 +23,7 @@ > <script language="javascript" src="/images/selectall.js" type="text/javascript"></script> > <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script> > > - <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/> > + <link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/> > <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/> > <link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/> > > > |
Re: svn commit: r567090 - in /ofbiz/trunk: applications/content/config/ applications/ecommerce/config/ applications/ecommerce/data/ applications/ecommerce/webapp/
|
|
I can revert it. My motivation was to get application-specific files out of the framework.
David E Jones wrote: > > Do we really want to do this? > > The point of having all static resources under the images component is > so they can be easily moved to another server or even a third party > content hosting service like Akamai or CacheFly. > > This is what the ofbizContentUrl transform facilitates. > > If we want multiple static content areas like this we will need to > change that to support multiple content areas, which makes configuration > and management significantly more complex. > > I'd like to hear from others, but my vote is to revert this. > > -David > > > [hidden email] wrote: > >> Author: adrianc >> Date: Fri Aug 17 10:22:04 2007 >> New Revision: 567090 >> >> URL: http://svn.apache.org/viewvc?view=rev&rev=567090 >> Log: >> Moved the ecommain.css file to the ecommerce component. Existing >> installations will need to update the stylesheet field in their >> ProductStore entity. >> >> Moved forum.properties file to the content component. >> >> Added: >> ofbiz/trunk/applications/content/config/forum.properties >> >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >> Removed: >> ofbiz/trunk/applications/ecommerce/config/forum.properties >> ofbiz/trunk/framework/images/webapp/images/ecommain.css >> Modified: >> ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >> ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >> ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >> >> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >> >> ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >> >> Added: ofbiz/trunk/applications/content/config/forum.properties >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/forum.properties?view=auto&rev=567090 >> >> ============================================================================== >> >> --- ofbiz/trunk/applications/content/config/forum.properties (added) >> +++ ofbiz/trunk/applications/content/config/forum.properties Fri Aug >> 17 10:22:04 2007 >> @@ -0,0 +1 @@ >> +descriptLen=80 >> \ No newline at end of file >> >> Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >> >> ============================================================================== >> >> --- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original) >> +++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Fri Aug 17 >> 10:22:04 2007 >> @@ -52,7 +52,7 @@ >> authFraudMessage="Your order has been rejected and your >> account has been disabled due to fraud." >> authErrorMessage="Problem connecting to payment processor; we >> will continue to retry and notify you by email." >> storeCreditValidDays="90" >> - styleSheet="/images/ecommain.css" >> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >> + styleSheet="/ecommerce/images/ecommain.css" >> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >> <!-- <ProductStorePaymentSetting productStoreId="9000" >> paymentMethodTypeId="CREDIT_CARD" >> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >> paymentService="testRandomAuthorize"/> --> >> <ProductStorePaymentSetting productStoreId="9000" >> paymentMethodTypeId="CREDIT_CARD" >> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >> paymentService="alwaysApproveCCProcessor"/> >> >> Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >> >> ============================================================================== >> >> --- ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >> (original) >> +++ ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml Fri >> Aug 17 10:22:04 2007 >> @@ -28,7 +28,7 @@ >> authDeclinedMessage="There has been a problem with your >> method of payment. Please try a different method or call customer >> service." >> authFraudMessage="Your order has been rejected and your >> account has been disabled due to fraud." >> authErrorMessage="Problem connecting to payment processor; we >> will continue to retry and notify you by email." >> - styleSheet="/images/ecommain.css" >> headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" >> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >> + styleSheet="/ecommerce/images/ecommain.css" >> headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" >> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >> <ProductStorePaymentSetting productStoreId="RentalStore" >> paymentMethodTypeId="CREDIT_CARD" >> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >> paymentService="alwaysApproveCCProcessor"/> >> <ProductStorePaymentSetting productStoreId="RentalStore" >> paymentMethodTypeId="CREDIT_CARD" >> paymentServiceTypeEnumId="PRDS_PAY_RELEASE" >> paymentService="testCCRelease"/> >> <ProductStorePaymentSetting productStoreId="RentalStore" >> paymentMethodTypeId="CREDIT_CARD" >> paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" >> paymentService="testCCCapture"/> >> >> Added: >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css?view=auto&rev=567090 >> >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >> (added) >> +++ >> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >> Fri Aug 17 10:22:04 2007 >> @@ -0,0 +1,990 @@ >> +/* >> + * 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. >> + */ >> + >> +/* ===== This file contains the eCommerce specific styles ===== */ >> + >> +/* ===== Basic Element Styles ===== */ >> +BODY { >> +background: #FFFFFF; >> +margin-top: 10px; >> +margin-right: 10px; >> +margin-bottom: 10px; >> +margin-left: 10px; >> +} >> + >> +FORM { >> +margin: 0px; >> +} >> + >> +UL { >> +margin-top: 0; >> +margin-bottom: 0; >> +} >> + >> +img { >> +behavior: url("/images/pngbehavior.htc"); >> +} >> + >> +.endcolumns { >> +clear: both; >> +height: 0px; >> +visibility: hidden; >> +} >> + >> +TH { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000000; >> +} >> + >> +TD { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: normal; >> +text-decoration: none; >> +color: #000000; >> +} >> + >> +/* ===== Header Styles ===== */ >> +#ecom-header { >> +position: relative; >> +background: #ffffff; >> +height: 80px; >> +voice-family: "\"}\""; >> +voice-family: inherit; >> +height: 80px; >> +/* border:1px solid #000; */ >> +} >> +#ecom-header #left { >> +position: absolute; >> +top: 0px; >> +left: 0px; >> +width: 280px; >> +} >> +#ecom-header #middle { >> +margin-left: 290px; >> +margin-right: 210px; >> +padding-top: 10px; >> +width: auto; >> + >> +text-align: center; >> +} >> +#ecom-header #right { >> +position: absolute; >> +top: 0px; >> +right: 0px; >> +width: 200px; >> +padding: 0px; >> +margin-top: 20px; >> + >> +text-align: right; >> +} >> + >> +#welcome-message { >> +padding-right: 10px; >> +padding-left: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000000; >> +} >> +#welcome-message a { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +} >> +#welcome-message a:hover { >> +color: black; >> +text-decoration: underline; >> +} >> +#company-name { >> +margin: 0px; >> +font-size: 12pt; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-weight: bold; >> +color: #000099; >> +white-space: nowrap; >> +} >> +#company-subtitle { >> +margin: 0px; >> +font-size: 6pt; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +color: #330099; >> +white-space: nowrap; >> +} >> + >> +#microcart { >> +font-size: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-weight: bold; >> +text-decoration: none; >> +color: black; >> +} >> +#microcart a { >> +text-decoration: none; >> +color: #000099; >> +} >> +#microcart a:hover { >> +color: black; >> +text-decoration: underline; >> +} >> +#microcart .disabled { >> +color: #666666; >> +} >> + >> +/* ===== Header-Bar Styles ===== */ >> +#ecom-header-bar { >> +background: #B4B0AA; >> +text-align: center; >> +overflow: visible; >> +height: 14px; >> +} >> + >> +#ecom-header-bar ul { >> +display: block; >> +overflow: visible; >> +list-style: none; >> +background: transparent; >> +vertical-align: middle; >> +margin: 0px; >> +padding: 0px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 12px; >> +} >> + >> +#ecom-header-bar ul li { >> +height: 14px; >> +padding: 0px 8px 0px 8px; >> +} >> +#ecom-header-bar ul#left-links li { >> +float: left; >> +border-right: 1px solid #FFFFFF; >> +} >> +#ecom-header-bar ul#right-links li { >> +float: right; >> +border-left: 1px solid #FFFFFF; >> +} >> + >> +#ecom-header-bar ul li a { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +} >> +#ecom-header-bar ul li:hover a { >> +color: black; >> +text-decoration: underline; >> +} >> + >> + >> +/* ===== Layout/Formatting Styles ===== */ >> +/* NOTE: using a combination of a float left/right for the side bars AND >> + wide margins for the center to get 2 desired effects: 1. be able to >> end >> + columns and put the footer at the bottom of the page and 2. not >> have the >> + center column expand to full width below the columns. >> + >> + The downside to this is that in some browsers we can't effectively >> use floats >> + within divs in the main column. >> +*/ >> + >> +/* ecom-mainarea wraps what is below the header including the divs >> for left, main, right columns as applicable */ >> +#ecom-mainarea { >> +position: relative; >> +background: #FFFFFF; >> +width: 100%; >> +margin-top: 10px; >> +} >> + >> +#ecom-mainarea .left { >> +/* alt: position: absolute; left: 0px; top: 0px; */ >> +float: left; >> +width: 150px; >> +background: #ffffff; >> +/* border:1px solid #000; */ >> +} >> +#ecom-mainarea .right { >> +/* alt: position: absolute; right: 0px; top: 0px; */ >> +float: right; >> +width: 200px; >> +background: #ffffff; >> +} >> + >> + >> +#ecom-mainarea .center, #ecom-mainarea .leftonly, #ecom-mainarea >> .rightonly, #ecom-mainarea .nocolumns { >> +background:#fff; >> +text-align: left; >> +vertical-align: top; >> +} >> +#ecom-mainarea .center { >> +margin-left: 160px; >> +margin-right: 210px; >> +voice-family: "\"}\""; >> +voice-family: inherit; >> +margin-left: 161px; >> +margin-right: 211px; >> +} >> +#ecom-mainarea .leftonly { >> +margin-left: 160px; >> +voice-family: "\"}\""; >> +voice-family: inherit; >> +margin-left: 161px; >> +} >> +#ecom-mainarea .rightonly { >> +margin-right: 210px; >> +voice-family: "\"}\""; >> +voice-family: inherit; >> +margin-right: 211px; >> +} >> + >> +/* ====== eCommerce "Screenlet" Styles ====== */ >> +#ecom-mainarea .screenlet { >> +background: #FFFFFF; >> +border: 1px solid #999999; >> +margin-bottom: 10px; >> +height:auto !important; >> +height:1% >> +} >> +#ecom-mainarea .screenlet-header { >> +background: #000099; >> +padding-top: 1px; >> +padding-bottom: 3px; >> +padding-right: 4px; >> +padding-left: 4px; >> +height:auto !important; >> +height:1% >> +} >> +#ecom-mainarea .screenlet-body { >> +background: #FFFFFF; >> +padding: 4px; >> +height:auto !important; >> +height:1% >> +} >> + >> +.boxhead { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 8pt; >> +font-weight: bold; >> +text-decoration: none; >> +color: #FFFFFF; >> +} >> + >> +.boxlink { >> + float:right; >> +} >> + >> +A.boxheadbutton { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 8pt; >> +font-weight: bold; >> +text-decoration: none; >> +color: #FFFFFF; >> +} >> + >> +A.boxheadbutton:hover { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 8pt; >> +font-weight: bold; >> +text-decoration: none; >> +color: red; >> +} >> + >> +/* Form layout styles to simulate a table-style layout */ >> +#ecom-mainarea .form-row { >> +clear: both; >> +padding-top: 2px; >> +} >> +#ecom-mainarea .form-label { >> +float: left; >> +width: 180px; >> +text-align: right; >> +padding-top: 5px; >> +} >> +#ecom-mainarea .form-field { >> +float: left; >> +margin-left: 10px; >> +text-align: left; >> +} >> + >> +/* ===== Text/Label Styles ===== */ >> +.tabletext, div.form-label, div.form-field { >> +font-size: 10px; >> +text-decoration: none; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +} >> + >> +A.tabletext:hover { >> +font-size: 10px; >> +text-decoration: underline; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +} >> + >> +.tablebuttontext { >> +font-size: 10px; >> +color: #1E3C66; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +} >> + >> +.contenttext { >> +font-size: 8pt; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +} >> + >> +DIV.tabletexthidden { >> +font-size: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +visibility: hidden; >> +} >> + >> +h1 { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 12pt; >> +font-weight: bold; >> +color: #000099; >> +} >> + >> +h2 { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 10pt; >> +font-weight: bold; >> +color: #000000; >> +} >> + >> +h3 { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 8pt; >> +font-weight: bold; >> +color: #000000; >> +} >> + >> +.info { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 10px; >> +font-style: normal; >> +color: #000000; >> +} >> + >> +DIV.graybox { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +background: #CCCCCC; >> +border: 1px solid #000000; >> +text-align: center; >> +margin: 2px auto; >> +width: auto; >> +padding: 4px; >> +} >> + >> + >> +.boxoutside { >> +background: #FFFFFF; >> +padding: 0px; >> +border-color: #999999; >> +border-style: solid; >> +border-width: 1px 1px 1px 1px; >> +} >> + >> +.boxtop { >> +background: #000099; >> +padding-top: 1px; >> +padding-bottom: 1px; >> +padding-right: 4px; >> +padding-left: 4px; >> +border-color: #999999; >> +border-style: solid; >> +border-width: 0px 0px 0px 0px; >> +} >> + >> +.boxbottom { >> +background: #FFFFFF; >> +padding: 4px; >> +border-color: #999999; >> +border-style: solid; >> +border-width: 0px 0px 0px 0px; >> +} >> + >> +.button { >> +border-style: outset; border-color: #9999CC; border-width: 2px; >> +background: #dddddd; >> +padding-right: 5px; padding-left: 5px; >> +} >> + >> + >> +.tableheadtext { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: black; >> +} >> + >> +A.tableheadbutton { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: black; >> +} >> + >> +A.tableheadbutton:hover { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: underline; >> +color: red; >> +} >> + >> +.browsecategorytext { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +text-indent: -10px; >> +} >> + >> +A.browsecategorybutton { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +} >> + >> +A.browsecategorybutton:hover { >> +color: #000099; >> +text-decoration: underline; >> +} >> + >> +.browsecategorybuttondisabled { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #333333; >> +} >> + >> +A.buttontext, .buttontextdisabled { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px 1px 2px 1px; >> +padding: 1px 4px 1px 4px; >> +} >> + >> +A.buttontext { >> +color: #000099; >> +} >> + >> +A.buttontext:hover { >> +color: red; >> +text-decoration: underline; >> +} >> + >> +A.linktext { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +} >> + >> +A.linktext:hover { >> +color: red; >> +text-decoration: underline; >> +} >> + >> +.buttontextdisabled { >> +color: #333333; >> +} >> + >> +.submenutextinfo { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: white; >> +padding-left: 6px; >> +padding-right: 5px; >> +border-right: 1px solid #5886C6 >> +} >> + >> +.submenutext, A.submenutext, A.submenutext:visited { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: yellow; >> +padding-left: 6px; >> +padding-right: 5px; >> +border-right: 1px solid #5886C6 >> +} >> + >> +A.submenutext:hover { >> +color: yellow; >> +text-decoration: underline; >> +} >> + >> +.submenutextdisabled, A.submenutextdisabled { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #CCCCCC; >> +padding-left: 6px; >> +padding-right: 5px; >> +border-right: 1px solid #5886C6 >> +} >> + >> +A.submenutextdisabled:hover { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: underline; >> +color: yellow; >> +} >> + >> +.submenutextinforight { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: white; >> +padding-left: 6px; >> +} >> + >> +.submenutextright, A.submenutextright { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: yellow; >> +padding-left: 6px; >> +} >> + >> +A.submenutextright:hover { >> +color: yellow; >> +text-decoration: underline; >> +} >> + >> +.submenutextrightdisabled, A.submenutextrightdisabled { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #CCCCCC; >> +padding-left: 6px; >> +} >> + >> +A.submenutextrightdisabled:hover { >> +text-decoration: underline; >> +color: yellow; >> +} >> + >> +A.lightbuttontext { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: yellow; >> +border: none; >> +} >> + >> +A.lightbuttontext:hover { >> +color: yellow; >> +text-decoration: underline; >> +} >> + >> +A.lightbuttontextsmall { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 8px; >> +font-weight: bold; >> +text-decoration: none; >> +color: yellow; >> +border: none; >> +} >> + >> +A.lightbuttontextsmall:hover { >> +color: yellow; >> +text-decoration: underline; >> +} >> + >> +.lightbuttontextdisabled { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10px; >> +font-weight: bold; >> +text-decoration: none; >> +color: #CCCCCC; >> +} >> + >> +A.buttontextbig, .buttontextbigdisabled { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 15px; >> +font-weight: bold; >> +text-decoration: none; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px 2px 2px 2px; >> +padding: 1px 4px 1px 4px; >> +} >> +A.buttontextbig { >> +color: #000099; >> +} >> +.buttontextbigdisabled { >> +color: #CCCCCC; >> +} >> +A.buttontextbig:hover { >> +color: red; >> +text-decoration: underline; >> +} >> + >> +A IMG.imageborder { >> +border-style: solid; >> +border-width: 1px; >> +border-color: #999999; >> +} >> + >> +/* ===== Other Header Styles ===== */ >> + >> + >> +.headersmalltext { >> +font-size: 8pt; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-weight: bold; >> +color: black; >> +} >> +a.headersmalllink { >> +font-size: 8pt; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-weight: bold; >> +color: #000099; >> +text-decoration: none; >> +} >> +a.headersmalllink:hover { >> +color: red; >> +} >> + >> +/* ===== Misc/General Styles ===== */ >> +HR.sepbar { >> +font-size: xx-small; >> +width: 100%; >> +height: 1px; >> +background: #999999; >> +border-width: 0px; >> +} >> + >> +.errorMessage { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 8pt; >> +font-weight: bold; >> +color: red; >> +} >> + >> +.eventMessage { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +margin: 0px; >> +font-size: 8pt; >> +font-weight: bold; >> +color: #000099; >> +} >> + >> +.ontab { >> +font-size: 8pt; >> +background: black; >> +padding: 2px; >> +border-style: inset; >> +border-width: 3px; >> +} >> + >> +a.onlnk { >> +font-size: 8pt; >> +font-weight: bold; >> +color: #FFFFFF; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +text-decoration: none; >> +padding: 2px; >> +} >> + >> +.offtab { >> +font-size: 10px; >> +background: #CCCCCC; >> +padding: 2px; >> +border-style: outset; >> +border-width: 3px; >> +} >> + >> +a.offlnk { >> +font-size: 10px; >> +font-weight: bold; >> +color: #000099; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +text-decoration: none; >> +padding: 2px; >> +} >> + >> +a.offlnk:hover { >> +color: red; >> +} >> + >> +.areaheader { >> +font-size: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-weight: bold; >> +color: #FFFFFF; >> +width: 100%; >> +background: black; >> +padding: 2px; >> +} >> + >> +.edittable { >> +border-color: #000000 #000000 #003333; >> +border-style: solid; >> +border-top-width: thin; >> +border-right-width: thin; >> +border-bottom-width: thin; >> +border-left-width: thin >> +} >> + >> +.editInputBox { >> +font-size: 8pt; >> +background: #FFFFFF; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px; >> +} >> + >> +.inputBox { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +background: #FFFFFF; >> +font-size: 8pt; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px; >> +} >> + >> +.selectBox { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +background: #FFFFFF; >> +font-size: 8pt; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px; >> +} >> + >> +.textAreaBox { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +background: #FFFFFF; >> +font-size: 8pt; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px; >> +} >> + >> +.radioButton { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +background: #FFFFFF; >> +font-size: 8pt; >> +} >> + >> +.checkBox { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +background: #FFFFFF; >> +font-size: 8pt; >> +} >> + >> +.smallSubmit { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 8pt; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px; >> +} >> + >> +.mediumSubmit,.largeSubmit,.loginButton { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 10pt; >> +font-weight: bold; >> +text-decoration: none; >> +color: #000099; >> +background: white; >> +border: #999999 solid 1px; >> +margin: 2px; >> +} >> + >> +.smallSubmit:hover,.mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover >> { >> +color: red; >> +text-decoration: underline; >> +} >> + >> +.smallAltSubmit,.mediumAltSubmit,.largeAltSubmit { >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +font-size: 8pt; >> +} >> + >> +.basePrice { >> +font-size: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +color: black; >> +} >> + >> +.normalPrice { >> +font-size: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +color: green; >> +} >> + >> +.salePrice { >> +font-size: 10px; >> +font-family: Verdana, Arial, Helvetica, sans-serif; >> +color: red; >> +} >> + >> +/* ===== Product Summary Styles ===== */ >> +.product-prevnext { >> +text-align: right; >> +} >> + >> +.productcategorylink-container { >> +position: relative; >> +margin-top: 10px; >> +margin-bottom: 5px; >> +border-top: #999 solid 1px; >> +} >> + >> +.productcategorylink { >> +position: relative; >> +padding: 5px; >> +border-bottom: #999 solid 1px; >> +height: 60px; >> +} >> + >> +.productcategorylink .smallimage { >> +float: left; >> +/* position: absolute; top: 5px; left: 5px; */ >> +margin: 0px 5px 5px 0px; >> +} >> +.productcategorylink .smallimage img { >> +border: #CCC solid 1px; >> +height: 50px; >> +} >> + >> +.productsummary-container { >> +position: relative; >> +margin-top: 10px; >> +margin-bottom: 5px; >> +border-top: #999 solid 1px; >> +} >> + >> +.productsummary { >> +position: relative; >> +padding: 5px; >> +border-bottom: #999 solid 1px; >> +height: 60px; >> +} >> + >> +.productsummary .smallimage { >> +float: left; >> +/* position: absolute; top: 5px; left: 5px; */ >> +margin: 0px 5px 5px 0px; >> +} >> +.productsummary .smallimage img { >> +border: #CCC solid 1px; >> +height: 50px; >> +} >> + >> +.productsummary .productbuy { >> +float: right; >> +width: 160px; >> +margin: 5px; >> +text-align: right; >> +} >> + >> +.productsummary .productinfo { >> +/* margin-left: 60px; */ >> +text-align: left; >> +} >> + >> +/* ===== Product Detail Styles ===== */ >> +#productdetail #download-files { >> +margin-top: 10px; >> +padding-top: 5px; >> +border-top: #999 solid 1px; >> +} >> + >> +#productdetail #long-description { >> +margin-top: 10px; >> +padding-top: 5px; >> +border-top: #999 solid 1px; >> +} >> + >> +#productdetail #reviews { >> +margin-top: 10px; >> +padding-top: 5px; >> +border-top: #999 solid 1px; >> +} >> + >> +#productdetail #associated-products { >> +margin-top: 10px; >> +padding-top: 5px; >> +border-top: #999 solid 1px; >> +} >> + >> +.lefthalf{ >> +left:0; >> +width:49%; >> +height:1%; >> +margin:0% 1% 1% 0%; >> +float:left; >> +} >> +.righthalf { >> +float:right; >> +height:1%; >> +width:49%; >> +right:0; >> +margin:0 0 1% 1%; >> +} >> +.leftclear{ >> +height:1%; >> +clear: left; >> +} >> +.bothclear{ >> +height:1%; >> +clear: both; >> +} >> \ No newline at end of file >> >> Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?view=diff&rev=567090&r1=567089&r2=567090 >> >> ============================================================================== >> >> --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >> (original) >> +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Fri >> Aug 17 10:22:04 2007 >> @@ -48,7 +48,7 @@ >> >> <!-- The default (main) stylesheets --> >> <set field="layoutSettings.styleSheets[+0]" >> value="/ecommerce/images/blog.css" global="true"/> >> - <set field="layoutSettings.styleSheets[+0]" >> value="${productStore.styleSheet}" >> default-value="/images/ecommain.css" global="true"/> >> + <set field="layoutSettings.styleSheets[+0]" >> value="${productStore.styleSheet}" >> default-value="/ecommerce/images/ecommain.css" global="true"/> >> </actions> >> <widgets> >> <!-- render header --> >> >> Modified: >> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >> >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?view=diff&rev=567090&r1=567089&r2=567090 >> >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >> (original) >> +++ >> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >> Fri Aug 17 10:22:04 2007 >> @@ -18,9 +18,8 @@ >> --> >> >> <#if productCategory?exists> >> - <h1> >> - >> <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div> >> - >> <div>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</div> >> + >> <h1>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</h1> >> + <h1>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</h1> >> <#if hasQuantities?exists> >> <form method="post" >> action="<@ofbizUrl>addCategoryDefaults<#if >> requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" >> name="thecategoryform" style='margin: 0;'> >> <input type='hidden' name='add_category_id' >> value='${productCategory.productCategoryId}'/> >> @@ -33,7 +32,6 @@ >> </form> >> </#if> >> <a >> href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" >> class="buttontext">${uiLabelMap.ProductSearchinCategory}</a> >> - </h1> >> <#assign longDescription = >> categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> >> <#assign categoryImageUrl = >> categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> >> <#if categoryImageUrl?has_content || longDescription?has_content> >> >> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?view=diff&rev=567090&r1=567089&r2=567090 >> >> ============================================================================== >> >> --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >> (original) >> +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri >> Aug 17 10:22:04 2007 >> @@ -23,7 +23,7 @@ >> <script language="javascript" src="/images/selectall.js" >> type="text/javascript"></script> >> <script language="javascript" src="/images/fieldlookup.js" >> type="text/javascript"></script> >> >> - <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/> >> + <link rel="stylesheet" href="/ecommerce/images/ecommain.css" >> type="text/css"/> >> <link rel="stylesheet" href="/ecommerce/images/blog.css" >> type="text/css"/> >> <link rel="stylesheet" href="/content/images/contentForum.css" >> type="text/css"/> >> >> > |
Re: svn commit: r567090 - in /ofbiz/trunk: applications/content/config/ applications/ecommerce/config/ applications/ecommerce/data/ applications/ecommerce/webapp/
|
|
The better eventual solution for this would probably be to move the images component out of the framework. Where to put it is another question though... it doesn't really fit in framework, applications, or specialpurpose. So yeah, please do revert this and we'll find a better solution with fewer side-effects. -David Adrian Crum wrote: > I can revert it. My motivation was to get application-specific files out > of the framework. > > David E Jones wrote: > >> >> Do we really want to do this? >> >> The point of having all static resources under the images component is >> so they can be easily moved to another server or even a third party >> content hosting service like Akamai or CacheFly. >> >> This is what the ofbizContentUrl transform facilitates. >> >> If we want multiple static content areas like this we will need to >> change that to support multiple content areas, which makes >> configuration and management significantly more complex. >> >> I'd like to hear from others, but my vote is to revert this. >> >> -David >> >> >> [hidden email] wrote: >> >>> Author: adrianc >>> Date: Fri Aug 17 10:22:04 2007 >>> New Revision: 567090 >>> >>> URL: http://svn.apache.org/viewvc?view=rev&rev=567090 >>> Log: >>> Moved the ecommain.css file to the ecommerce component. Existing >>> installations will need to update the stylesheet field in their >>> ProductStore entity. >>> >>> Moved forum.properties file to the content component. >>> >>> Added: >>> ofbiz/trunk/applications/content/config/forum.properties >>> >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> Removed: >>> ofbiz/trunk/applications/ecommerce/config/forum.properties >>> ofbiz/trunk/framework/images/webapp/images/ecommain.css >>> Modified: >>> ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >>> ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>> ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>> >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> >>> ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>> >>> Added: ofbiz/trunk/applications/content/config/forum.properties >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/forum.properties?view=auto&rev=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/content/config/forum.properties (added) >>> +++ ofbiz/trunk/applications/content/config/forum.properties Fri Aug >>> 17 10:22:04 2007 >>> @@ -0,0 +1 @@ >>> +descriptLen=80 >>> \ No newline at end of file >>> >>> Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original) >>> +++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Fri Aug >>> 17 10:22:04 2007 >>> @@ -52,7 +52,7 @@ >>> authFraudMessage="Your order has been rejected and your >>> account has been disabled due to fraud." >>> authErrorMessage="Problem connecting to payment processor; >>> we will continue to retry and notify you by email." >>> storeCreditValidDays="90" >>> - styleSheet="/images/ecommain.css" >>> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> + styleSheet="/ecommerce/images/ecommain.css" >>> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> <!-- <ProductStorePaymentSetting productStoreId="9000" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>> paymentService="testRandomAuthorize"/> --> >>> <ProductStorePaymentSetting productStoreId="9000" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>> paymentService="alwaysApproveCCProcessor"/> >>> >>> Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>> (original) >>> +++ ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml Fri >>> Aug 17 10:22:04 2007 >>> @@ -28,7 +28,7 @@ >>> authDeclinedMessage="There has been a problem with your >>> method of payment. Please try a different method or call customer >>> service." >>> authFraudMessage="Your order has been rejected and your >>> account has been disabled due to fraud." >>> authErrorMessage="Problem connecting to payment processor; >>> we will continue to retry and notify you by email." >>> - styleSheet="/images/ecommain.css" >>> headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> + styleSheet="/ecommerce/images/ecommain.css" >>> headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> <ProductStorePaymentSetting productStoreId="RentalStore" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>> paymentService="alwaysApproveCCProcessor"/> >>> <ProductStorePaymentSetting productStoreId="RentalStore" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_RELEASE" >>> paymentService="testCCRelease"/> >>> <ProductStorePaymentSetting productStoreId="RentalStore" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" >>> paymentService="testCCCapture"/> >>> >>> Added: >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css?view=auto&rev=567090 >>> >>> ============================================================================== >>> >>> --- >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> (added) >>> +++ >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> Fri Aug 17 10:22:04 2007 >>> @@ -0,0 +1,990 @@ >>> +/* >>> + * 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. >>> + */ >>> + >>> +/* ===== This file contains the eCommerce specific styles ===== */ >>> + >>> +/* ===== Basic Element Styles ===== */ >>> +BODY { >>> +background: #FFFFFF; >>> +margin-top: 10px; >>> +margin-right: 10px; >>> +margin-bottom: 10px; >>> +margin-left: 10px; >>> +} >>> + >>> +FORM { >>> +margin: 0px; >>> +} >>> + >>> +UL { >>> +margin-top: 0; >>> +margin-bottom: 0; >>> +} >>> + >>> +img { >>> +behavior: url("/images/pngbehavior.htc"); >>> +} >>> + >>> +.endcolumns { >>> +clear: both; >>> +height: 0px; >>> +visibility: hidden; >>> +} >>> + >>> +TH { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000000; >>> +} >>> + >>> +TD { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: normal; >>> +text-decoration: none; >>> +color: #000000; >>> +} >>> + >>> +/* ===== Header Styles ===== */ >>> +#ecom-header { >>> +position: relative; >>> +background: #ffffff; >>> +height: 80px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +height: 80px; >>> +/* border:1px solid #000; */ >>> +} >>> +#ecom-header #left { >>> +position: absolute; >>> +top: 0px; >>> +left: 0px; >>> +width: 280px; >>> +} >>> +#ecom-header #middle { >>> +margin-left: 290px; >>> +margin-right: 210px; >>> +padding-top: 10px; >>> +width: auto; >>> + >>> +text-align: center; >>> +} >>> +#ecom-header #right { >>> +position: absolute; >>> +top: 0px; >>> +right: 0px; >>> +width: 200px; >>> +padding: 0px; >>> +margin-top: 20px; >>> + >>> +text-align: right; >>> +} >>> + >>> +#welcome-message { >>> +padding-right: 10px; >>> +padding-left: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000000; >>> +} >>> +#welcome-message a { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> +#welcome-message a:hover { >>> +color: black; >>> +text-decoration: underline; >>> +} >>> +#company-name { >>> +margin: 0px; >>> +font-size: 12pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: #000099; >>> +white-space: nowrap; >>> +} >>> +#company-subtitle { >>> +margin: 0px; >>> +font-size: 6pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: #330099; >>> +white-space: nowrap; >>> +} >>> + >>> +#microcart { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: black; >>> +} >>> +#microcart a { >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> +#microcart a:hover { >>> +color: black; >>> +text-decoration: underline; >>> +} >>> +#microcart .disabled { >>> +color: #666666; >>> +} >>> + >>> +/* ===== Header-Bar Styles ===== */ >>> +#ecom-header-bar { >>> +background: #B4B0AA; >>> +text-align: center; >>> +overflow: visible; >>> +height: 14px; >>> +} >>> + >>> +#ecom-header-bar ul { >>> +display: block; >>> +overflow: visible; >>> +list-style: none; >>> +background: transparent; >>> +vertical-align: middle; >>> +margin: 0px; >>> +padding: 0px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 12px; >>> +} >>> + >>> +#ecom-header-bar ul li { >>> +height: 14px; >>> +padding: 0px 8px 0px 8px; >>> +} >>> +#ecom-header-bar ul#left-links li { >>> +float: left; >>> +border-right: 1px solid #FFFFFF; >>> +} >>> +#ecom-header-bar ul#right-links li { >>> +float: right; >>> +border-left: 1px solid #FFFFFF; >>> +} >>> + >>> +#ecom-header-bar ul li a { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> +#ecom-header-bar ul li:hover a { >>> +color: black; >>> +text-decoration: underline; >>> +} >>> + >>> + >>> +/* ===== Layout/Formatting Styles ===== */ >>> +/* NOTE: using a combination of a float left/right for the side bars >>> AND >>> + wide margins for the center to get 2 desired effects: 1. be able >>> to end >>> + columns and put the footer at the bottom of the page and 2. not >>> have the >>> + center column expand to full width below the columns. >>> + >>> + The downside to this is that in some browsers we can't effectively >>> use floats >>> + within divs in the main column. >>> +*/ >>> + >>> +/* ecom-mainarea wraps what is below the header including the divs >>> for left, main, right columns as applicable */ >>> +#ecom-mainarea { >>> +position: relative; >>> +background: #FFFFFF; >>> +width: 100%; >>> +margin-top: 10px; >>> +} >>> + >>> +#ecom-mainarea .left { >>> +/* alt: position: absolute; left: 0px; top: 0px; */ >>> +float: left; >>> +width: 150px; >>> +background: #ffffff; >>> +/* border:1px solid #000; */ >>> +} >>> +#ecom-mainarea .right { >>> +/* alt: position: absolute; right: 0px; top: 0px; */ >>> +float: right; >>> +width: 200px; >>> +background: #ffffff; >>> +} >>> + >>> + >>> +#ecom-mainarea .center, #ecom-mainarea .leftonly, #ecom-mainarea >>> .rightonly, #ecom-mainarea .nocolumns { >>> +background:#fff; >>> +text-align: left; >>> +vertical-align: top; >>> +} >>> +#ecom-mainarea .center { >>> +margin-left: 160px; >>> +margin-right: 210px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +margin-left: 161px; >>> +margin-right: 211px; >>> +} >>> +#ecom-mainarea .leftonly { >>> +margin-left: 160px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +margin-left: 161px; >>> +} >>> +#ecom-mainarea .rightonly { >>> +margin-right: 210px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +margin-right: 211px; >>> +} >>> + >>> +/* ====== eCommerce "Screenlet" Styles ====== */ >>> +#ecom-mainarea .screenlet { >>> +background: #FFFFFF; >>> +border: 1px solid #999999; >>> +margin-bottom: 10px; >>> +height:auto !important; >>> +height:1% >>> +} >>> +#ecom-mainarea .screenlet-header { >>> +background: #000099; >>> +padding-top: 1px; >>> +padding-bottom: 3px; >>> +padding-right: 4px; >>> +padding-left: 4px; >>> +height:auto !important; >>> +height:1% >>> +} >>> +#ecom-mainarea .screenlet-body { >>> +background: #FFFFFF; >>> +padding: 4px; >>> +height:auto !important; >>> +height:1% >>> +} >>> + >>> +.boxhead { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #FFFFFF; >>> +} >>> + >>> +.boxlink { >>> + float:right; >>> +} >>> + >>> +A.boxheadbutton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #FFFFFF; >>> +} >>> + >>> +A.boxheadbutton:hover { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: red; >>> +} >>> + >>> +/* Form layout styles to simulate a table-style layout */ >>> +#ecom-mainarea .form-row { >>> +clear: both; >>> +padding-top: 2px; >>> +} >>> +#ecom-mainarea .form-label { >>> +float: left; >>> +width: 180px; >>> +text-align: right; >>> +padding-top: 5px; >>> +} >>> +#ecom-mainarea .form-field { >>> +float: left; >>> +margin-left: 10px; >>> +text-align: left; >>> +} >>> + >>> +/* ===== Text/Label Styles ===== */ >>> +.tabletext, div.form-label, div.form-field { >>> +font-size: 10px; >>> +text-decoration: none; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +A.tabletext:hover { >>> +font-size: 10px; >>> +text-decoration: underline; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +.tablebuttontext { >>> +font-size: 10px; >>> +color: #1E3C66; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +.contenttext { >>> +font-size: 8pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +DIV.tabletexthidden { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +visibility: hidden; >>> +} >>> + >>> +h1 { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 12pt; >>> +font-weight: bold; >>> +color: #000099; >>> +} >>> + >>> +h2 { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 10pt; >>> +font-weight: bold; >>> +color: #000000; >>> +} >>> + >>> +h3 { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: #000000; >>> +} >>> + >>> +.info { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 10px; >>> +font-style: normal; >>> +color: #000000; >>> +} >>> + >>> +DIV.graybox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +background: #CCCCCC; >>> +border: 1px solid #000000; >>> +text-align: center; >>> +margin: 2px auto; >>> +width: auto; >>> +padding: 4px; >>> +} >>> + >>> + >>> +.boxoutside { >>> +background: #FFFFFF; >>> +padding: 0px; >>> +border-color: #999999; >>> +border-style: solid; >>> +border-width: 1px 1px 1px 1px; >>> +} >>> + >>> +.boxtop { >>> +background: #000099; >>> +padding-top: 1px; >>> +padding-bottom: 1px; >>> +padding-right: 4px; >>> +padding-left: 4px; >>> +border-color: #999999; >>> +border-style: solid; >>> +border-width: 0px 0px 0px 0px; >>> +} >>> + >>> +.boxbottom { >>> +background: #FFFFFF; >>> +padding: 4px; >>> +border-color: #999999; >>> +border-style: solid; >>> +border-width: 0px 0px 0px 0px; >>> +} >>> + >>> +.button { >>> +border-style: outset; border-color: #9999CC; border-width: 2px; >>> +background: #dddddd; >>> +padding-right: 5px; padding-left: 5px; >>> +} >>> + >>> + >>> +.tableheadtext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: black; >>> +} >>> + >>> +A.tableheadbutton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: black; >>> +} >>> + >>> +A.tableheadbutton:hover { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: underline; >>> +color: red; >>> +} >>> + >>> +.browsecategorytext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +text-indent: -10px; >>> +} >>> + >>> +A.browsecategorybutton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> + >>> +A.browsecategorybutton:hover { >>> +color: #000099; >>> +text-decoration: underline; >>> +} >>> + >>> +.browsecategorybuttondisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #333333; >>> +} >>> + >>> +A.buttontext, .buttontextdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px 1px 2px 1px; >>> +padding: 1px 4px 1px 4px; >>> +} >>> + >>> +A.buttontext { >>> +color: #000099; >>> +} >>> + >>> +A.buttontext:hover { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +A.linktext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> + >>> +A.linktext:hover { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +.buttontextdisabled { >>> +color: #333333; >>> +} >>> + >>> +.submenutextinfo { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: white; >>> +padding-left: 6px; >>> +padding-right: 5px; >>> +border-right: 1px solid #5886C6 >>> +} >>> + >>> +.submenutext, A.submenutext, A.submenutext:visited { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +padding-left: 6px; >>> +padding-right: 5px; >>> +border-right: 1px solid #5886C6 >>> +} >>> + >>> +A.submenutext:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +.submenutextdisabled, A.submenutextdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #CCCCCC; >>> +padding-left: 6px; >>> +padding-right: 5px; >>> +border-right: 1px solid #5886C6 >>> +} >>> + >>> +A.submenutextdisabled:hover { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: underline; >>> +color: yellow; >>> +} >>> + >>> +.submenutextinforight { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: white; >>> +padding-left: 6px; >>> +} >>> + >>> +.submenutextright, A.submenutextright { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +padding-left: 6px; >>> +} >>> + >>> +A.submenutextright:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +.submenutextrightdisabled, A.submenutextrightdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #CCCCCC; >>> +padding-left: 6px; >>> +} >>> + >>> +A.submenutextrightdisabled:hover { >>> +text-decoration: underline; >>> +color: yellow; >>> +} >>> + >>> +A.lightbuttontext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +border: none; >>> +} >>> + >>> +A.lightbuttontext:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +A.lightbuttontextsmall { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 8px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +border: none; >>> +} >>> + >>> +A.lightbuttontextsmall:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +.lightbuttontextdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #CCCCCC; >>> +} >>> + >>> +A.buttontextbig, .buttontextbigdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 15px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px 2px 2px 2px; >>> +padding: 1px 4px 1px 4px; >>> +} >>> +A.buttontextbig { >>> +color: #000099; >>> +} >>> +.buttontextbigdisabled { >>> +color: #CCCCCC; >>> +} >>> +A.buttontextbig:hover { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +A IMG.imageborder { >>> +border-style: solid; >>> +border-width: 1px; >>> +border-color: #999999; >>> +} >>> + >>> +/* ===== Other Header Styles ===== */ >>> + >>> + >>> +.headersmalltext { >>> +font-size: 8pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: black; >>> +} >>> +a.headersmalllink { >>> +font-size: 8pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: #000099; >>> +text-decoration: none; >>> +} >>> +a.headersmalllink:hover { >>> +color: red; >>> +} >>> + >>> +/* ===== Misc/General Styles ===== */ >>> +HR.sepbar { >>> +font-size: xx-small; >>> +width: 100%; >>> +height: 1px; >>> +background: #999999; >>> +border-width: 0px; >>> +} >>> + >>> +.errorMessage { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: red; >>> +} >>> + >>> +.eventMessage { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: #000099; >>> +} >>> + >>> +.ontab { >>> +font-size: 8pt; >>> +background: black; >>> +padding: 2px; >>> +border-style: inset; >>> +border-width: 3px; >>> +} >>> + >>> +a.onlnk { >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: #FFFFFF; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +text-decoration: none; >>> +padding: 2px; >>> +} >>> + >>> +.offtab { >>> +font-size: 10px; >>> +background: #CCCCCC; >>> +padding: 2px; >>> +border-style: outset; >>> +border-width: 3px; >>> +} >>> + >>> +a.offlnk { >>> +font-size: 10px; >>> +font-weight: bold; >>> +color: #000099; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +text-decoration: none; >>> +padding: 2px; >>> +} >>> + >>> +a.offlnk:hover { >>> +color: red; >>> +} >>> + >>> +.areaheader { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: #FFFFFF; >>> +width: 100%; >>> +background: black; >>> +padding: 2px; >>> +} >>> + >>> +.edittable { >>> +border-color: #000000 #000000 #003333; >>> +border-style: solid; >>> +border-top-width: thin; >>> +border-right-width: thin; >>> +border-bottom-width: thin; >>> +border-left-width: thin >>> +} >>> + >>> +.editInputBox { >>> +font-size: 8pt; >>> +background: #FFFFFF; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.inputBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.selectBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.textAreaBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.radioButton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +} >>> + >>> +.checkBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +} >>> + >>> +.smallSubmit { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.mediumSubmit,.largeSubmit,.loginButton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.smallSubmit:hover,.mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover >>> { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +.smallAltSubmit,.mediumAltSubmit,.largeAltSubmit { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 8pt; >>> +} >>> + >>> +.basePrice { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: black; >>> +} >>> + >>> +.normalPrice { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: green; >>> +} >>> + >>> +.salePrice { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: red; >>> +} >>> + >>> +/* ===== Product Summary Styles ===== */ >>> +.product-prevnext { >>> +text-align: right; >>> +} >>> + >>> +.productcategorylink-container { >>> +position: relative; >>> +margin-top: 10px; >>> +margin-bottom: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +.productcategorylink { >>> +position: relative; >>> +padding: 5px; >>> +border-bottom: #999 solid 1px; >>> +height: 60px; >>> +} >>> + >>> +.productcategorylink .smallimage { >>> +float: left; >>> +/* position: absolute; top: 5px; left: 5px; */ >>> +margin: 0px 5px 5px 0px; >>> +} >>> +.productcategorylink .smallimage img { >>> +border: #CCC solid 1px; >>> +height: 50px; >>> +} >>> + >>> +.productsummary-container { >>> +position: relative; >>> +margin-top: 10px; >>> +margin-bottom: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +.productsummary { >>> +position: relative; >>> +padding: 5px; >>> +border-bottom: #999 solid 1px; >>> +height: 60px; >>> +} >>> + >>> +.productsummary .smallimage { >>> +float: left; >>> +/* position: absolute; top: 5px; left: 5px; */ >>> +margin: 0px 5px 5px 0px; >>> +} >>> +.productsummary .smallimage img { >>> +border: #CCC solid 1px; >>> +height: 50px; >>> +} >>> + >>> +.productsummary .productbuy { >>> +float: right; >>> +width: 160px; >>> +margin: 5px; >>> +text-align: right; >>> +} >>> + >>> +.productsummary .productinfo { >>> +/* margin-left: 60px; */ >>> +text-align: left; >>> +} >>> + >>> +/* ===== Product Detail Styles ===== */ >>> +#productdetail #download-files { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +#productdetail #long-description { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +#productdetail #reviews { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +#productdetail #associated-products { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +.lefthalf{ >>> +left:0; >>> +width:49%; >>> +height:1%; >>> +margin:0% 1% 1% 0%; >>> +float:left; >>> +} >>> +.righthalf { >>> +float:right; >>> +height:1%; >>> +width:49%; >>> +right:0; >>> +margin:0 0 1% 1%; >>> +} >>> +.leftclear{ >>> +height:1%; >>> +clear: left; >>> +} >>> +.bothclear{ >>> +height:1%; >>> +clear: both; >>> +} >>> \ No newline at end of file >>> >>> Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>> (original) >>> +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Fri >>> Aug 17 10:22:04 2007 >>> @@ -48,7 +48,7 @@ >>> <!-- The default (main) stylesheets --> >>> <set field="layoutSettings.styleSheets[+0]" >>> value="/ecommerce/images/blog.css" global="true"/> >>> - <set field="layoutSettings.styleSheets[+0]" >>> value="${productStore.styleSheet}" >>> default-value="/images/ecommain.css" global="true"/> >>> + <set field="layoutSettings.styleSheets[+0]" >>> value="${productStore.styleSheet}" >>> default-value="/ecommerce/images/ecommain.css" >>> global="true"/> </actions> >>> <widgets> >>> <!-- render header --> >>> >>> Modified: >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> (original) >>> +++ >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> Fri Aug 17 10:22:04 2007 >>> @@ -18,9 +18,8 @@ >>> --> >>> >>> <#if productCategory?exists> >>> - <h1> >>> - >>> <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div> >>> - >>> <div>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</div> >>> + >>> <h1>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</h1> >>> + <h1>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</h1> >>> <#if hasQuantities?exists> >>> <form method="post" >>> action="<@ofbizUrl>addCategoryDefaults<#if >>> requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" >>> name="thecategoryform" style='margin: 0;'> >>> <input type='hidden' name='add_category_id' >>> value='${productCategory.productCategoryId}'/> >>> @@ -33,7 +32,6 @@ >>> </form> >>> </#if> >>> <a >>> href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" >>> class="buttontext">${uiLabelMap.ProductSearchinCategory}</a> >>> - </h1> >>> <#assign longDescription = >>> categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> >>> <#assign categoryImageUrl = >>> categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> >>> <#if categoryImageUrl?has_content || longDescription?has_content> >>> >>> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>> (original) >>> +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri >>> Aug 17 10:22:04 2007 >>> @@ -23,7 +23,7 @@ >>> <script language="javascript" src="/images/selectall.js" >>> type="text/javascript"></script> >>> <script language="javascript" src="/images/fieldlookup.js" >>> type="text/javascript"></script> >>> >>> - <link rel="stylesheet" href="/images/ecommain.css" >>> type="text/css"/> >>> + <link rel="stylesheet" href="/ecommerce/images/ecommain.css" >>> type="text/css"/> >>> <link rel="stylesheet" href="/ecommerce/images/blog.css" >>> type="text/css"/> >>> <link rel="stylesheet" href="/content/images/contentForum.css" >>> type="text/css"/> >>> >> |
Re: svn commit: r567090 - in /ofbiz/trunk: applications/content/config/ applications/ecommerce/config/ applications/ecommerce/data/ applications/ecommerce/webapp/
|
|
In reply to this post by Adrian Crum
Hmmm... I don't know how to revert the trunk.
Adrian Crum wrote: > I can revert it. My motivation was to get application-specific files out > of the framework. > > David E Jones wrote: > >> >> Do we really want to do this? >> >> The point of having all static resources under the images component is >> so they can be easily moved to another server or even a third party >> content hosting service like Akamai or CacheFly. >> >> This is what the ofbizContentUrl transform facilitates. >> >> If we want multiple static content areas like this we will need to >> change that to support multiple content areas, which makes >> configuration and management significantly more complex. >> >> I'd like to hear from others, but my vote is to revert this. >> >> -David >> >> >> [hidden email] wrote: >> >>> Author: adrianc >>> Date: Fri Aug 17 10:22:04 2007 >>> New Revision: 567090 >>> >>> URL: http://svn.apache.org/viewvc?view=rev&rev=567090 >>> Log: >>> Moved the ecommain.css file to the ecommerce component. Existing >>> installations will need to update the stylesheet field in their >>> ProductStore entity. >>> >>> Moved forum.properties file to the content component. >>> >>> Added: >>> ofbiz/trunk/applications/content/config/forum.properties >>> >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> Removed: >>> ofbiz/trunk/applications/ecommerce/config/forum.properties >>> ofbiz/trunk/framework/images/webapp/images/ecommain.css >>> Modified: >>> ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >>> ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>> ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>> >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> >>> ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>> >>> Added: ofbiz/trunk/applications/content/config/forum.properties >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/forum.properties?view=auto&rev=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/content/config/forum.properties (added) >>> +++ ofbiz/trunk/applications/content/config/forum.properties Fri Aug >>> 17 10:22:04 2007 >>> @@ -0,0 +1 @@ >>> +descriptLen=80 >>> \ No newline at end of file >>> >>> Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original) >>> +++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Fri Aug >>> 17 10:22:04 2007 >>> @@ -52,7 +52,7 @@ >>> authFraudMessage="Your order has been rejected and your >>> account has been disabled due to fraud." >>> authErrorMessage="Problem connecting to payment processor; >>> we will continue to retry and notify you by email." >>> storeCreditValidDays="90" >>> - styleSheet="/images/ecommain.css" >>> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> + styleSheet="/ecommerce/images/ecommain.css" >>> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> <!-- <ProductStorePaymentSetting productStoreId="9000" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>> paymentService="testRandomAuthorize"/> --> >>> <ProductStorePaymentSetting productStoreId="9000" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>> paymentService="alwaysApproveCCProcessor"/> >>> >>> Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>> (original) >>> +++ ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml Fri >>> Aug 17 10:22:04 2007 >>> @@ -28,7 +28,7 @@ >>> authDeclinedMessage="There has been a problem with your >>> method of payment. Please try a different method or call customer >>> service." >>> authFraudMessage="Your order has been rejected and your >>> account has been disabled due to fraud." >>> authErrorMessage="Problem connecting to payment processor; >>> we will continue to retry and notify you by email." >>> - styleSheet="/images/ecommain.css" >>> headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> + styleSheet="/ecommerce/images/ecommain.css" >>> headerLogo="/images/opentravelsystem_logo.jpg" autoApproveInvoice="Y" >>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>> <ProductStorePaymentSetting productStoreId="RentalStore" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>> paymentService="alwaysApproveCCProcessor"/> >>> <ProductStorePaymentSetting productStoreId="RentalStore" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_RELEASE" >>> paymentService="testCCRelease"/> >>> <ProductStorePaymentSetting productStoreId="RentalStore" >>> paymentMethodTypeId="CREDIT_CARD" >>> paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" >>> paymentService="testCCCapture"/> >>> >>> Added: >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css?view=auto&rev=567090 >>> >>> ============================================================================== >>> >>> --- >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> (added) >>> +++ >>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>> Fri Aug 17 10:22:04 2007 >>> @@ -0,0 +1,990 @@ >>> +/* >>> + * 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. >>> + */ >>> + >>> +/* ===== This file contains the eCommerce specific styles ===== */ >>> + >>> +/* ===== Basic Element Styles ===== */ >>> +BODY { >>> +background: #FFFFFF; >>> +margin-top: 10px; >>> +margin-right: 10px; >>> +margin-bottom: 10px; >>> +margin-left: 10px; >>> +} >>> + >>> +FORM { >>> +margin: 0px; >>> +} >>> + >>> +UL { >>> +margin-top: 0; >>> +margin-bottom: 0; >>> +} >>> + >>> +img { >>> +behavior: url("/images/pngbehavior.htc"); >>> +} >>> + >>> +.endcolumns { >>> +clear: both; >>> +height: 0px; >>> +visibility: hidden; >>> +} >>> + >>> +TH { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000000; >>> +} >>> + >>> +TD { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: normal; >>> +text-decoration: none; >>> +color: #000000; >>> +} >>> + >>> +/* ===== Header Styles ===== */ >>> +#ecom-header { >>> +position: relative; >>> +background: #ffffff; >>> +height: 80px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +height: 80px; >>> +/* border:1px solid #000; */ >>> +} >>> +#ecom-header #left { >>> +position: absolute; >>> +top: 0px; >>> +left: 0px; >>> +width: 280px; >>> +} >>> +#ecom-header #middle { >>> +margin-left: 290px; >>> +margin-right: 210px; >>> +padding-top: 10px; >>> +width: auto; >>> + >>> +text-align: center; >>> +} >>> +#ecom-header #right { >>> +position: absolute; >>> +top: 0px; >>> +right: 0px; >>> +width: 200px; >>> +padding: 0px; >>> +margin-top: 20px; >>> + >>> +text-align: right; >>> +} >>> + >>> +#welcome-message { >>> +padding-right: 10px; >>> +padding-left: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000000; >>> +} >>> +#welcome-message a { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> +#welcome-message a:hover { >>> +color: black; >>> +text-decoration: underline; >>> +} >>> +#company-name { >>> +margin: 0px; >>> +font-size: 12pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: #000099; >>> +white-space: nowrap; >>> +} >>> +#company-subtitle { >>> +margin: 0px; >>> +font-size: 6pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: #330099; >>> +white-space: nowrap; >>> +} >>> + >>> +#microcart { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: black; >>> +} >>> +#microcart a { >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> +#microcart a:hover { >>> +color: black; >>> +text-decoration: underline; >>> +} >>> +#microcart .disabled { >>> +color: #666666; >>> +} >>> + >>> +/* ===== Header-Bar Styles ===== */ >>> +#ecom-header-bar { >>> +background: #B4B0AA; >>> +text-align: center; >>> +overflow: visible; >>> +height: 14px; >>> +} >>> + >>> +#ecom-header-bar ul { >>> +display: block; >>> +overflow: visible; >>> +list-style: none; >>> +background: transparent; >>> +vertical-align: middle; >>> +margin: 0px; >>> +padding: 0px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 12px; >>> +} >>> + >>> +#ecom-header-bar ul li { >>> +height: 14px; >>> +padding: 0px 8px 0px 8px; >>> +} >>> +#ecom-header-bar ul#left-links li { >>> +float: left; >>> +border-right: 1px solid #FFFFFF; >>> +} >>> +#ecom-header-bar ul#right-links li { >>> +float: right; >>> +border-left: 1px solid #FFFFFF; >>> +} >>> + >>> +#ecom-header-bar ul li a { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> +#ecom-header-bar ul li:hover a { >>> +color: black; >>> +text-decoration: underline; >>> +} >>> + >>> + >>> +/* ===== Layout/Formatting Styles ===== */ >>> +/* NOTE: using a combination of a float left/right for the side bars >>> AND >>> + wide margins for the center to get 2 desired effects: 1. be able >>> to end >>> + columns and put the footer at the bottom of the page and 2. not >>> have the >>> + center column expand to full width below the columns. >>> + >>> + The downside to this is that in some browsers we can't effectively >>> use floats >>> + within divs in the main column. >>> +*/ >>> + >>> +/* ecom-mainarea wraps what is below the header including the divs >>> for left, main, right columns as applicable */ >>> +#ecom-mainarea { >>> +position: relative; >>> +background: #FFFFFF; >>> +width: 100%; >>> +margin-top: 10px; >>> +} >>> + >>> +#ecom-mainarea .left { >>> +/* alt: position: absolute; left: 0px; top: 0px; */ >>> +float: left; >>> +width: 150px; >>> +background: #ffffff; >>> +/* border:1px solid #000; */ >>> +} >>> +#ecom-mainarea .right { >>> +/* alt: position: absolute; right: 0px; top: 0px; */ >>> +float: right; >>> +width: 200px; >>> +background: #ffffff; >>> +} >>> + >>> + >>> +#ecom-mainarea .center, #ecom-mainarea .leftonly, #ecom-mainarea >>> .rightonly, #ecom-mainarea .nocolumns { >>> +background:#fff; >>> +text-align: left; >>> +vertical-align: top; >>> +} >>> +#ecom-mainarea .center { >>> +margin-left: 160px; >>> +margin-right: 210px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +margin-left: 161px; >>> +margin-right: 211px; >>> +} >>> +#ecom-mainarea .leftonly { >>> +margin-left: 160px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +margin-left: 161px; >>> +} >>> +#ecom-mainarea .rightonly { >>> +margin-right: 210px; >>> +voice-family: "\"}\""; >>> +voice-family: inherit; >>> +margin-right: 211px; >>> +} >>> + >>> +/* ====== eCommerce "Screenlet" Styles ====== */ >>> +#ecom-mainarea .screenlet { >>> +background: #FFFFFF; >>> +border: 1px solid #999999; >>> +margin-bottom: 10px; >>> +height:auto !important; >>> +height:1% >>> +} >>> +#ecom-mainarea .screenlet-header { >>> +background: #000099; >>> +padding-top: 1px; >>> +padding-bottom: 3px; >>> +padding-right: 4px; >>> +padding-left: 4px; >>> +height:auto !important; >>> +height:1% >>> +} >>> +#ecom-mainarea .screenlet-body { >>> +background: #FFFFFF; >>> +padding: 4px; >>> +height:auto !important; >>> +height:1% >>> +} >>> + >>> +.boxhead { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #FFFFFF; >>> +} >>> + >>> +.boxlink { >>> + float:right; >>> +} >>> + >>> +A.boxheadbutton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #FFFFFF; >>> +} >>> + >>> +A.boxheadbutton:hover { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: red; >>> +} >>> + >>> +/* Form layout styles to simulate a table-style layout */ >>> +#ecom-mainarea .form-row { >>> +clear: both; >>> +padding-top: 2px; >>> +} >>> +#ecom-mainarea .form-label { >>> +float: left; >>> +width: 180px; >>> +text-align: right; >>> +padding-top: 5px; >>> +} >>> +#ecom-mainarea .form-field { >>> +float: left; >>> +margin-left: 10px; >>> +text-align: left; >>> +} >>> + >>> +/* ===== Text/Label Styles ===== */ >>> +.tabletext, div.form-label, div.form-field { >>> +font-size: 10px; >>> +text-decoration: none; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +A.tabletext:hover { >>> +font-size: 10px; >>> +text-decoration: underline; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +.tablebuttontext { >>> +font-size: 10px; >>> +color: #1E3C66; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +.contenttext { >>> +font-size: 8pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +} >>> + >>> +DIV.tabletexthidden { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +visibility: hidden; >>> +} >>> + >>> +h1 { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 12pt; >>> +font-weight: bold; >>> +color: #000099; >>> +} >>> + >>> +h2 { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 10pt; >>> +font-weight: bold; >>> +color: #000000; >>> +} >>> + >>> +h3 { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: #000000; >>> +} >>> + >>> +.info { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 10px; >>> +font-style: normal; >>> +color: #000000; >>> +} >>> + >>> +DIV.graybox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +background: #CCCCCC; >>> +border: 1px solid #000000; >>> +text-align: center; >>> +margin: 2px auto; >>> +width: auto; >>> +padding: 4px; >>> +} >>> + >>> + >>> +.boxoutside { >>> +background: #FFFFFF; >>> +padding: 0px; >>> +border-color: #999999; >>> +border-style: solid; >>> +border-width: 1px 1px 1px 1px; >>> +} >>> + >>> +.boxtop { >>> +background: #000099; >>> +padding-top: 1px; >>> +padding-bottom: 1px; >>> +padding-right: 4px; >>> +padding-left: 4px; >>> +border-color: #999999; >>> +border-style: solid; >>> +border-width: 0px 0px 0px 0px; >>> +} >>> + >>> +.boxbottom { >>> +background: #FFFFFF; >>> +padding: 4px; >>> +border-color: #999999; >>> +border-style: solid; >>> +border-width: 0px 0px 0px 0px; >>> +} >>> + >>> +.button { >>> +border-style: outset; border-color: #9999CC; border-width: 2px; >>> +background: #dddddd; >>> +padding-right: 5px; padding-left: 5px; >>> +} >>> + >>> + >>> +.tableheadtext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: black; >>> +} >>> + >>> +A.tableheadbutton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: black; >>> +} >>> + >>> +A.tableheadbutton:hover { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: underline; >>> +color: red; >>> +} >>> + >>> +.browsecategorytext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +text-indent: -10px; >>> +} >>> + >>> +A.browsecategorybutton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> + >>> +A.browsecategorybutton:hover { >>> +color: #000099; >>> +text-decoration: underline; >>> +} >>> + >>> +.browsecategorybuttondisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #333333; >>> +} >>> + >>> +A.buttontext, .buttontextdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px 1px 2px 1px; >>> +padding: 1px 4px 1px 4px; >>> +} >>> + >>> +A.buttontext { >>> +color: #000099; >>> +} >>> + >>> +A.buttontext:hover { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +A.linktext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +} >>> + >>> +A.linktext:hover { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +.buttontextdisabled { >>> +color: #333333; >>> +} >>> + >>> +.submenutextinfo { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: white; >>> +padding-left: 6px; >>> +padding-right: 5px; >>> +border-right: 1px solid #5886C6 >>> +} >>> + >>> +.submenutext, A.submenutext, A.submenutext:visited { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +padding-left: 6px; >>> +padding-right: 5px; >>> +border-right: 1px solid #5886C6 >>> +} >>> + >>> +A.submenutext:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +.submenutextdisabled, A.submenutextdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #CCCCCC; >>> +padding-left: 6px; >>> +padding-right: 5px; >>> +border-right: 1px solid #5886C6 >>> +} >>> + >>> +A.submenutextdisabled:hover { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: underline; >>> +color: yellow; >>> +} >>> + >>> +.submenutextinforight { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: white; >>> +padding-left: 6px; >>> +} >>> + >>> +.submenutextright, A.submenutextright { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +padding-left: 6px; >>> +} >>> + >>> +A.submenutextright:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +.submenutextrightdisabled, A.submenutextrightdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #CCCCCC; >>> +padding-left: 6px; >>> +} >>> + >>> +A.submenutextrightdisabled:hover { >>> +text-decoration: underline; >>> +color: yellow; >>> +} >>> + >>> +A.lightbuttontext { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +border: none; >>> +} >>> + >>> +A.lightbuttontext:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +A.lightbuttontextsmall { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 8px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: yellow; >>> +border: none; >>> +} >>> + >>> +A.lightbuttontextsmall:hover { >>> +color: yellow; >>> +text-decoration: underline; >>> +} >>> + >>> +.lightbuttontextdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #CCCCCC; >>> +} >>> + >>> +A.buttontextbig, .buttontextbigdisabled { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 15px; >>> +font-weight: bold; >>> +text-decoration: none; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px 2px 2px 2px; >>> +padding: 1px 4px 1px 4px; >>> +} >>> +A.buttontextbig { >>> +color: #000099; >>> +} >>> +.buttontextbigdisabled { >>> +color: #CCCCCC; >>> +} >>> +A.buttontextbig:hover { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +A IMG.imageborder { >>> +border-style: solid; >>> +border-width: 1px; >>> +border-color: #999999; >>> +} >>> + >>> +/* ===== Other Header Styles ===== */ >>> + >>> + >>> +.headersmalltext { >>> +font-size: 8pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: black; >>> +} >>> +a.headersmalllink { >>> +font-size: 8pt; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: #000099; >>> +text-decoration: none; >>> +} >>> +a.headersmalllink:hover { >>> +color: red; >>> +} >>> + >>> +/* ===== Misc/General Styles ===== */ >>> +HR.sepbar { >>> +font-size: xx-small; >>> +width: 100%; >>> +height: 1px; >>> +background: #999999; >>> +border-width: 0px; >>> +} >>> + >>> +.errorMessage { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: red; >>> +} >>> + >>> +.eventMessage { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +margin: 0px; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: #000099; >>> +} >>> + >>> +.ontab { >>> +font-size: 8pt; >>> +background: black; >>> +padding: 2px; >>> +border-style: inset; >>> +border-width: 3px; >>> +} >>> + >>> +a.onlnk { >>> +font-size: 8pt; >>> +font-weight: bold; >>> +color: #FFFFFF; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +text-decoration: none; >>> +padding: 2px; >>> +} >>> + >>> +.offtab { >>> +font-size: 10px; >>> +background: #CCCCCC; >>> +padding: 2px; >>> +border-style: outset; >>> +border-width: 3px; >>> +} >>> + >>> +a.offlnk { >>> +font-size: 10px; >>> +font-weight: bold; >>> +color: #000099; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +text-decoration: none; >>> +padding: 2px; >>> +} >>> + >>> +a.offlnk:hover { >>> +color: red; >>> +} >>> + >>> +.areaheader { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-weight: bold; >>> +color: #FFFFFF; >>> +width: 100%; >>> +background: black; >>> +padding: 2px; >>> +} >>> + >>> +.edittable { >>> +border-color: #000000 #000000 #003333; >>> +border-style: solid; >>> +border-top-width: thin; >>> +border-right-width: thin; >>> +border-bottom-width: thin; >>> +border-left-width: thin >>> +} >>> + >>> +.editInputBox { >>> +font-size: 8pt; >>> +background: #FFFFFF; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.inputBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.selectBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.textAreaBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.radioButton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +} >>> + >>> +.checkBox { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +background: #FFFFFF; >>> +font-size: 8pt; >>> +} >>> + >>> +.smallSubmit { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 8pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.mediumSubmit,.largeSubmit,.loginButton { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 10pt; >>> +font-weight: bold; >>> +text-decoration: none; >>> +color: #000099; >>> +background: white; >>> +border: #999999 solid 1px; >>> +margin: 2px; >>> +} >>> + >>> +.smallSubmit:hover,.mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover >>> { >>> +color: red; >>> +text-decoration: underline; >>> +} >>> + >>> +.smallAltSubmit,.mediumAltSubmit,.largeAltSubmit { >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +font-size: 8pt; >>> +} >>> + >>> +.basePrice { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: black; >>> +} >>> + >>> +.normalPrice { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: green; >>> +} >>> + >>> +.salePrice { >>> +font-size: 10px; >>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>> +color: red; >>> +} >>> + >>> +/* ===== Product Summary Styles ===== */ >>> +.product-prevnext { >>> +text-align: right; >>> +} >>> + >>> +.productcategorylink-container { >>> +position: relative; >>> +margin-top: 10px; >>> +margin-bottom: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +.productcategorylink { >>> +position: relative; >>> +padding: 5px; >>> +border-bottom: #999 solid 1px; >>> +height: 60px; >>> +} >>> + >>> +.productcategorylink .smallimage { >>> +float: left; >>> +/* position: absolute; top: 5px; left: 5px; */ >>> +margin: 0px 5px 5px 0px; >>> +} >>> +.productcategorylink .smallimage img { >>> +border: #CCC solid 1px; >>> +height: 50px; >>> +} >>> + >>> +.productsummary-container { >>> +position: relative; >>> +margin-top: 10px; >>> +margin-bottom: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +.productsummary { >>> +position: relative; >>> +padding: 5px; >>> +border-bottom: #999 solid 1px; >>> +height: 60px; >>> +} >>> + >>> +.productsummary .smallimage { >>> +float: left; >>> +/* position: absolute; top: 5px; left: 5px; */ >>> +margin: 0px 5px 5px 0px; >>> +} >>> +.productsummary .smallimage img { >>> +border: #CCC solid 1px; >>> +height: 50px; >>> +} >>> + >>> +.productsummary .productbuy { >>> +float: right; >>> +width: 160px; >>> +margin: 5px; >>> +text-align: right; >>> +} >>> + >>> +.productsummary .productinfo { >>> +/* margin-left: 60px; */ >>> +text-align: left; >>> +} >>> + >>> +/* ===== Product Detail Styles ===== */ >>> +#productdetail #download-files { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +#productdetail #long-description { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +#productdetail #reviews { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +#productdetail #associated-products { >>> +margin-top: 10px; >>> +padding-top: 5px; >>> +border-top: #999 solid 1px; >>> +} >>> + >>> +.lefthalf{ >>> +left:0; >>> +width:49%; >>> +height:1%; >>> +margin:0% 1% 1% 0%; >>> +float:left; >>> +} >>> +.righthalf { >>> +float:right; >>> +height:1%; >>> +width:49%; >>> +right:0; >>> +margin:0 0 1% 1%; >>> +} >>> +.leftclear{ >>> +height:1%; >>> +clear: left; >>> +} >>> +.bothclear{ >>> +height:1%; >>> +clear: both; >>> +} >>> \ No newline at end of file >>> >>> Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>> (original) >>> +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Fri >>> Aug 17 10:22:04 2007 >>> @@ -48,7 +48,7 @@ >>> <!-- The default (main) stylesheets --> >>> <set field="layoutSettings.styleSheets[+0]" >>> value="/ecommerce/images/blog.css" global="true"/> >>> - <set field="layoutSettings.styleSheets[+0]" >>> value="${productStore.styleSheet}" >>> default-value="/images/ecommain.css" global="true"/> >>> + <set field="layoutSettings.styleSheets[+0]" >>> value="${productStore.styleSheet}" >>> default-value="/ecommerce/images/ecommain.css" >>> global="true"/> </actions> >>> <widgets> >>> <!-- render header --> >>> >>> Modified: >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> (original) >>> +++ >>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>> Fri Aug 17 10:22:04 2007 >>> @@ -18,9 +18,8 @@ >>> --> >>> >>> <#if productCategory?exists> >>> - <h1> >>> - >>> <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div> >>> - >>> <div>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</div> >>> + >>> <h1>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</h1> >>> + <h1>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</h1> >>> <#if hasQuantities?exists> >>> <form method="post" >>> action="<@ofbizUrl>addCategoryDefaults<#if >>> requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" >>> name="thecategoryform" style='margin: 0;'> >>> <input type='hidden' name='add_category_id' >>> value='${productCategory.productCategoryId}'/> >>> @@ -33,7 +32,6 @@ >>> </form> >>> </#if> >>> <a >>> href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" >>> class="buttontext">${uiLabelMap.ProductSearchinCategory}</a> >>> - </h1> >>> <#assign longDescription = >>> categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> >>> <#assign categoryImageUrl = >>> categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> >>> <#if categoryImageUrl?has_content || longDescription?has_content> >>> >>> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?view=diff&rev=567090&r1=567089&r2=567090 >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>> (original) >>> +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri >>> Aug 17 10:22:04 2007 >>> @@ -23,7 +23,7 @@ >>> <script language="javascript" src="/images/selectall.js" >>> type="text/javascript"></script> >>> <script language="javascript" src="/images/fieldlookup.js" >>> type="text/javascript"></script> >>> >>> - <link rel="stylesheet" href="/images/ecommain.css" >>> type="text/css"/> >>> + <link rel="stylesheet" href="/ecommerce/images/ecommain.css" >>> type="text/css"/> >>> <link rel="stylesheet" href="/ecommerce/images/blog.css" >>> type="text/css"/> >>> <link rel="stylesheet" href="/content/images/contentForum.css" >>> type="text/css"/> >>> >> >> > |
Re: svn commit: r567090 - in /ofbiz/trunk: applications/content/config/ applications/ecommerce/config/ applications/ecommerce/data/ applications/ecommerce/webapp/
|
|
In reply to this post by David E Jones
Maybe have a folder called static directly below ofbiz home.
David E Jones wrote: > > The better eventual solution for this would probably be to move the > images component out of the framework. Where to put it is another > question though... it doesn't really fit in framework, applications, or > specialpurpose. > > So yeah, please do revert this and we'll find a better solution with > fewer side-effects. > > -David > > > Adrian Crum wrote: > >> I can revert it. My motivation was to get application-specific files >> out of the framework. >> >> David E Jones wrote: >> >>> >>> Do we really want to do this? >>> >>> The point of having all static resources under the images component >>> is so they can be easily moved to another server or even a third >>> party content hosting service like Akamai or CacheFly. >>> >>> This is what the ofbizContentUrl transform facilitates. >>> >>> If we want multiple static content areas like this we will need to >>> change that to support multiple content areas, which makes >>> configuration and management significantly more complex. >>> >>> I'd like to hear from others, but my vote is to revert this. >>> >>> -David >>> >>> >>> [hidden email] wrote: >>> >>>> Author: adrianc >>>> Date: Fri Aug 17 10:22:04 2007 >>>> New Revision: 567090 >>>> >>>> URL: http://svn.apache.org/viewvc?view=rev&rev=567090 >>>> Log: >>>> Moved the ecommain.css file to the ecommerce component. Existing >>>> installations will need to update the stylesheet field in their >>>> ProductStore entity. >>>> >>>> Moved forum.properties file to the content component. >>>> >>>> Added: >>>> ofbiz/trunk/applications/content/config/forum.properties >>>> >>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>>> Removed: >>>> ofbiz/trunk/applications/ecommerce/config/forum.properties >>>> ofbiz/trunk/framework/images/webapp/images/ecommain.css >>>> Modified: >>>> ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >>>> ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>>> ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>>> >>>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>>> >>>> ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>>> >>>> Added: ofbiz/trunk/applications/content/config/forum.properties >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/forum.properties?view=auto&rev=567090 >>>> >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/applications/content/config/forum.properties (added) >>>> +++ ofbiz/trunk/applications/content/config/forum.properties Fri Aug >>>> 17 10:22:04 2007 >>>> @@ -0,0 +1 @@ >>>> +descriptLen=80 >>>> \ No newline at end of file >>>> >>>> Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >>>> >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original) >>>> +++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Fri Aug >>>> 17 10:22:04 2007 >>>> @@ -52,7 +52,7 @@ >>>> authFraudMessage="Your order has been rejected and your >>>> account has been disabled due to fraud." >>>> authErrorMessage="Problem connecting to payment processor; >>>> we will continue to retry and notify you by email." >>>> storeCreditValidDays="90" >>>> - styleSheet="/images/ecommain.css" >>>> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >>>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>>> + styleSheet="/ecommerce/images/ecommain.css" >>>> headerLogo="/images/ofbiz_logo.jpg" autoApproveInvoice="Y" >>>> shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>>> <!-- <ProductStorePaymentSetting productStoreId="9000" >>>> paymentMethodTypeId="CREDIT_CARD" >>>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>>> paymentService="testRandomAuthorize"/> --> >>>> <ProductStorePaymentSetting productStoreId="9000" >>>> paymentMethodTypeId="CREDIT_CARD" >>>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>>> paymentService="alwaysApproveCCProcessor"/> >>>> >>>> Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml?view=diff&rev=567090&r1=567089&r2=567090 >>>> >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>>> (original) >>>> +++ ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml >>>> Fri Aug 17 10:22:04 2007 >>>> @@ -28,7 +28,7 @@ >>>> authDeclinedMessage="There has been a problem with your >>>> method of payment. Please try a different method or call customer >>>> service." >>>> authFraudMessage="Your order has been rejected and your >>>> account has been disabled due to fraud." >>>> authErrorMessage="Problem connecting to payment processor; >>>> we will continue to retry and notify you by email." >>>> - styleSheet="/images/ecommain.css" >>>> headerLogo="/images/opentravelsystem_logo.jpg" >>>> autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>>> + styleSheet="/ecommerce/images/ecommain.css" >>>> headerLogo="/images/opentravelsystem_logo.jpg" >>>> autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y"/> >>>> <ProductStorePaymentSetting productStoreId="RentalStore" >>>> paymentMethodTypeId="CREDIT_CARD" >>>> paymentServiceTypeEnumId="PRDS_PAY_AUTH" >>>> paymentService="alwaysApproveCCProcessor"/> >>>> <ProductStorePaymentSetting productStoreId="RentalStore" >>>> paymentMethodTypeId="CREDIT_CARD" >>>> paymentServiceTypeEnumId="PRDS_PAY_RELEASE" >>>> paymentService="testCCRelease"/> >>>> <ProductStorePaymentSetting productStoreId="RentalStore" >>>> paymentMethodTypeId="CREDIT_CARD" >>>> paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" >>>> paymentService="testCCCapture"/> >>>> >>>> Added: >>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css?view=auto&rev=567090 >>>> >>>> ============================================================================== >>>> >>>> --- >>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>>> (added) >>>> +++ >>>> ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/ecommain.css >>>> Fri Aug 17 10:22:04 2007 >>>> @@ -0,0 +1,990 @@ >>>> +/* >>>> + * 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. >>>> + */ >>>> + >>>> +/* ===== This file contains the eCommerce specific styles ===== */ >>>> + >>>> +/* ===== Basic Element Styles ===== */ >>>> +BODY { >>>> +background: #FFFFFF; >>>> +margin-top: 10px; >>>> +margin-right: 10px; >>>> +margin-bottom: 10px; >>>> +margin-left: 10px; >>>> +} >>>> + >>>> +FORM { >>>> +margin: 0px; >>>> +} >>>> + >>>> +UL { >>>> +margin-top: 0; >>>> +margin-bottom: 0; >>>> +} >>>> + >>>> +img { >>>> +behavior: url("/images/pngbehavior.htc"); >>>> +} >>>> + >>>> +.endcolumns { >>>> +clear: both; >>>> +height: 0px; >>>> +visibility: hidden; >>>> +} >>>> + >>>> +TH { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000000; >>>> +} >>>> + >>>> +TD { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: normal; >>>> +text-decoration: none; >>>> +color: #000000; >>>> +} >>>> + >>>> +/* ===== Header Styles ===== */ >>>> +#ecom-header { >>>> +position: relative; >>>> +background: #ffffff; >>>> +height: 80px; >>>> +voice-family: "\"}\""; >>>> +voice-family: inherit; >>>> +height: 80px; >>>> +/* border:1px solid #000; */ >>>> +} >>>> +#ecom-header #left { >>>> +position: absolute; >>>> +top: 0px; >>>> +left: 0px; >>>> +width: 280px; >>>> +} >>>> +#ecom-header #middle { >>>> +margin-left: 290px; >>>> +margin-right: 210px; >>>> +padding-top: 10px; >>>> +width: auto; >>>> + >>>> +text-align: center; >>>> +} >>>> +#ecom-header #right { >>>> +position: absolute; >>>> +top: 0px; >>>> +right: 0px; >>>> +width: 200px; >>>> +padding: 0px; >>>> +margin-top: 20px; >>>> + >>>> +text-align: right; >>>> +} >>>> + >>>> +#welcome-message { >>>> +padding-right: 10px; >>>> +padding-left: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000000; >>>> +} >>>> +#welcome-message a { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +} >>>> +#welcome-message a:hover { >>>> +color: black; >>>> +text-decoration: underline; >>>> +} >>>> +#company-name { >>>> +margin: 0px; >>>> +font-size: 12pt; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-weight: bold; >>>> +color: #000099; >>>> +white-space: nowrap; >>>> +} >>>> +#company-subtitle { >>>> +margin: 0px; >>>> +font-size: 6pt; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +color: #330099; >>>> +white-space: nowrap; >>>> +} >>>> + >>>> +#microcart { >>>> +font-size: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: black; >>>> +} >>>> +#microcart a { >>>> +text-decoration: none; >>>> +color: #000099; >>>> +} >>>> +#microcart a:hover { >>>> +color: black; >>>> +text-decoration: underline; >>>> +} >>>> +#microcart .disabled { >>>> +color: #666666; >>>> +} >>>> + >>>> +/* ===== Header-Bar Styles ===== */ >>>> +#ecom-header-bar { >>>> +background: #B4B0AA; >>>> +text-align: center; >>>> +overflow: visible; >>>> +height: 14px; >>>> +} >>>> + >>>> +#ecom-header-bar ul { >>>> +display: block; >>>> +overflow: visible; >>>> +list-style: none; >>>> +background: transparent; >>>> +vertical-align: middle; >>>> +margin: 0px; >>>> +padding: 0px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 12px; >>>> +} >>>> + >>>> +#ecom-header-bar ul li { >>>> +height: 14px; >>>> +padding: 0px 8px 0px 8px; >>>> +} >>>> +#ecom-header-bar ul#left-links li { >>>> +float: left; >>>> +border-right: 1px solid #FFFFFF; >>>> +} >>>> +#ecom-header-bar ul#right-links li { >>>> +float: right; >>>> +border-left: 1px solid #FFFFFF; >>>> +} >>>> + >>>> +#ecom-header-bar ul li a { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +} >>>> +#ecom-header-bar ul li:hover a { >>>> +color: black; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> + >>>> +/* ===== Layout/Formatting Styles ===== */ >>>> +/* NOTE: using a combination of a float left/right for the side >>>> bars AND >>>> + wide margins for the center to get 2 desired effects: 1. be able >>>> to end >>>> + columns and put the footer at the bottom of the page and 2. not >>>> have the >>>> + center column expand to full width below the columns. >>>> + >>>> + The downside to this is that in some browsers we can't >>>> effectively use floats >>>> + within divs in the main column. >>>> +*/ >>>> + >>>> +/* ecom-mainarea wraps what is below the header including the divs >>>> for left, main, right columns as applicable */ >>>> +#ecom-mainarea { >>>> +position: relative; >>>> +background: #FFFFFF; >>>> +width: 100%; >>>> +margin-top: 10px; >>>> +} >>>> + >>>> +#ecom-mainarea .left { >>>> +/* alt: position: absolute; left: 0px; top: 0px; */ >>>> +float: left; >>>> +width: 150px; >>>> +background: #ffffff; >>>> +/* border:1px solid #000; */ >>>> +} >>>> +#ecom-mainarea .right { >>>> +/* alt: position: absolute; right: 0px; top: 0px; */ >>>> +float: right; >>>> +width: 200px; >>>> +background: #ffffff; >>>> +} >>>> + >>>> + >>>> +#ecom-mainarea .center, #ecom-mainarea .leftonly, #ecom-mainarea >>>> .rightonly, #ecom-mainarea .nocolumns { >>>> +background:#fff; >>>> +text-align: left; >>>> +vertical-align: top; >>>> +} >>>> +#ecom-mainarea .center { >>>> +margin-left: 160px; >>>> +margin-right: 210px; >>>> +voice-family: "\"}\""; >>>> +voice-family: inherit; >>>> +margin-left: 161px; >>>> +margin-right: 211px; >>>> +} >>>> +#ecom-mainarea .leftonly { >>>> +margin-left: 160px; >>>> +voice-family: "\"}\""; >>>> +voice-family: inherit; >>>> +margin-left: 161px; >>>> +} >>>> +#ecom-mainarea .rightonly { >>>> +margin-right: 210px; >>>> +voice-family: "\"}\""; >>>> +voice-family: inherit; >>>> +margin-right: 211px; >>>> +} >>>> + >>>> +/* ====== eCommerce "Screenlet" Styles ====== */ >>>> +#ecom-mainarea .screenlet { >>>> +background: #FFFFFF; >>>> +border: 1px solid #999999; >>>> +margin-bottom: 10px; >>>> +height:auto !important; >>>> +height:1% >>>> +} >>>> +#ecom-mainarea .screenlet-header { >>>> +background: #000099; >>>> +padding-top: 1px; >>>> +padding-bottom: 3px; >>>> +padding-right: 4px; >>>> +padding-left: 4px; >>>> +height:auto !important; >>>> +height:1% >>>> +} >>>> +#ecom-mainarea .screenlet-body { >>>> +background: #FFFFFF; >>>> +padding: 4px; >>>> +height:auto !important; >>>> +height:1% >>>> +} >>>> + >>>> +.boxhead { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #FFFFFF; >>>> +} >>>> + >>>> +.boxlink { >>>> + float:right; >>>> +} >>>> + >>>> +A.boxheadbutton { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #FFFFFF; >>>> +} >>>> + >>>> +A.boxheadbutton:hover { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: red; >>>> +} >>>> + >>>> +/* Form layout styles to simulate a table-style layout */ >>>> +#ecom-mainarea .form-row { >>>> +clear: both; >>>> +padding-top: 2px; >>>> +} >>>> +#ecom-mainarea .form-label { >>>> +float: left; >>>> +width: 180px; >>>> +text-align: right; >>>> +padding-top: 5px; >>>> +} >>>> +#ecom-mainarea .form-field { >>>> +float: left; >>>> +margin-left: 10px; >>>> +text-align: left; >>>> +} >>>> + >>>> +/* ===== Text/Label Styles ===== */ >>>> +.tabletext, div.form-label, div.form-field { >>>> +font-size: 10px; >>>> +text-decoration: none; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +} >>>> + >>>> +A.tabletext:hover { >>>> +font-size: 10px; >>>> +text-decoration: underline; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +} >>>> + >>>> +.tablebuttontext { >>>> +font-size: 10px; >>>> +color: #1E3C66; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +} >>>> + >>>> +.contenttext { >>>> +font-size: 8pt; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +} >>>> + >>>> +DIV.tabletexthidden { >>>> +font-size: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +visibility: hidden; >>>> +} >>>> + >>>> +h1 { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 12pt; >>>> +font-weight: bold; >>>> +color: #000099; >>>> +} >>>> + >>>> +h2 { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 10pt; >>>> +font-weight: bold; >>>> +color: #000000; >>>> +} >>>> + >>>> +h3 { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +color: #000000; >>>> +} >>>> + >>>> +.info { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 10px; >>>> +font-style: normal; >>>> +color: #000000; >>>> +} >>>> + >>>> +DIV.graybox { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +background: #CCCCCC; >>>> +border: 1px solid #000000; >>>> +text-align: center; >>>> +margin: 2px auto; >>>> +width: auto; >>>> +padding: 4px; >>>> +} >>>> + >>>> + >>>> +.boxoutside { >>>> +background: #FFFFFF; >>>> +padding: 0px; >>>> +border-color: #999999; >>>> +border-style: solid; >>>> +border-width: 1px 1px 1px 1px; >>>> +} >>>> + >>>> +.boxtop { >>>> +background: #000099; >>>> +padding-top: 1px; >>>> +padding-bottom: 1px; >>>> +padding-right: 4px; >>>> +padding-left: 4px; >>>> +border-color: #999999; >>>> +border-style: solid; >>>> +border-width: 0px 0px 0px 0px; >>>> +} >>>> + >>>> +.boxbottom { >>>> +background: #FFFFFF; >>>> +padding: 4px; >>>> +border-color: #999999; >>>> +border-style: solid; >>>> +border-width: 0px 0px 0px 0px; >>>> +} >>>> + >>>> +.button { >>>> +border-style: outset; border-color: #9999CC; border-width: 2px; >>>> +background: #dddddd; >>>> +padding-right: 5px; padding-left: 5px; >>>> +} >>>> + >>>> + >>>> +.tableheadtext { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: black; >>>> +} >>>> + >>>> +A.tableheadbutton { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: black; >>>> +} >>>> + >>>> +A.tableheadbutton:hover { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: underline; >>>> +color: red; >>>> +} >>>> + >>>> +.browsecategorytext { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +text-indent: -10px; >>>> +} >>>> + >>>> +A.browsecategorybutton { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +} >>>> + >>>> +A.browsecategorybutton:hover { >>>> +color: #000099; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +.browsecategorybuttondisabled { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #333333; >>>> +} >>>> + >>>> +A.buttontext, .buttontextdisabled { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px 1px 2px 1px; >>>> +padding: 1px 4px 1px 4px; >>>> +} >>>> + >>>> +A.buttontext { >>>> +color: #000099; >>>> +} >>>> + >>>> +A.buttontext:hover { >>>> +color: red; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +A.linktext { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +} >>>> + >>>> +A.linktext:hover { >>>> +color: red; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +.buttontextdisabled { >>>> +color: #333333; >>>> +} >>>> + >>>> +.submenutextinfo { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: white; >>>> +padding-left: 6px; >>>> +padding-right: 5px; >>>> +border-right: 1px solid #5886C6 >>>> +} >>>> + >>>> +.submenutext, A.submenutext, A.submenutext:visited { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: yellow; >>>> +padding-left: 6px; >>>> +padding-right: 5px; >>>> +border-right: 1px solid #5886C6 >>>> +} >>>> + >>>> +A.submenutext:hover { >>>> +color: yellow; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +.submenutextdisabled, A.submenutextdisabled { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #CCCCCC; >>>> +padding-left: 6px; >>>> +padding-right: 5px; >>>> +border-right: 1px solid #5886C6 >>>> +} >>>> + >>>> +A.submenutextdisabled:hover { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: underline; >>>> +color: yellow; >>>> +} >>>> + >>>> +.submenutextinforight { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: white; >>>> +padding-left: 6px; >>>> +} >>>> + >>>> +.submenutextright, A.submenutextright { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: yellow; >>>> +padding-left: 6px; >>>> +} >>>> + >>>> +A.submenutextright:hover { >>>> +color: yellow; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +.submenutextrightdisabled, A.submenutextrightdisabled { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #CCCCCC; >>>> +padding-left: 6px; >>>> +} >>>> + >>>> +A.submenutextrightdisabled:hover { >>>> +text-decoration: underline; >>>> +color: yellow; >>>> +} >>>> + >>>> +A.lightbuttontext { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: yellow; >>>> +border: none; >>>> +} >>>> + >>>> +A.lightbuttontext:hover { >>>> +color: yellow; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +A.lightbuttontextsmall { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 8px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: yellow; >>>> +border: none; >>>> +} >>>> + >>>> +A.lightbuttontextsmall:hover { >>>> +color: yellow; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +.lightbuttontextdisabled { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #CCCCCC; >>>> +} >>>> + >>>> +A.buttontextbig, .buttontextbigdisabled { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 15px; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px 2px 2px 2px; >>>> +padding: 1px 4px 1px 4px; >>>> +} >>>> +A.buttontextbig { >>>> +color: #000099; >>>> +} >>>> +.buttontextbigdisabled { >>>> +color: #CCCCCC; >>>> +} >>>> +A.buttontextbig:hover { >>>> +color: red; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +A IMG.imageborder { >>>> +border-style: solid; >>>> +border-width: 1px; >>>> +border-color: #999999; >>>> +} >>>> + >>>> +/* ===== Other Header Styles ===== */ >>>> + >>>> + >>>> +.headersmalltext { >>>> +font-size: 8pt; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-weight: bold; >>>> +color: black; >>>> +} >>>> +a.headersmalllink { >>>> +font-size: 8pt; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-weight: bold; >>>> +color: #000099; >>>> +text-decoration: none; >>>> +} >>>> +a.headersmalllink:hover { >>>> +color: red; >>>> +} >>>> + >>>> +/* ===== Misc/General Styles ===== */ >>>> +HR.sepbar { >>>> +font-size: xx-small; >>>> +width: 100%; >>>> +height: 1px; >>>> +background: #999999; >>>> +border-width: 0px; >>>> +} >>>> + >>>> +.errorMessage { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +color: red; >>>> +} >>>> + >>>> +.eventMessage { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +margin: 0px; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +color: #000099; >>>> +} >>>> + >>>> +.ontab { >>>> +font-size: 8pt; >>>> +background: black; >>>> +padding: 2px; >>>> +border-style: inset; >>>> +border-width: 3px; >>>> +} >>>> + >>>> +a.onlnk { >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +color: #FFFFFF; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +text-decoration: none; >>>> +padding: 2px; >>>> +} >>>> + >>>> +.offtab { >>>> +font-size: 10px; >>>> +background: #CCCCCC; >>>> +padding: 2px; >>>> +border-style: outset; >>>> +border-width: 3px; >>>> +} >>>> + >>>> +a.offlnk { >>>> +font-size: 10px; >>>> +font-weight: bold; >>>> +color: #000099; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +text-decoration: none; >>>> +padding: 2px; >>>> +} >>>> + >>>> +a.offlnk:hover { >>>> +color: red; >>>> +} >>>> + >>>> +.areaheader { >>>> +font-size: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-weight: bold; >>>> +color: #FFFFFF; >>>> +width: 100%; >>>> +background: black; >>>> +padding: 2px; >>>> +} >>>> + >>>> +.edittable { >>>> +border-color: #000000 #000000 #003333; >>>> +border-style: solid; >>>> +border-top-width: thin; >>>> +border-right-width: thin; >>>> +border-bottom-width: thin; >>>> +border-left-width: thin >>>> +} >>>> + >>>> +.editInputBox { >>>> +font-size: 8pt; >>>> +background: #FFFFFF; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px; >>>> +} >>>> + >>>> +.inputBox { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +background: #FFFFFF; >>>> +font-size: 8pt; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px; >>>> +} >>>> + >>>> +.selectBox { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +background: #FFFFFF; >>>> +font-size: 8pt; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px; >>>> +} >>>> + >>>> +.textAreaBox { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +background: #FFFFFF; >>>> +font-size: 8pt; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px; >>>> +} >>>> + >>>> +.radioButton { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +background: #FFFFFF; >>>> +font-size: 8pt; >>>> +} >>>> + >>>> +.checkBox { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +background: #FFFFFF; >>>> +font-size: 8pt; >>>> +} >>>> + >>>> +.smallSubmit { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 8pt; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px; >>>> +} >>>> + >>>> +.mediumSubmit,.largeSubmit,.loginButton { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 10pt; >>>> +font-weight: bold; >>>> +text-decoration: none; >>>> +color: #000099; >>>> +background: white; >>>> +border: #999999 solid 1px; >>>> +margin: 2px; >>>> +} >>>> + >>>> +.smallSubmit:hover,.mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover >>>> { >>>> +color: red; >>>> +text-decoration: underline; >>>> +} >>>> + >>>> +.smallAltSubmit,.mediumAltSubmit,.largeAltSubmit { >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +font-size: 8pt; >>>> +} >>>> + >>>> +.basePrice { >>>> +font-size: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +color: black; >>>> +} >>>> + >>>> +.normalPrice { >>>> +font-size: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +color: green; >>>> +} >>>> + >>>> +.salePrice { >>>> +font-size: 10px; >>>> +font-family: Verdana, Arial, Helvetica, sans-serif; >>>> +color: red; >>>> +} >>>> + >>>> +/* ===== Product Summary Styles ===== */ >>>> +.product-prevnext { >>>> +text-align: right; >>>> +} >>>> + >>>> +.productcategorylink-container { >>>> +position: relative; >>>> +margin-top: 10px; >>>> +margin-bottom: 5px; >>>> +border-top: #999 solid 1px; >>>> +} >>>> + >>>> +.productcategorylink { >>>> +position: relative; >>>> +padding: 5px; >>>> +border-bottom: #999 solid 1px; >>>> +height: 60px; >>>> +} >>>> + >>>> +.productcategorylink .smallimage { >>>> +float: left; >>>> +/* position: absolute; top: 5px; left: 5px; */ >>>> +margin: 0px 5px 5px 0px; >>>> +} >>>> +.productcategorylink .smallimage img { >>>> +border: #CCC solid 1px; >>>> +height: 50px; >>>> +} >>>> + >>>> +.productsummary-container { >>>> +position: relative; >>>> +margin-top: 10px; >>>> +margin-bottom: 5px; >>>> +border-top: #999 solid 1px; >>>> +} >>>> + >>>> +.productsummary { >>>> +position: relative; >>>> +padding: 5px; >>>> +border-bottom: #999 solid 1px; >>>> +height: 60px; >>>> +} >>>> + >>>> +.productsummary .smallimage { >>>> +float: left; >>>> +/* position: absolute; top: 5px; left: 5px; */ >>>> +margin: 0px 5px 5px 0px; >>>> +} >>>> +.productsummary .smallimage img { >>>> +border: #CCC solid 1px; >>>> +height: 50px; >>>> +} >>>> + >>>> +.productsummary .productbuy { >>>> +float: right; >>>> +width: 160px; >>>> +margin: 5px; >>>> +text-align: right; >>>> +} >>>> + >>>> +.productsummary .productinfo { >>>> +/* margin-left: 60px; */ >>>> +text-align: left; >>>> +} >>>> + >>>> +/* ===== Product Detail Styles ===== */ >>>> +#productdetail #download-files { >>>> +margin-top: 10px; >>>> +padding-top: 5px; >>>> +border-top: #999 solid 1px; >>>> +} >>>> + >>>> +#productdetail #long-description { >>>> +margin-top: 10px; >>>> +padding-top: 5px; >>>> +border-top: #999 solid 1px; >>>> +} >>>> + >>>> +#productdetail #reviews { >>>> +margin-top: 10px; >>>> +padding-top: 5px; >>>> +border-top: #999 solid 1px; >>>> +} >>>> + >>>> +#productdetail #associated-products { >>>> +margin-top: 10px; >>>> +padding-top: 5px; >>>> +border-top: #999 solid 1px; >>>> +} >>>> + >>>> +.lefthalf{ >>>> +left:0; >>>> +width:49%; >>>> +height:1%; >>>> +margin:0% 1% 1% 0%; >>>> +float:left; >>>> +} >>>> +.righthalf { >>>> +float:right; >>>> +height:1%; >>>> +width:49%; >>>> +right:0; >>>> +margin:0 0 1% 1%; >>>> +} >>>> +.leftclear{ >>>> +height:1%; >>>> +clear: left; >>>> +} >>>> +.bothclear{ >>>> +height:1%; >>>> +clear: both; >>>> +} >>>> \ No newline at end of file >>>> >>>> Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?view=diff&rev=567090&r1=567089&r2=567090 >>>> >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml >>>> (original) >>>> +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Fri >>>> Aug 17 10:22:04 2007 >>>> @@ -48,7 +48,7 @@ >>>> <!-- The default (main) stylesheets >>>> --> >>>> <set field="layoutSettings.styleSheets[+0]" >>>> value="/ecommerce/images/blog.css" global="true"/> >>>> - <set field="layoutSettings.styleSheets[+0]" >>>> value="${productStore.styleSheet}" >>>> default-value="/images/ecommain.css" global="true"/> >>>> + <set field="layoutSettings.styleSheets[+0]" >>>> value="${productStore.styleSheet}" >>>> default-value="/ecommerce/images/ecommain.css" >>>> global="true"/> </actions> >>>> <widgets> >>>> <!-- render header --> >>>> >>>> Modified: >>>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>>> >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?view=diff&rev=567090&r1=567089&r2=567090 >>>> >>>> ============================================================================== >>>> >>>> --- >>>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>>> (original) >>>> +++ >>>> ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl >>>> Fri Aug 17 10:22:04 2007 >>>> @@ -18,9 +18,8 @@ >>>> --> >>>> >>>> <#if productCategory?exists> >>>> - <h1> >>>> - >>>> <div>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</div> >>>> - >>>> <div>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</div> >>>> + >>>> <h1>${categoryContentWrapper.get("CATEGORY_NAME")?if_exists}</h1> >>>> + >>>> <h1>${categoryContentWrapper.get("DESCRIPTION")?if_exists}</h1> >>>> <#if hasQuantities?exists> >>>> <form method="post" >>>> action="<@ofbizUrl>addCategoryDefaults<#if >>>> requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" >>>> name="thecategoryform" style='margin: 0;'> >>>> <input type='hidden' name='add_category_id' >>>> value='${productCategory.productCategoryId}'/> >>>> @@ -33,7 +32,6 @@ >>>> </form> >>>> </#if> >>>> <a >>>> href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" >>>> class="buttontext">${uiLabelMap.ProductSearchinCategory}</a> >>>> - </h1> >>>> <#assign longDescription = >>>> categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> >>>> <#assign categoryImageUrl = >>>> categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> >>>> <#if categoryImageUrl?has_content || longDescription?has_content> >>>> >>>> Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?view=diff&rev=567090&r1=567089&r2=567090 >>>> >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl >>>> (original) >>>> +++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri >>>> Aug 17 10:22:04 2007 >>>> @@ -23,7 +23,7 @@ >>>> <script language="javascript" src="/images/selectall.js" >>>> type="text/javascript"></script> >>>> <script language="javascript" src="/images/fieldlookup.js" >>>> type="text/javascript"></script> >>>> >>>> - <link rel="stylesheet" href="/images/ecommain.css" >>>> type="text/css"/> >>>> + <link rel="stylesheet" href="/ecommerce/images/ecommain.css" >>>> type="text/css"/> >>>> <link rel="stylesheet" href="/ecommerce/images/blog.css" >>>> type="text/css"/> >>>> <link rel="stylesheet" href="/content/images/contentForum.css" >>>> type="text/css"/> >>>> >>> >>> > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |