You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2006/08/25 23:02:00 UTC
svn commit: r436946 - in /incubator/ofbiz/trunk:
applications/ecommerce/config/
applications/ecommerce/webapp/ecommerce/customer/
applications/ecommerce/widget/ framework/images/webapp/images/
Author: jleroux
Date: Fri Aug 25 14:01:58 2006
New Revision: 436946
URL: http://svn.apache.org/viewvc?rev=436946&view=rev
Log:
A patch from Marco Risalti (OFBIZ-181 In Microsoft Internet Explorer the ecommain.css was not parsed correctly) plus a minor enhancement for cart 1st title from old JIRA OFBIZ-380
Modified:
incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css
Modified: incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties?rev=436946&r1=436945&r2=436946&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties Fri Aug 25 14:01:58 2006
@@ -255,6 +255,7 @@
EcommerceRating=Rating (1-5; 5 being best)
EcommerceRatings=Ratings
EcommerceRead=Read
+EcommerceReadMessage=Read Message
EcommerceRecalculateCart=Recalculate Cart
EcommerceRecurrence=Recurrence
EcommerceRefineButton=Refine
Modified: incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties?rev=436946&r1=436945&r2=436946&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties Fri Aug 25 14:01:58 2006
@@ -254,6 +254,7 @@
EcommerceRating=Posizione(1-5; 5 \u00e8 il migliore)
EcommerceRatings=Posizione
EcommerceRead=Leggi
+EcommerceReadMessage=Leggi Messaggio
EcommerceRecalculateCart=Ricalcola Carrello
EcommerceRecurrence=Ricorrenza
EcommerceRefineButton=Rifinisce
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?rev=436946&r1=436945&r2=436946&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Fri Aug 25 14:01:58 2006
@@ -29,9 +29,9 @@
<#if (communicationEvent.partyIdFrom?if_exists != (userLogin.partyId)?if_exists)>
<a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.PartyReply}</a>
</#if>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.ViewList}</a>
+ <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
</div>
- <div class="boxhead">Read Message</div>
+ <div class="boxhead">${uiLabelMap.EcommerceReadMessage}</div>
</div>
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="1">
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=436946&r1=436945&r2=436946&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Fri Aug 25 14:01:58 2006
@@ -437,7 +437,7 @@
<input type="hidden" name="contentTypeId" value="DOCUMENT"/>
<input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
<input type="file" name="uploadedFile" size="50" class="inputBox"/>
- <input type="submit" value="Upload" class="smallSubmit"/>
+ <input type="submit" value="${uiLabelMap.CommonUpload}" class="smallSubmit"/>
</form>
</div>
</div>
Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?rev=436946&r1=436945&r2=436946&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Fri Aug 25 14:01:58 2006
@@ -246,11 +246,12 @@
<screen name="contactus">
<section>
<actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="rightbarScreenName" value="rightbar"/>
<set field="MainColumnStyle" value="rightonly"/>
<set field="titleProperty" value="PageTitleLogin"/>
- <set field="pageHeader" value="Contact Us"/>
+ <set field="pageHeader" value="${uiLabelMap.CommonContactUs}"/>
<set field="headerItem" value="contactus"/>
<set field="submitRequest" value="contactsubmit"/>
</actions>
@@ -318,8 +319,9 @@
<screen name="messagecreate">
<section>
<actions>
+ <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="PageTitleNewMessage"/>
- <set field="pageHeader" value="New Message"/>
+ <set field="pageHeader" value="${uiLabelMap.PageTitleNewMessage}"/>
<set field="showMessageLinks" value="true"/>
<set field="submitRequest" value="sendmessage"/>
Modified: incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=436946&r1=436945&r2=436946&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ incubator/ofbiz/trunk/framework/images/webapp/images/ecommain.css Fri Aug 25 14:01:58 2006
@@ -34,6 +34,7 @@
voice-family: "\"}\"";
voice-family: inherit;
height: 80px;
+width: 100%;
/* border:1px solid #000; */
}
#ecom-header #left {
@@ -195,10 +196,11 @@
#ecom-mainarea .center, #ecom-mainarea .leftonly, #ecom-mainarea .rightonly, #ecom-mainarea .nocolumns {
-background:#fff;
+background:#fff;
text-align: left;
vertical-align: top;
margin-top: 10px;
+width: 100%;
}
#ecom-mainarea .center {
margin-left: 160px;
@@ -207,18 +209,21 @@
voice-family: inherit;
margin-left: 161px;
margin-right: 211px;
+width: 851px;
}
#ecom-mainarea .leftonly {
margin-left: 160px;
voice-family: "\"}\"";
voice-family: inherit;
margin-left: 161px;
+width: 1071px;
}
#ecom-mainarea .rightonly {
margin-right: 210px;
voice-family: "\"}\"";
voice-family: inherit;
margin-right: 211px;
+width: 1011px;
}
/* ====== eCommerce "Screenlet" Styles ====== */
@@ -230,7 +235,7 @@
#ecom-mainarea .screenlet-header {
background: #000099;
padding-top: 1px;
-padding-bottom: 1px;
+padding-bottom: 3px;
padding-right: 4px;
padding-left: 4px;
}