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 2008/12/29 23:18:09 UTC
svn commit: r730004 - in /ofbiz/trunk: framework/common/config/
framework/common/webcommon/portal/ framework/common/widget/
specialpurpose/myportal/templates/
Author: jleroux
Date: Mon Dec 29 14:18:08 2008
New Revision: 730004
URL: http://svn.apache.org/viewvc?rev=730004&view=rev
Log:
A A patch from Bruno Busco "The example Login Portlet attribute editing form does not show actual attribute values" '(https://issues.apache.org/jira/browse/OFBIZ-2098) - OFBIZ-2098
+ some other l10n and French i18n
Modified:
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/common/webcommon/portal/portalPage.ftl
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/framework/common/widget/PortletEditForms.xml
ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=730004&r1=730003&r2=730004&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Dec 29 14:18:08 2008
@@ -1828,6 +1828,11 @@
<value xml:lang="zh">ç¼è¾</value>
<value xml:lang="zh_CN">ç¼è¾</value>
</property>
+ <property key="CommonEditPortletAttributes">
+ <value xml:lang="en">Edit Attributes for Portlet</value>
+ <value xml:lang="fr">Modifier les attributs du portlet </value>
+ <value xml:lang="it">Modifica attributi portlet</value>
+ </property>
<property key="CommonElementsFound">
<value xml:lang="ar">عÙاصر Ùجدت</value>
<value xml:lang="de">Gefundene Elemente</value>
@@ -3648,32 +3653,32 @@
</property>
<property key="CommonMovePortletBottom">
<value xml:lang="en">Move Portlet at the Bottom</value>
- <value xml:lang="fr">Déplacer le porlet tout en bas</value>
+ <value xml:lang="fr">Déplacer le portlet tout en bas</value>
<value xml:lang="it">Sposta il portlet in fondo</value>
</property>
<property key="CommonMovePortletDown">
<value xml:lang="en">Move Portlet Down</value>
- <value xml:lang="fr">Déplacer le porlet en bas</value>
+ <value xml:lang="fr">Déplacer le portlet en bas</value>
<value xml:lang="it">Sposta il portlet in basso</value>
</property>
<property key="CommonMovePortletLeft">
<value xml:lang="en">Move Portlet Left</value>
- <value xml:lang="fr">Déplacer le porlet à gauche</value>
+ <value xml:lang="fr">Déplacer le portlet à gauche</value>
<value xml:lang="it">Sposta il portlet a sinistra</value>
</property>
<property key="CommonMovePortletRight">
<value xml:lang="en">Move Portlet Right</value>
- <value xml:lang="fr">Déplacer le porlet à droite</value>
+ <value xml:lang="fr">Déplacer le portlet à droite</value>
<value xml:lang="it">Sposta il portlet a destra</value>
</property>
<property key="CommonMovePortletTop">
<value xml:lang="en">Move Portlet at the Top</value>
- <value xml:lang="fr">Déplacer le porlet tout en haut</value>
+ <value xml:lang="fr">Déplacer le portlet tout en haut</value>
<value xml:lang="it">Sposta il portlet in cima</value>
</property>
<property key="CommonMovePortletUp">
<value xml:lang="en">Move Portlet Up</value>
- <value xml:lang="fr">Déplacer le porlet en haut</value>
+ <value xml:lang="fr">Déplacer le portlet en haut</value>
<value xml:lang="it">Sposta il portlet in alto</value>
</property>
<property key="CommonMoveToPortalPage">
@@ -5034,6 +5039,7 @@
</property>
<property key="CommonRemovePortlet">
<value xml:lang="en">Remove Portlet</value>
+ <value xml:lang="fr">Supprimer le portlet</value>
<value xml:lang="it">Rimuovi il portlet</value>
</property>
<property key="CommonReports">
Modified: ofbiz/trunk/framework/common/webcommon/portal/portalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/portalPage.ftl?rev=730004&r1=730003&r2=730004&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/portalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/portalPage.ftl Mon Dec 29 14:18:08 2008
@@ -32,7 +32,7 @@
<#if configurePortalPage?has_content>
<tr>
<#list portalPageColumnList?if_exists as portalPageColumn>
- <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>">
+ <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> ${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
<ul>
<li id="delete-column">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
@@ -65,7 +65,7 @@
</#if>
<tr>
<#list portalPageColumnList?if_exists as portalPageColumn>
- <td style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>">
+ <td style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> ${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
<#assign firstInColumn = true/>
<#list portalPagePortletViewList as portlet>
<#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0) || (portlet.columnSeqId?if_exists == portalPageColumn.columnSeqId)>
@@ -80,7 +80,7 @@
<li class="remove"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonRemovePortlet}"> </a></li>
<#if (portlet.editFormName?has_content && portlet.editFormLocation?has_content)>
- <li class="edit"><a href="<@o...@ofbizUrl>" title="edit"> </a></li>
+ <li class="edit"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonEditPortletAttributes}"> </a></li>
</#if>
<#if portlet_has_next> <#-- TODO: this doesn't take into account that later items in the list might be in a different column -->
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=730004&r1=730003&r2=730004&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Mon Dec 29 14:18:08 2008
@@ -97,13 +97,14 @@
<screen name="EditPortlet">
<section>
<actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap"/>
<set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/>
<entity-one entity-name="PortalPortlet" value-name="portalPortlet"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="h2">Edit Attributes for Portlet: ${portalPortlet.portletName}</label>
+ <label style="h2">${uiLabelMap.CommonEditPortletAttributes}: ${portalPortlet.portletName}</label>
<include-form name="${portalPortlet.editFormName}" location="${portalPortlet.editFormLocation}"/>
<!-- <include-screen name="${portalPortlet.screenName}" location="${portalPortlet.screenLocation}"/> -->
</decorator-section>
Modified: ofbiz/trunk/framework/common/widget/PortletEditForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortletEditForms.xml?rev=730004&r1=730003&r2=730004&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortletEditForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortletEditForms.xml Mon Dec 29 14:18:08 2008
@@ -37,7 +37,7 @@
</form>
<form name="LoginPortletEdit" extends="CommonPortletEdit">
- <field name="ItemsToShow">
+ <field name="ItemsToShow" entry-name="attributeMap.ItemsToShow">
<drop-down allow-empty="false">
<option key="5"/>
<option key="15"/>
@@ -48,8 +48,8 @@
</drop-down>
</field>
- <field name="SpecificTitle">
- <display/>
+ <field name="SpecificTitle" entry-name="attributeMap.SpecificTitle">
+ <text/>
</field>
</form>
Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=730004&r1=730003&r2=730004&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Mon Dec 29 14:18:08 2008
@@ -38,8 +38,8 @@
</#if>
<li class="opposed"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
<#--li class="opposed"><a href="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" target="_blank">${uiLabelMap.CommonHelp}</a></li>-->
- <li class="opposed"><a href="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" url-mode="plain" target-window="new">Help</a></li>
- <li class="opposed"><a href="<@o...@ofbizUrl>">preferences</a></li>
+ <li class="opposed"><a href="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" url-mode="plain" target-window="new">${uiLabelMap.CommonHelp}</a></li>
+ <li class="opposed"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li>
<#else>
<li class="opposed"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>