OFBiz › OFBiz - Commits

svn commit: r729415 - in /ofbiz/trunk: applications/content/config/ applications/content/widget/content/ applications/product/config/ applications/product/webapp/catalog/lookup/ applications/workeffort/webapp/workeffort/find/ applications/workeffort/wi...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r729415 - in /ofbiz/trunk: applications/content/config/ applications/content/widget/content/ applications/product/config/ applications/product/webapp/catalog/lookup/ applications/workeffort/webapp/workeffort/find/ applications/workeffort/wi...

Author: jleroux
Date: Thu Dec 25 03:10:48 2008
New Revision: 729415

URL: http://svn.apache.org/viewvc?rev=729415&view=rev
Log:
A slightly modified patch from Bruno Busco "Using collapsible fieldgroups to implement a "Advanced search" panel" '(https://issues.apache.org/jira/browse/OFBIZ-2071) - OFBIZ-2071
+ 2 better French labels in ContentUiLabels.xml

Modified:
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Dec 25 03:10:48 2008
@@ -348,7 +348,7 @@
<value xml:lang="de">Datenressource Konfiguration</value>
<value xml:lang="en">DataResource Setup</value>
<value xml:lang="es">AdministraciÃ³n de recurso de datos</value>
- <value xml:lang="fr">Installation d'une ressource de donnÃ©es</value>
+ <value xml:lang="fr">Configuration d'une ressource de donnÃ©es</value>
<value xml:lang="it">Configurazione Risorsa Dati</value>
<value xml:lang="ro">Configurare Resurse Date</value>
<value xml:lang="th">à¸à¸´à¸à¸à¸±à¹à¸à¸à¸µà¹à¸¡à¸²à¸à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
@@ -555,7 +555,7 @@
<property key="ContentNavigate">
<value xml:lang="de">Navigieren</value>
<value xml:lang="en">Navigate</value>
- <value xml:lang="fr">Diriger</value>
+ <value xml:lang="fr">Naviguer</value>
<value xml:lang="th">à¸«à¸²à¹à¸ªà¹à¸à¸à¸²à¸</value>
</property>
<property key="ContentOtherLayout">

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Thu Dec 25 03:10:48 2008
@@ -84,6 +84,34 @@
<form name="LookupDataResource" target="LookupDataResource" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="DataResource" default-field-type="find"/>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+
+ <sort-order>
+ <field-group>
+ <sort-field name="dataResourceId"/>
+ <sort-field name="dataResourceName"/>
+ </field-group>
+ <field-group title="${uiLabelMap.CommonAdvancedSearch}" collapsible="true" initially-collapsed="true">
+ <sort-field name="dataResourceTypeId"/>
+ <sort-field name="dataTemplateTypeId"/>
+ <sort-field name="dataCategoryId"/>
+ <sort-field name="dataSourceId"/>
+ <sort-field name="statusId"/>
+ <sort-field name="localeString"/>
+ <sort-field name="mimeTypeId"/>
+ <sort-field name="characterSetId"/>
+ <sort-field name="objectInfo"/>
+ <sort-field name="surveyId"/>
+ <sort-field name="surveyResponseId"/>
+ <sort-field name="relatedDetailId"/>
+ <sort-field name="isPublic"/>
+ <sort-field name="createdDate"/>
+ <sort-field name="createdByUserLogin"/>
+ <sort-field name="lastModifiedDate"/>
+ <sort-field name="lastModifiedByUserLogin"/>
+ </field-group>
+ </sort-order>
+
<field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListLookupDataResource" extends="ListDataResource" list-name="listIt" type="list" paginate-target="LookupDataResource"

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Dec 25 03:10:48 2008
@@ -7805,17 +7805,6 @@
<value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹</value>
<value xml:lang="zh">å°å</value>
</property>
- <property key="ProductAdvancedSearch">
- <value xml:lang="de">Erweiterte Suche</value>
- <value xml:lang="en">Advanced Search</value>
- <value xml:lang="es">BÃºsqueda Avanzada</value>
- <value xml:lang="fr">Recherche avancÃ©e</value>
- <value xml:lang="it">Ricerca Avanzata</value>
- <value xml:lang="ro">Cautare Avansata</value>
- <value xml:lang="ru">Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½ÑÐ¹ Ð¿Ð¾Ð¸ÑÐº</value>
- <value xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸´à¹à¸¡à¹à¸à¸´à¸¡</value>
- <value xml:lang="zh">é«çº§æç´¢</value>
- </property>
<property key="ProductAdvancedSearchIn">
<value xml:lang="de">Erweiterte Suche in</value>
<value xml:lang="en">Advanced Search in</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Thu Dec 25 03:10:48 2008
@@ -181,7 +181,7 @@
<sort-field name="productCategoryId"/>
<sort-field name="categoryName"/>
</field-group>
- <field-group title="${uiLabelMap.ProductAdvancedSearch}" collapsible="true" initially-collapsed="true">
+ <field-group title="${uiLabelMap.CommonAdvancedSearch}" collapsible="true" initially-collapsed="true">
<sort-field name="productCategoryTypeId"/>
<sort-field name="primaryParentCategoryId"/>
<sort-field name="description"/>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Thu Dec 25 03:10:48 2008
@@ -18,7 +18,7 @@
-->
<div class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.ProductAdvancedSearch}</h3>
+ <h3>${uiLabelMap.CommonAdvancedSearch}</h3>
</div>
<div class="screenlet-body">
<form name="advToKeyWordSearchForm" method="post" action="<@ofbizUrl>WorkEffortSearchResults</@ofbizUrl>" style="margin: 0;">
@@ -167,4 +167,4 @@
</table>
</form>
</div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Thu Dec 25 03:10:48 2008
@@ -192,7 +192,7 @@
<section>
<widgets>
<link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort?DONE_PAGE=${donePage}" style="buttontext"/>
- <link text="${uiLabelMap.ProductAdvancedSearch}" target="WorkEffortSearchOptions" style="buttontext"/>
+ <link text="${uiLabelMap.CommonAdvancedSearch}" target="WorkEffortSearchOptions" style="buttontext"/>
<include-form name="FindWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/>
</widgets>
</section>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=729415&r1=729414&r2=729415&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Dec 25 03:10:48 2008
@@ -291,6 +291,17 @@
<value xml:lang="zh">å°å</value>
<value xml:lang="zh_CN">å°å</value>
</property>
+ <property key="CommonAdvancedSearch">
+ <value xml:lang="de">Erweiterte Suche</value>
+ <value xml:lang="en">Advanced Search</value>
+ <value xml:lang="es">BÃºsqueda Avanzada</value>
+ <value xml:lang="fr">Recherche avancÃ©e</value>
+ <value xml:lang="it">Ricerca avanzata</value>
+ <value xml:lang="ro">Cautare Avansata</value>
+ <value xml:lang="ru">Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½ÑÐ¹ Ð¿Ð¾Ð¸ÑÐº</value>
+ <value xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸´à¹à¸¡à¹à¸à¸´à¸¡</value>
+ <value xml:lang="zh">é«çº§æç´¢</value>
+ </property>
<property key="CommonAll">
<value xml:lang="ar">Ø§ÙÙÙ</value>
<value xml:lang="cs">VÅ¡echny</value>
@@ -7651,6 +7662,7 @@
</property>
<property key="DefaultOrganizationPartyId">
<value xml:lang="en">Default Organization</value>
+ <value xml:lang="en">Organisation utilisÃ©e par dÃ©fault</value>
</property>
<property key="PageTitleAddDataSource">
<value xml:lang="ar">Ø¥Ø¶Ø§ÙØ© ÙØµØ¯Ø± Ø§ÙÙØ¹ÙÙÙØ§Øª Ø¬Ø¯ÙØ¯</value>