svn commit: r1348206 - in /ofbiz/branches/20120329_portl
Locked
 
|
Author: erwan
Date: Fri Jun 8 19:40:53 2012 New Revision: 1348206 URL: http://svn.apache.org/viewvc?rev=1348206&view=rev Log: misc corrections in portletwidget branch Added: ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml (with props) Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml?rev=1348206&r1=1348205&r2=1348206&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommonScreens.xml Fri Jun 8 19:40:53 2012 @@ -146,28 +146,6 @@ under the License. </section> </screen> <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet --> - <screen name="portletUiLabelDecorator"> - <section><!-- Decorator use by portlet define in their preference label --> - <actions> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <decorator-section-include name="body"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="uiLabelDecorator"><!-- Main decorator --> <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)--> <actions> Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml?rev=1348206&r1=1348205&r2=1348206&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml Fri Jun 8 19:40:53 2012 @@ -159,7 +159,7 @@ under the License. </form> <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson"> - <field name="personalImage" use-when="partyContentId!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}" style="cssImgStandard"/></field> + <field name="personalImage" use-when="personalImage!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}" style="cssImgStandard"/></field> <field name="partyId"><display/></field> <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field> <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field> Modified: ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml?rev=1348206&r1=1348205&r2=1348206&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml Fri Jun 8 19:40:53 2012 @@ -11463,7 +11463,7 @@ <value xml:lang="en">Show Add, Update, Delete button (or icon) in screenlet bar</value> <value xml:lang="fr">Afficher les bouttons (ou l'icônes) de gestion (ajout, modifier, supprimer</value> </property> - <property key="FormFieldTitle_showMenu"> + <property key="FormFieldTitle_showScreenletMenu"> <value xml:lang="en">Display screenlet menu (Y/N)</value> <value xml:lang="fr">Afficher le menu de la portlet (Y/N)</value> </property> @@ -13040,6 +13040,17 @@ <value xml:lang="zh">ä¼å</value> <value xml:lang="zh_TW">æå¡</value> </property> + <property key="IconsTooltips_Pause"> + <value xml:lang="de">Pause</value> + <value xml:lang="en">Pause</value> + <value xml:lang="fr">Pause</value> + <value xml:lang="it">Pausa</value> + <value xml:lang="pt">Pausar</value> + <value xml:lang="ro">Pausa</value> + <value xml:lang="th">หยุà¸</value> + <value xml:lang="zh">æ件é´æå</value> + <value xml:lang="zh_TW">æ件éæ«å</value> + </property> <property key="IconsTooltips_Payment"><!-- currently copy from AccountingPayment but will change to more detail --> <value xml:lang="ar">تسدÙد</value> <value xml:lang="de">Bezahlung</value> Added: ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml?rev=1348206&view=auto ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml (added) +++ ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml Fri Jun 8 19:40:53 2012 @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <property key="tooltip_mgmtPageId"> + <value xml:lang="en">Used for recap link</value> + <value xml:lang="fr">Utilisé dans le lien vers la page de management</value> + </property> + <property key="tooltip_newPageId"> + <value xml:lang="en">Used for new link</value> + <value xml:lang="fr">Utilisé dans le lien vers la page de création</value> + </property> + <property key="tooltip_recapPageId"> + <value xml:lang="en">Used for mgmt link</value> + <value xml:lang="fr">Utilisé dans le lien voir toutes les portlets</value> + </property> + <property key="tooltip_showMenu"> + <value xml:lang="en">Used to display menu</value> + <value xml:lang="fr">Utilisé pour afficher le menu</value> + </property> +</resource> Propchange: ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/branches/20120329_portletWidget/framework/common/config/PortalAdminUiLabels.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml?rev=1348206&r1=1348205&r2=1348206&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml Fri Jun 8 19:40:53 2012 @@ -65,7 +65,7 @@ <value xml:lang="de">Benutzeranmeldung zur Sicherheitsgruppe hinzufügen</value> <value xml:lang="en">Add User Login to Security Group</value> <value xml:lang="es">Añadir usuario a grupo de seguridad</value> - <value xml:lang="fr">Ajouter un identifiant de connexion à ce groupe de sécurité</value> + <value xml:lang="fr">Ajouter un identifiant de connexion à un groupe de sécurité</value> <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ मà¥à¤ पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value> <value xml:lang="it">Aggiungi utente al gruppo sicurezza</value> <value xml:lang="nl">Loginnaam gebruiker aan beveiligingsgroep toevoegen</value> Modified: ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties?rev=1348206&r1=1348205&r2=1348206&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties (original) +++ ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties Fri Jun 8 19:40:53 2012 @@ -75,7 +75,7 @@ HideHistory=/images/icons/famfamfam/time History=/images/icons/famfamfam/time.png Items=/images/icons/famfamfam/text_list_bullets.png Overview=/images/icons/famfamfam/application_form_magnify.png -Pause==/images/icons/famfamfam/control_pause_blue.png +Pause=/images/icons/famfamfam/control_pause_blue.png Payment=/images/icons/famfamfam/creditcards.png PDF=/images/icons/famfamfam/page_white_acrobat.png Phone=/images/icons/famfamfam/phone.png Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml?rev=1348206&r1=1348205&r2=1348206&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml Fri Jun 8 19:40:53 2012 @@ -192,7 +192,7 @@ under the License. <section> <actions> <entity-one entity-name="PortalPortlet" value-field="portalPortlet"/> - <property-map map-name="uiLabelMap" resource="PortalAdminUiLabels.xml"/><!--#Bam# portletExample --> + <property-map map-name="uiLabelMap" resource="PortalAdminUiLabels"/><!--#Bam# portletExample --> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |