Author: jleroux
Date: Mon Oct 12 12:27:17 2009
New Revision: 824316
URL: http://svn.apache.org/viewvc?rev=824316&view=rev
Log:
"Applied fix from trunk for revision: 823892"
------------------------------------------------------------------------
r823892 | jleroux | 2009-10-10 19:19:25 +0200 (sam. 10 oct. 2009) | 4 lignes
Forgot to commit blue light theme and commons screens in r823888
+ a better French translation
+ Follow the same path and fix Bizness Time : right and left were reversed
All sounds good now : I will backport
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
ofbiz/branches/release09.04/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css
ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 12 12:27:17 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892
Modified:
ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml?rev=824316&r1=824315&r2=824316&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
(original)
+++
ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
Mon Oct 12 12:27:17 2009
@@ -1334,7 +1334,7 @@
</property>
<property key="PageTitleFindSalesForecast">
<value xml:lang="en">Find Sales Forecast</value>
- <value xml:lang="fr">Rechercher la prévision des ventes</value>
+ <value xml:lang="fr">Recherche de prévision des ventes</value>
<value xml:lang="it">Ricerca previsioni di vendita</value>
</property>
<property key="PageTitleFindSegmentGroup">
Modified:
ofbiz/branches/release09.04/applications/marketing/widget/sfa/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/widget/sfa/CommonScreens.xml?rev=824316&r1=824315&r2=824316&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/marketing/widget/sfa/CommonScreens.xml
(original)
+++
ofbiz/branches/release09.04/applications/marketing/widget/sfa/CommonScreens.xml
Mon Oct 12 12:27:17 2009
@@ -39,7 +39,7 @@
<set field="applicationTitle"
value="${uiLabelMap.SfaManagerApplication}" global="true"/>
<set field="leftbarScreenName" value="leftbar"/>
<set field="leftbarScreenLocation"
value="component://marketing/widget/sfa/CommonScreens.xml"/>
- <set field="MainColumnStyle" value="leftonly"/>
+ <set field="MainColumnStyle" value="leftonly-larger"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator"
location="component://commonext/widget/CommonScreens.xml"/>
@@ -73,7 +73,7 @@
<section>
<condition><not><if-empty field="userLogin"/></not></condition>
<widgets>
- <container style="leftLarger">
+ <container style="left-larger">
<screenlet id ="SfaQuickAddContactPanel"
title="${uiLabelMap.SfaQuickAddContact}" collapsible="true">
<include-form name="QuickAddContact"
location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
</screenlet>
Modified:
ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css?rev=824316&r1=824315&r2=824316&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css
(original)
+++ ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css Mon
Oct 12 12:27:17 2009
@@ -767,7 +767,7 @@
margin-right: 1em;
}
-#column-container .leftLarger {
+#column-container .left-larger {
float: left;
/* alt: position: absolute; top: 0px; left: 0px; */
width: 25em;
@@ -794,6 +794,11 @@
width: auto;
}
+#column-container .leftonly-larger {
+ margin-left: 26em;
+ width: auto;
+}
+
#column-container .rightonly {
margin-right: 23em;
width: auto;
Modified:
ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css?rev=824316&r1=824315&r2=824316&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css
(original)
+++ ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css Mon
Oct 12 12:27:17 2009
@@ -768,12 +768,6 @@
margin-right: 1em;
}
-#column-container .leftonly-larger {
-margin-left: 26em;
-width: auto;
-}
-
-
.left-border {
float: left;
margin-right: 1em;
@@ -794,6 +788,11 @@
width: auto;
}
+#column-container .leftonly-larger {
+margin-left: 26em;
+width: auto;
+}
+
#column-container .rightonly {
margin-right: 23em;
width: auto;
