Author: erwan
Date: Sun May 20 08:54:29 2012
New Revision: 1340645
URL: http://svn.apache.org/viewvc?rev=1340645&view=rev
Log:
patches were wrongly applied
Modified:
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletTypeScreens.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml
Modified:
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml?rev=1340645&r1=1340644&r2=1340645&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/framework/common/config/CommonPortalEntityLabels.xml
Sun May 20 08:54:29 2012
@@ -134,6 +134,127 @@
<value xml:lang="fr">idem component, il représente un groupe de
subComponent (par ex : pour regrouper les fichiers dans un sous répertoire)
(optionnel)</value>
</property>
<!--#Eam# portletWidget -->
+ <!--#Bam# icons-purpose -->
+ <property key="PortalPage.portalPageName.IconsList">
+ <value xml:lang="en">List all icons usable in portlets</value>
+ <value xml:lang="fr">Liste des icônes utilisables dans les
portlets</value>
+ </property>
+ <!--#Eam# icons-purpose -->
+
+ <!--#Bam# portletExample -->
+ <property key="PortalPage.portalPageName.ExampleFeatureNew">
+ <value xml:lang="en">Example Features Creation</value>
+ <value xml:lang="fr">Créer des caractéristiques</value>
+ </property>
+ <property key="PortalPage.portalPageName.ExampleRecap">
+ <value xml:lang="en">One example (RecapPage)</value>
+ <value xml:lang="fr">Un exemple (RecapPage)</value>
+ </property>
+ <property key="PortalPage.portalPageName.ExampleMgmt">
+ <value xml:lang="en">Examples management (MgmtPage)</value>
+ <value xml:lang="fr">Gestion des exemples (MgmtPage)</value>
+ </property>
+ <property key="PortalPage.portalPageName.ExampleNew">
+ <value xml:lang="en">Create a new example (NewPage)</value>
+ <value xml:lang="fr">Créer un nouvel exemple (NewPage)</value>
+ </property>
+ <property key="PortalPortlet.description.CreateExample">
+ <value xml:lang="en">portlet (screenlet type) to create Example and
associated entities</value>
+ <value xml:lang="fr">portlet (type Screenlet) de création d'un
exemple et ses entités secondaires</value>
+ </property>
+ <property key="PortalPortlet.description.ExampleDetailsMenu">
+ <value xml:lang="en">Example summary and menu to see all details
portlet in the ExampleDetail container</value>
+ <value xml:lang="fr">portlet(type Screenlet) de résumé et menus
liés à un exemple, et utilisant une portlet de contener de détails (ici
ExampleDetail)</value>
+ </property>
+ <property key="PortalPortlet.description.ExampleDetail">
+ <value xml:lang="en">Use this portlet (Empty type) to say where detail
portlet call from a menu will be show</value>
+ <value xml:lang="fr">portlet (type Empty) servant de contener aux
portlets de détails d'un exemple (commandé par le menu de la portlet
ExampleDetailsMenu)</value>
+ </property>
+ <property key="PortalPortlet.description.ExampleFeatureAppls">
+ <value xml:lang="en">List all ExampleFeatureAppls for one example,
sub-portlet simple (Screenlet type, not list, to be able to add an external
menu)</value>
+ <value xml:lang="fr">portlet listant les associations de
caractéristiques d'exemple (type Screenlet, bien qu'utilisant une liste, pour
pouvoir ajouter un menu externe)</value>
+ </property>
+ <property key="PortalPortlet.description.ExampleItems">
+ <value xml:lang="en">portlet (screenletList type) to list and manage
example items</value>
+ <value xml:lang="fr">portlet (type ScreenletList) de gestion des
lignes d'un exemple (affiche la liste et le menu)</value>
+ </property>
+ <property key="PortalPortlet.description.ExampleStatus">
+ <value xml:lang="en">List all ExampleStatus for one example (portlet
which use portletType and showPortlet)</value>
+ <value xml:lang="fr">Liste tous les (évolution de) statuts de
l'exemple (portlet utilisant un modéle de portlet et showPortlet)</value>
+ </property>
+ <property key="PortalPortlet.description.FindExample">
+ <value xml:lang="en">portlet to define search criteria for Example
list</value>
+ <value xml:lang="fr">portlet (type Screenlet) de critères de
recherche pour la liste des exemples</value>
+ </property>
+ <property key="PortalPortlet.description.FindExampleFeature">
+ <value xml:lang="en">portlet to define search criteria for
ExampleFeature list</value>
+ <value xml:lang="fr">portlet (type Screenlet) de critères de
recherche pour la liste des caractéristiques d'exemple</value>
+ </property>
+ <property key="PortalPortlet.description.ListExample">
+ <value xml:lang="en">portlet to list example depending on search
criteria, this portlet is call by FindExample</value>
+ <value xml:lang="fr">portlet (type ScreenletList) listant des exemples
selon les critères de recherche fournis par une portlet de recherche (ici
FindExample)</value>
+ </property>
+ <property key="PortalPortlet.description.ListExampleFeature">
+ <value xml:lang="en">portlet to list example features depending on
search criteria</value>
+ <value xml:lang="fr">portlet (type ScreenletList) listant des
caractéristique d'exemples selon les critères de recherche fournis par une
portlet de recherche (ici FindExampleFeature)</value>
+ </property>
+ <property key="PortalPortlet.description.SelectExample">
+ <value xml:lang="en">portlet to select example id for overview
page</value>
+ <value xml:lang="fr">portlet (type Screenlet) de sélection d'une
entité pour une page de visualisation</value>
+ </property>
+ <property key="PortalPortlet.description.ShowExample">
+ <value xml:lang="en">portlet (Screenlet type) to display/edit main
entity record (here, example)</value>
+ <value xml:lang="fr">portlet (type Screenlet) de
visualisation/modification d'une entité majeure (ici, exemple)</value>
+ </property>
+ <property key="PortalPortlet.portletName.CreateExample">
+ <value xml:lang="en">Create Example Form</value>
+ <value xml:lang="fr">Créer un exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.ExampleDetailsMenu">
+ <value xml:lang="en">Example summary and details menu
(DetailsMenu)</value>
+ <value xml:lang="fr">Résumé et menus associés pour un exemple
(DetailsMenu)</value>
+ </property>
+ <property key="PortalPortlet.portletName.ExampleDetail">
+ <value xml:lang="en">Container to show Example portlet detail</value>
+ <value xml:lang="fr">Contener utilisé pour afficher des portlets de
détails pour un exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.ExampleFeatureAppls">
+ <value xml:lang="en">Example Feature Application</value>
+ <value xml:lang="fr">Association de caractéristiques à un
exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.ExampleItems">
+ <value xml:lang="en">List and manage exampleItems</value>
+ <value xml:lang="fr">Listes des lignes d'exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.ExampleStatus">
+ <value xml:lang="en">List ExampleStatus</value>
+ <value xml:lang="fr">Liste des statuts de l'exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.FindExample">
+ <value xml:lang="en">Find Example</value>
+ <value xml:lang="fr">Rechercher un exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.FindExampleFeature">
+ <value xml:lang="en">Find Example Features</value>
+ <value xml:lang="fr">Rechercher des caractéristiques d'exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.ListExample">
+ <value xml:lang="en">List Examples</value>
+ <value xml:lang="fr">Liste des exemples</value>
+ </property>
+ <property key="PortalPortlet.portletName.ListExampleFeature">
+ <value xml:lang="en">List Example Features</value>
+ <value xml:lang="fr">Liste les caractéristiques d'exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.SelectExample">
+ <value xml:lang="en">Select one Example</value>
+ <value xml:lang="fr">Sélectionner un exemple</value>
+ </property>
+ <property key="PortalPortlet.portletName.ShowExample">
+ <value xml:lang="en">Display Example (all fields)</value>
+ <value xml:lang="fr">Montrer un exemple (tous les champs)</value>
+ </property>
+ <!--#Eam# portletExample -->
<property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE">
<value xml:lang="en">Main</value>
<value xml:lang="es">Principal</value>
@@ -191,4 +312,10 @@
<value xml:lang="zh_CN">ä»å¨è®¾æ½</value>
<value xml:lang="zh_TW">å ´æ</value>
</property>
+ <!--#Bam# icons-purpose -->
+ <property key="PortalPortlet.portletName.IconsList">
+ <value xml:lang="en">List all icons usable in portlets</value>
+ <value xml:lang="fr">Liste des icônes utilisables dans les
portlets</value>
+ </property>
+ <!--#Eam# icons-purpose -->
</resource>
\ No newline at end of file
Modified:
ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletTypeScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletTypeScreens.xml?rev=1340645&r1=1340644&r2=1340645&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletTypeScreens.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletTypeScreens.xml
Sun May 20 08:54:29 2012
@@ -211,216 +211,3 @@ under the License.
</section>
</screen>
</screens>
-<?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.
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
-
-<!-- In this file there are one screen per PortletType, and screen Name is
same as portletTypeId (enumCode) -->
-
-
- <screen name="portletUiLabelDecorator">
- <section>
- <widgets>
- <decorator-screen name="portletUiLabelDecorator"
location="${uiLabelLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <include-screen name="${screenName}"
location="${screenLocation}"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="Screenlet">
- <section>
- <actions>
- <set field="initiallyCollapsed" from-field="initiallyCollapsed"
default-value="false"/>
- <set field="screenletType" value="ScreenletWithMenu"/>
- </actions>
- <widgets>
-<!-- <label text="A=${uiLabelMap.${titleLabel}} B=${menuName}
C=${menuLocation} D=${divIdArea} E=${screenName} F=${screenLocation}" />-->
-<!-- <label text="portalPageId=${portalPageId}
portalPortletId=${portalPortletId} portletSeqId=${portletSeqId}" />-->
- <include-screen name="testScriptName"/>
- </widgets>
- </section>
- </screen>
- <screen name="ScreenletList">
- <section>
- <actions>
- <set field="initiallyCollapsed" from-field="initiallyCollapsed"
default-value="false"/>
- <set field="screenletType" value="ScreenletListWithMenu"/>
- </actions>
- <widgets>
-<!-- <label text="A=${uiLabelMap.${titleLabel}} B=${menuName}
C=${menuLocation} D=${divIdArea} E=${screenName} F=${screenLocation}" />-->
-<!-- <label text="portalPageId=${portalPageId}
portalPortletId=${portalPortletId} portletSeqId=${portletSeqId}" />-->
- <include-screen name="testScriptName"/>
- </widgets>
- </section>
- </screen>
- <screen name="testScriptName">
- <section>
- <condition>
- <if-empty field="scriptName"/>
- </condition>
- <widgets>
- <include-screen name="testPk"/>
- </widgets>
- <fail-widgets>
- <!-- scriptName is defined so call it -->
- <section>
- <actions>
- <script location="${scriptName}"/>
- </actions>
- <widgets>
- <include-screen name="testPk"/>
- </widgets>
- </section>
- </fail-widgets>
- </section>
- </screen>
- <screen name="testPk">
- <section>
- <condition>
- <or>
- <if-empty field="pkIdName"/>
- <not><if-empty field="parameters.${pkIdName}"/></not>
- </or>
- </condition>
- <widgets>
- <include-screen name="${screenletType}"/>
- </widgets>
- </section>
- </screen>
- <screen name="ScreenletWithMenu">
- <section>
- <condition>
- <or>
- <if-empty field="menuLocation"/>
- <if-compare field="showScreenletMenu" operator="equals" value="N"/>
- </or>
- </condition>
- <widgets>
- <decorator-screen name="portletUiLabelDecorator"
location="${uiLabelLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <screenlet title="${uiLabelMap.${titleLabel}}
${parameters.idDescription}" collapsible="true" id="scrlt_${formName}"
initially-collapsed="${initiallyCollapsed}" navigation-form-name="${formName}">
- <include-screen name="FormOrScreen"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- <fail-widgets>
- <!-- menuLocation is defined so call it -->
- <section>
- <widgets>
- <decorator-screen name="portletUiLabelDecorator"
location="${uiLabelLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <screenlet title="${uiLabelMap.${titleLabel}}
${parameters.idDescription}" collapsible="true" id="scrlt_${formName}"
initially-collapsed="${initiallyCollapsed}" navigation-menu-name="${menuName}"
navigation-form-name="${formName}">
- <include-menu name="${menuName}"
location="${menuLocation}"/>
- <container id="${editAreaDivId}"/>
- <container id="${subAreaDivId}">
- <include-screen name="FormOrScreen"/>
- </container>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </fail-widgets>
- </section>
- </screen>
- <screen name="ScreenletListWithMenu">
- <section>
- <condition>
- <or>
- <if-empty field="menuLocation"/>
- <if-compare field="showScreenletMenu" operator="equals" value="N"/>
- </or>
- </condition>
- <widgets>
- <decorator-screen name="portletUiLabelDecorator"
location="${uiLabelLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <screenlet title="${uiLabelMap.${titleLabel}}
${parameters.idDescription}" collapsible="true" id="scrlt_${formName}"
initially-collapsed="${initiallyCollapsed}" save-collapsed="false"
- navigation-form-name="${formName}">
- <container id="${editAreaDivId}"/>
- <include-form name="${formName}" location="${formLocation}"/>
- <section>
- <condition>
- <not><if-empty field="screenLocation"/></not>
- </condition>
- <widgets>
- <include-screen name="${screenName}"
location="${screenLocation}"/>
- </widgets>
- </section>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- <fail-widgets>
- <!-- menuLocation is defined so call it -->
- <section>
- <widgets>
- <decorator-screen name="portletUiLabelDecorator"
location="${uiLabelLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
- <screenlet title="${uiLabelMap.${titleLabel}}
${parameters.idDescription}" collapsible="true" id="scrlt_${formName}"
initially-collapsed="${initiallyCollapsed}" save-collapsed="false"
- navigation-menu-name="${menuName}"
navigation-form-name="${formName}">
- <include-menu name="${menuName}"
location="${menuLocation}"/>
- <container id="${editAreaDivId}"/>
- <include-form name="${formName}"
location="${formLocation}"/>
- <section>
- <condition>
- <not><if-empty field="screenLocation"/></not>
- </condition>
- <widgets>
- <include-screen name="${screenName}"
location="${screenLocation}"/>
- </widgets>
- </section>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </fail-widgets>
- </section>
- </screen>
- <screen name="FormOrScreen">
- <section>
- <condition>
- <if-empty field="screenLocation"/>
- </condition>
- <widgets>
- <include-form name="${formName}" location="${formLocation}"/>
- </widgets>
- <fail-widgets>
- <include-screen name="${screenName}" location="${screenLocation}"/>
- </fail-widgets>
- </section>
- </screen>
- <screen name="Empty">
- <section>
- <widgets>
- </widgets>
- </section>
- </screen>
-</screens>
Modified:
ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml?rev=1340645&r1=1340644&r2=1340645&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml
Sun May 20 08:54:29 2012
@@ -32,6 +32,12 @@ under the License.
screenName="ExamplePortlet3"
screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet3Edit"
editFormLocation="component://example/widget/example/PortletEditForms.xml"/>
+ <PortalPortlet portalPortletId="IconsList" portletName="List all icons
usable in portlet with iconsPurpose and IconsTooltips_"
+ description="List all icons usable in portlet with iconsPurpose and
IconsTooltips_"
+ portletTypeId="Screenlet" component="example" subComponent="Example"
webapp="example"
+ uiLabelLocation="component://example/widget/CommonScreens.xml"/>
+ <PortletPortletCategory portalPortletId="IconsList"
portletCategoryId="EXAMPLE"/>
+
<PortletCategory portletCategoryId="EXAMPLE" description="Example
Portlet(s)"/>
<PortletPortletCategory portalPortletId="EXAMPLE_1"
portletCategoryId="EXAMPLE"/>
<PortletPortletCategory portalPortletId="EXAMPLE_2"
portletCategoryId="EXAMPLE"/>
