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 2010/10/28 14:11:25 UTC
svn commit: r1028269 [4/4] - in /ofbiz/branches/jquery: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/
applicati...
Modified: ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml Thu Oct 28 12:11:23 2010
@@ -47,10 +47,9 @@ under the License.
<attribute name="custRequestId" type="String" mode="IN" optional="true"/>
<attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
<override name="workEffortTypeId" optional="false"/>
- <override name="workEffortName" optional="false"/>
+ <override name="workEffortName" optional="false" allow-html="safe"/>
<override name="currentStatusId" optional="false"/>
- <override name="workEffortName" allow-html="safe" />
- <override name="description" allow-html="safe" />
+ <override name="description" allow-html="safe"/>
</service>
<service name="createWorkEffortAndPartyAssign" default-entity-name="WorkEffort" engine="simple"
location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortAndPartyAssign">
@@ -76,6 +75,8 @@ under the License.
<auto-attributes mode="IN" include="pk" optional="false"/>
<attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
<attribute name="reason" type="String" mode="IN" optional="true"/>
+ <override name="workEffortName" allow-html="safe"/>
+ <override name="description" allow-html="safe"/>
</service>
<service name="deleteWorkEffort" default-entity-name="WorkEffort" engine="simple"
location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffort">
@@ -363,6 +364,7 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
<override name="custRequestId" optional="true" mode="INOUT"/>
+ <override name="description" allow-html="safe"/>
</service>
<service name="deleteWorkEffortRequest" engine="simple" location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
<description>Deletes a CustRequestWorkEffort</description>
Modified: ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml Thu Oct 28 12:11:23 2010
@@ -10917,7 +10917,7 @@
<value xml:lang="de">Deaktiviert</value>
<value xml:lang="en">Disable</value>
<value xml:lang="es">Deshabilitado</value>
- <value xml:lang="fr">Invalide</value>
+ <value xml:lang="fr">Desactivé</value>
<value xml:lang="it">Disabilita</value>
<value xml:lang="nl">Deactiveren</value>
<value xml:lang="pt">Desactivar</value>
Modified: ofbiz/branches/jquery/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/entitydef/entitymodel.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jquery/framework/common/entitydef/entitymodel.xml Thu Oct 28 12:11:23 2010
@@ -195,6 +195,16 @@ under the License.
<key-map field-name="geoAssocTypeId"/>
</relation>
</entity>
+ <view-entity entity-name="GeoAssocAndGeoFrom" package-name="org.ofbiz.common.geo">
+ <member-entity entity-alias="GA" entity-name="GeoAssoc"/>
+ <member-entity entity-alias="GFR" entity-name="Geo"/>
+ <alias-all entity-alias="GFR"/>
+ <alias entity-alias="GA" name="geoIdTo"/>
+ <alias entity-alias="GA" name="geoAssocTypeId"/>
+ <view-link entity-alias="GA" rel-entity-alias="GFR">
+ <key-map field-name="geoId"/>
+ </view-link>
+ </view-entity>
<view-entity entity-name="GeoAssocAndGeoTo" package-name="org.ofbiz.common.geo">
<member-entity entity-alias="GA" entity-name="GeoAssoc"/>
<member-entity entity-alias="GTO" entity-name="Geo"/>
Modified: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/geo/GeoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original)
+++ ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Thu Oct 28 12:11:23 2010
@@ -19,9 +19,11 @@
package org.ofbiz.common.geo;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javolution.util.FastList;
+import javolution.util.FastMap;
import javolution.util.FastSet;
import org.ofbiz.base.util.Debug;
@@ -85,22 +87,24 @@ public class GeoWorker {
return geoList;
}
- public static Set<String> expandGeoRegionDeep(Set<String> geoIdSet, Delegator delegator) throws GenericEntityException {
- if (UtilValidate.isEmpty(geoIdSet)) {
- return geoIdSet;
- }
- Set<String> geoIdSetTemp = FastSet.newInstance();
- for (String curGeoId: geoIdSet) {
- List<GenericValue> geoAssocList = delegator.findByAndCache("GeoAssoc", UtilMisc.toMap("geoIdTo", curGeoId, "geoAssocTypeId", "REGIONS"));
+ public static Map<String, String> expandGeoRegionDeep(Map<String, String> geoIdByTypeMapOrig, Delegator delegator) throws GenericEntityException {
+ if (UtilValidate.isEmpty(geoIdByTypeMapOrig)) {
+ return geoIdByTypeMapOrig;
+ }
+ Map<String, String> geoIdByTypeMapTemp = FastMap.newInstance();
+ for (Map.Entry<String, String> geoIdByTypeEntry: geoIdByTypeMapOrig.entrySet()) {
+ List<GenericValue> geoAssocList = delegator.findByAndCache("GeoAssoc", UtilMisc.toMap("geoIdTo", geoIdByTypeEntry.getValue(), "geoAssocTypeId", "REGIONS"));
for (GenericValue geoAssoc: geoAssocList) {
- geoIdSetTemp.add(geoAssoc.getString("geoId"));
+ GenericValue newGeo = delegator.findOne("Geo", true, "geoId", geoAssoc.getString("geoId"));
+ geoIdByTypeMapTemp.put(newGeo.getString("geoTypeId"), newGeo.getString("geoId"));
}
}
- geoIdSetTemp = expandGeoRegionDeep(geoIdSetTemp, delegator);
- Set<String> geoIdSetNew = FastSet.newInstance();
- geoIdSetNew.addAll(geoIdSet);
- geoIdSetNew.addAll(geoIdSetTemp);
- return geoIdSetNew;
+ geoIdByTypeMapTemp = expandGeoRegionDeep(geoIdByTypeMapTemp, delegator);
+ Map<String, String> geoIdByTypeMapNew = FastMap.newInstance();
+ // add the temp Map first, then the original over top of it, ie give the original priority over the sub/expanded values
+ geoIdByTypeMapNew.putAll(geoIdByTypeMapTemp);
+ geoIdByTypeMapNew.putAll(geoIdByTypeMapOrig);
+ return geoIdByTypeMapNew;
}
public static boolean containsGeo(List<GenericValue> geoList, String geoId, Delegator delegator) {
Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1024561
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1028265
Propchange: ofbiz/branches/jquery/framework/entity/lib/jdbc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 28 12:11:23 2010
@@ -1,3 +1,4 @@
postgresql-8.1-407.jdbc3.jar
postgresql-8.3-603.jdbc3.jar
postgresql-8.4-701.jdbc4.jar
+postgresql-9.0-801.jdbc4.jar
Modified: ofbiz/branches/jquery/framework/example/config/ExampleEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/config/ExampleEntityLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/config/ExampleEntityLabels.xml (original)
+++ ofbiz/branches/jquery/framework/example/config/ExampleEntityLabels.xml Thu Oct 28 12:11:23 2010
@@ -71,21 +71,21 @@
</property>
<property key="FieldDescription.Example.exampleId">
<value xml:lang="en">A unique Example ID. If you don't assign an ID, one will be generated automatically</value>
- <value xml:lang="fr">Une réf. unique d'exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
+ <value xml:lang="fr">Une réf. unique d'exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value>
<value xml:lang="it">Un codice esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
<value xml:lang="th">รหัสà¸à¸±à¸§à¸à¸¢à¹à¸²à¸ à¸à¹à¸²à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸£à¸«à¸±à¸ª à¸à¸°à¸à¹à¸à¸à¸¡à¸µà¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸¶à¹à¸à¸à¸±à¸à¹à¸¡à¸±à¸à¸´</value>
<value xml:lang="zh">ä¸ä¸ªå¯ä¸çæ ·ä¾è¡¨ç¤ºãå¦æä½ æ²¡ææå®ä¸ä¸ªæ è¯ï¼é£ä¹ä¼èªå¨çæä¸ä¸ª</value>
</property>
<property key="FieldDescription.ExampleItem.exampleItemSeqId">
<value xml:lang="en">A unique Example Item sequence ID. If you don't assign an ID, one will be generated automatically</value>
- <value xml:lang="fr">Une réf. unique d'article exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
+ <value xml:lang="fr">Une réf. unique d'article exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value>
<value xml:lang="it">Un codice riga esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
<value xml:lang="th">รหัสà¸à¸±à¸§à¸à¸¢à¹à¸²à¸à¸ªà¸´à¸à¸à¹à¸² à¸à¹à¸²à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸£à¸«à¸±à¸ª à¸à¸°à¸à¹à¸à¸à¸¡à¸µà¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸¶à¹à¸à¸à¸±à¸à¹à¸¡à¸±à¸à¸´</value>
<value xml:lang="zh">ä¸ä¸ªå¯ä¸çæ ·ä¾æç»åºå·ãå¦æä½ æ²¡ææå®ä¸ä¸ªæ è¯ï¼é£ä¹ä¼èªå¨çæä¸ä¸ª</value>
</property>
<property key="FieldDescription.ExampleType.exampleTypeId">
<value xml:lang="en">A unique Example Type ID. If you don't assign an ID, one will be generated automatically</value>
- <value xml:lang="fr">Une réf. unique de type exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
+ <value xml:lang="fr">Une réf. unique de type exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value>
<value xml:lang="it">Un tipo esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
<value xml:lang="th">รหัสà¸à¸±à¸§à¸à¸¢à¹à¸²à¸à¸à¸£à¸°à¹à¸ ภà¸à¹à¸²à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸£à¸«à¸±à¸ª à¸à¸°à¸à¹à¸à¸à¸¡à¸µà¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸¶à¹à¸à¸à¸±à¸à¹à¸¡à¸±à¸à¸´</value>
<value xml:lang="zh">ä¸ä¸ªå¯ä¸çæ ·ä¾ç±»ååºå·ãå¦æä½ æ²¡ææå®ä¸ä¸ªæ è¯ï¼é£ä¹ä¼èªå¨çæä¸ä¸ª</value>
Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Thu Oct 28 12:11:23 2010
@@ -720,6 +720,7 @@ public class MacroFormRenderer implement
if (textSize > 0 && UtilValidate.isNotEmpty(explicitDescription) && explicitDescription.length() > textSize) {
explicitDescription = explicitDescription.substring(0, textSize - 8) + "..." + explicitDescription.substring(explicitDescription.length() - 5);
}
+ explicitDescription = encode(explicitDescription, modelFormField, context);
// if allow empty is true, add an empty option
if (dropDownField.isAllowEmpty()) {
allowEmpty = "Y";
Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Thu Oct 28 12:11:23 2010
@@ -44,7 +44,7 @@
<property key="AssetMaintInvalidPartProductIdError">
<value xml:lang="en">"Part Id ${productId} provided is invalid please check and try again"</value>
<value xml:lang="fr">"La réf. de piéce ${productId} fournie n'est pas valable, SVP recommencez"</value>
- <value xml:lang="it">"Il Codice Parte ${productId} fornito non è valido per favore controllare e provare nuovamente"</value>
+ <value xml:lang="it">"Il Codice parte ${productId} fornito non è valido. Per favore controllare e riprovare"</value>
<value xml:lang="th">รหัสสà¹à¸§à¸ ${productId} à¹à¸à¹à¹à¸¡à¹à¹à¸à¹ à¸à¸£à¸¸à¸à¸²à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸¥à¸°à¸¥à¸à¸à¸à¸µà¸à¸à¸£à¸±à¹à¸</value>
<value xml:lang="zh">"æä¾çé¶é¨ä»¶æ è¯${productId}æ æï¼è¯·æ£æ¥éè¯"</value>
</property>
@@ -58,7 +58,7 @@
<property key="AssetMaintLowPartInventoryError">
<value xml:lang="en">"Available Inventory level for ${productId} is ${quantity}"</value>
<value xml:lang="fr">"Le niveau de stock disponible pour ${productId} est ${quantity"</value>
- <value xml:lang="it">"Livello inventario disponibile per ${productId} è ${quantity}"</value>
+ <value xml:lang="it">"La quantità disponibile a magazzino per ${productId} è ${quantity}"</value>
<value xml:lang="th">รà¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸à¸à¸à¸ ${productId} à¸à¸·à¸ ${quantity}</value>
<value xml:lang="zh">"${productId}çææçåºå级å«æ¯${quantity}"</value>
</property>
@@ -85,27 +85,27 @@
<property key="AssetMaintProductMaint">
<value xml:lang="en">Product Maint</value>
<value xml:lang="fr">Maintenance</value>
- <value xml:lang="it">Manutenzione prodotto</value>
+ <value xml:lang="it">Manutenzione</value>
<value xml:lang="zh">产åç»´æ¤</value>
</property>
<property key="AssetMaintViewPermissionError">
<value xml:lang="en">View Permission Error</value>
<value xml:lang="fr">Afficher l'erreur d'autorisation</value>
- <value xml:lang="it">Mostra errore permesso</value>
+ <value xml:lang="it">Mostra errore di autorizzazione</value>
<value xml:lang="th">à¹à¸ªà¸à¸à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">æµè§æéé误</value>
</property>
<property key="PageTitleAddItemIssuance">
<value xml:lang="en">Add Item Issuance</value>
<value xml:lang="fr">Ajouter une émission d'article</value>
- <value xml:lang="it">Aggiungi riga prelievo</value>
+ <value xml:lang="it">Aggiungi prelievo articolo</value>
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸µà¹à¸à¸à¸à¸¡à¸²</value>
<value xml:lang="zh">æ·»å 交ä»æç»</value>
</property>
<property key="PageTitleChildWorkEfforts">
<value xml:lang="en">Task Breakdown</value>
<value xml:lang="fr">Décomposition de tâche</value>
- <value xml:lang="it">Compito breakdown</value>
+ <value xml:lang="it">Scoposizione compito</value>
<value xml:lang="th">à¸à¸²à¸à¸«à¸¢à¸¸à¸</value>
<value xml:lang="zh">ä»»å¡å解</value>
</property>
@@ -127,7 +127,7 @@
<property key="PageTitleListItemIssuance">
<value xml:lang="en">Parts List</value>
<value xml:lang="fr">Liste des pièces</value>
- <value xml:lang="it">Lista soggetti</value>
+ <value xml:lang="it">Lista parti</value>
<value xml:lang="th">สà¹à¸§à¸à¸«à¸à¸¶à¹à¸à¸à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£</value>
<value xml:lang="zh">é¶é¨ä»¶å表</value>
</property>
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1024561
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1028265
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1024561
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1028265
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1024561
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1028265
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1024561
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1028265
Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Oct 28 12:11:23 2010
@@ -1023,9 +1023,11 @@
</property>
<property key="ProjectMgrActualCompletionDateAbbr">
<value xml:lang="en">Act.Compl.</value>
+ <value xml:lang="fr">Date fin réelle</value>
</property>
<property key="ProjectMgrEstimatedCompletionDateAbbr">
<value xml:lang="en">Est.Compl.</value>
+ <value xml:lang="fr">Date fin est.</value>
</property>
<property key="ProjectMgrFilterOn">
<value xml:lang="de">Filter aktivieren</value>
@@ -1354,7 +1356,7 @@
<property key="ProjectMgrProjectSummary">
<value xml:lang="de">Projektzusammenfassung</value>
<value xml:lang="en">Project Summary</value>
- <value xml:lang="fr">Résumé des projets</value>
+ <value xml:lang="fr">Résumé du projet</value>
<value xml:lang="it">Sommario progetto</value>
<value xml:lang="nl">Samenvatting</value>
<value xml:lang="th">สรุà¸à¹à¸à¸£à¹à¸à¸</value>
Modified: ofbiz/branches/jquery/themes/multiflex/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/includes/header.ftl?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/multiflex/includes/header.ftl (original)
+++ ofbiz/branches/jquery/themes/multiflex/includes/header.ftl Thu Oct 28 12:11:23 2010
@@ -107,7 +107,7 @@ under the License.
<#if userLogin?has_content && userLogin.userLoginId != "anonymous">
<!-- Navigation item -->
<ul>
- <li><a href="#">Utente<!--[if IE 7]><!--></a><!--<![endif]-->
+ <li><a href="#">${uiLabelMap.EcommerceMyAccount}<!--[if IE 7]><!--></a><!--<![endif]-->
<!--[if lte IE 6]><table><tr><td><![endif]-->
<ul>
<li id="header-bar-viewprofile"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li>
Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Thu Oct 28 12:11:23 2010
@@ -1107,7 +1107,7 @@ overflow:hidden;
background: url(../images/appbar.png) no-repeat right 0px;
}
#app-navigation {
-background: url(../images/appbar.png) no-repeat right -90px;
+background: url(../images/appbar.png) no-repeat right -60px;
}
.menu_selected #app-navigation {
background: url(../images/appbar.png) no-repeat right -30px;
@@ -1336,13 +1336,62 @@ margin:0;
/* login screenlet decorator */
.login-screenlet {
-min-width: 25em;
-width: 25%;
+width: 400px;
+margin: 100px auto 300px;
}
.login-screenlet .screenlet-title-bar {
text-align: center;
}
+
+.login-screenlet form {
+padding: 20px;
+}
+
+.login-screenlet .screenlet-body {
+background-image:url(../images/login_bkgd.jpg);
+border: none;
+font-size:12px;
+}
+
+/***********************************************
+ajax auto complete
+***********************************************/
+div.autocomplete {
+ position:absolute;
+ width:auto !important;
+/* min-width:154px; */
+ background-color:#f8f8f8;
+ border:1px solid #999999;
+ margin:0;
+ padding:0;
+}
+div.autocomplete ul {
+ list-style-type:none;
+ margin:0;
+ padding:0;
+}
+div.autocomplete ul li.selected {
+ background-color: #ffb;
+}
+div.autocomplete ul li {
+ list-style-type:none;
+ display:block;
+ float: none;
+ margin:0;
+ padding:2px;
+ /*height:32px;*/
+ cursor:pointer;
+}
+
+.indicator img {
+ background: url(/images/ajax-loader.gif) no-repeat 0 0;
+ display: block;
+ margin:3px 10px 0px 34px;
+ width:16px;
+ height:16px;
+ border: none;
+}
/* ======================================================= */
/* ===== Basic Navigation (Vertical Menu) Style ========== */
/* ======================================================= */
@@ -1417,6 +1466,15 @@ padding:6px 10px 6px 30px;
background: url(../images/ptrn_hot_create.gif) no-repeat;
}
+.button-bar ul a.delete,.button-bar a.delete {
+background: url(../images/ptrn_delete.jpg) no-repeat;
+padding:6px 10px 6px 30px;
+}
+
+.button-bar ul a.delete:hover,.button-bar a.delete:hover {
+background: url(../images/ptrn_hot_delete.jpg) no-repeat;
+}
+
.button-bar ul a.refresh,.button-bar a.refresh {
background: url(../images/ptrn_refresh.png) no-repeat;
padding:6px 10px 6px 30px;