[OFBiz] SVN: r7911 - in trunk/applications/content: config entitydef webapp/content/data webapp/content/layout webapp/content/survey widget widget/content widget/data
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Fri Jun 30 17:10:01 CDT 2006
Author: jacopo
Date: 2006-06-30 17:09:23 -0500 (Fri, 30 Jun 2006)
New Revision: 7911
Modified:
trunk/applications/content/config/ContentUiLabels_it.properties
trunk/applications/content/entitydef/entitymodel.xml
trunk/applications/content/webapp/content/data/DataResourceForms.xml
trunk/applications/content/webapp/content/layout/EditLayoutHtml.ftl
trunk/applications/content/webapp/content/layout/EditLayoutImage.ftl
trunk/applications/content/webapp/content/layout/EditLayoutText.ftl
trunk/applications/content/webapp/content/layout/EditLayoutUrl.ftl
trunk/applications/content/webapp/content/layout/LookupListLayout.ftl
trunk/applications/content/webapp/content/layout/LookupSubContent.ftl
trunk/applications/content/webapp/content/layout/layout_menu.ftl
trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
trunk/applications/content/webapp/content/survey/SurveyForms.xml
trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
trunk/applications/content/widget/SurveyScreens.xml
trunk/applications/content/widget/content/ContentForms.xml
trunk/applications/content/widget/content/ContentMenus.xml
trunk/applications/content/widget/content/ContentScreens.xml
trunk/applications/content/widget/content/DataResourceForms.xml
trunk/applications/content/widget/content/DataResourceMenus.xml
trunk/applications/content/widget/content/DataResourceScreens.xml
trunk/applications/content/widget/data/DataResourceForms.xml
Log:
i18n patch for the content component from Marco Risaliti (Apache OFBIZ-25).
Modified: trunk/applications/content/config/ContentUiLabels_it.properties
===================================================================
--- trunk/applications/content/config/ContentUiLabels_it.properties 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/config/ContentUiLabels_it.properties 2006-06-30 22:09:23 UTC (rev 7911)
@@ -19,6 +19,10 @@
ContentCompanySubtitle=Part of the Open For Business Family of Open Source Software
ContentMain=Pagina Principale
+ContentAnswer=risposta
+ContentAnswers=risposte
+ContentAssociation=Associazione
+ContentAttribute=Attributi
ContentEditProductStore=Aggiorna Negozio
ContentWebSite=Sito Web
ContentWebSites=Siti Web
@@ -32,22 +36,32 @@
ContentDataResourceRole=Ruolo
ContentDataResourceText=Testo
ContentFileExt=Estensione File
+ContentGoToDataResource=Vai alla Risorsa Dati
+ContentMetadata=Metadati
ContentMetaDataPred=Predicato MetaData
ContentMimeType=Tipo Mime
ContentContent=Contenuto
ContentContentManagerApplication=Applicazione Gestione Contenuti
+ContentSubContent=Sotto-Contenuto
ContentSurvey=Sondaggio
ContentContentSetup=Configurazione Contenuto
ContentDataSetup=Configurazione Risorsa Dati
ContentForum=Forum
+ContentOtherLayout=Altri Layoutsche usano questo sotto-contenuto
ContentTemplate=Template
+ContentTemplates=Templates
ContentTypeAttr=Tipo Attributo
ContentCMS=CMS
ContentCompDoc=CompDoc
ContentPDF=Contenuto PDF
ContentFilePath=Percorso File
+ContentFile=File
+ContentHtml=Html
+ContentImage=Immagine
+ContentUrl=Url
ContentPaste=Incolla
ContentSubSites=SottoSiti
+ContentText=Testo
ContentIndex=Indicizza
ContentAssoc=Associazione Contenuto
ContentIndexEnteredIds=Inserire Codici da Indicizzare
@@ -63,8 +77,17 @@
ForumAddPurposeTo=Aggiungi funzione a
ForumAddThreadTo=Aggiungi nuovo thread a questo Forum
+PageTitleAddAssociation=Aggiungi una associazione
+PageTitleAddAttribute=Aggiungi un'attributo
PageTitleAddContent=Aggiungi Contenuto
PageTitleAddDataResource=Aggiungi Risorsa Dati
+PageTitleAddDataResourceText=Aggiungi Testo Risorsa Dati
+PageTitleAddDataResourceUpload=Aggiungi Caricamento Risorsa Dati
+PageTitleAddDataResourceUrl=Aggiungi Url Risorsa Dati
+PageTitleAddMetaData=Aggiungi Metadati
+PageTitleAddPurpose=Aggiungi una Funzione
+PageTitleAddRole=Aggiungi un Ruolo
+PageTitleEditAssociation=Aggiorna una associazione
PageTitleEditContent=Aggiorna Contenuto
PageTitleEditContentAssoc=Aggiorna Associazione Contenuto
PageTitleEditContentAssocPredicate=Aggiorna Associazione Contenuto Predicato
@@ -77,7 +100,15 @@
PageTitleEditContentType=Aggiorna Tipo Contenuto
PageTitleEditContentUserPermissions=Permessi
PageTitleEditDataResource=Aggiorna Risorsa Dati
+PageTitleEditDataResourceAttribute=Aggiorna Attributo Risorsa Dati
+PageTitleEditDataResourceProductFeatures=Aggiorna Caratteristiche Prodotto Risorsa Dati
+PageTitleEditDataResourceRole=Aggiorna Ruolo Risorsa Dati
+PageTitleEditDataResourceText=Aggiorna Testo Risorsa Dati
PageTitleEditDataResourceType=Aggiorna Tipo Risorsa Dati
+PageTitleEditDataResourceUpload=Aggiorna Caricamento Risorsa Dati
+PageTitleEditDataResourceUrl=Aggiorna Url Risorsa Dati
+PageTitleEditElectronicText=Aggiorna Testo Elettronico
+PageTitleEditHtmlText=Aggiorna Testo Html
PageTitleEditRootCompDoc=Aggiorna Radice Documento Composito
PageTitleCreateSurvey=Creare Sondaggio
PageTitleEditSurvey=Aggiorna Sondaggio
@@ -89,8 +120,12 @@
PageTitleFindDataResource=Ricerca Risorsa Dati
PageTitleFindContent=Ricerca Contenuto
PageTitleFindWebSite=Ricerca Sito Web
+PageTitleListAssociations=Lista associazioni
+PageTitleListDataResource=Lista Risorse Dati
+PageTitleListContent=Lista Contenuti
PageTitleListWebSite=Lista Siti Web
PageTitleLookupContent=Ricerca Contenuto
+PageTitleLookupDataResource=Ricerca Risorse Dati
PageTitleLookupSurvey=Ricerca Sondaggio
PageTitleLookupSurveyResponse=Ricerca Risposta Sondaggio
PageTitleFindForumGroup=Lista gruppo Forum
@@ -106,6 +141,7 @@
PageTitleFindSurveyResponse=Ricerca Risposte Sondaggio
PageTitleViewSurveyResponses=Mostra Risposte Sondaggio
PageTitleEditSurveyResponse=Aggiorna Risposta Sondaggio
+PageTitleUploadImageDataResource=Carica Immagine
PartyParties=Soggetti
PartyPartyId=Codice Soggetto
Modified: trunk/applications/content/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/content/entitydef/entitymodel.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/entitydef/entitymodel.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -73,7 +73,7 @@
</relation>
</entity>
<entity entity-name="CommContentAssocType"
- package-name="org.ofbiz.content.commevent"
+ package-name="org.ofbiz.content.commevent"
title="CommunicationEvent Content Association Type Entity">
<field name="commContentAssocTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -338,6 +338,7 @@
</entity>
<entity entity-name="ContentAssocType"
package-name="org.ofbiz.content.content"
+ default-resource-name="ContentEntityLabels"
title="Content Association Type Entity">
<field name="contentAssocTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -488,6 +489,7 @@
</entity>
<entity entity-name="ContentOperation"
package-name="org.ofbiz.content.content"
+ default-resource-name="ContentEntityLabels"
title="Content Operation Entity">
<field name="contentOperationId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -538,6 +540,7 @@
</entity>
<entity entity-name="ContentPurposeType"
package-name="org.ofbiz.content.content"
+ default-resource-name="ContentEntityLabels"
title="Content Purpose Type Entity">
<field name="contentPurposeTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -606,6 +609,7 @@
</entity>
<entity entity-name="ContentType"
package-name="org.ofbiz.content.content"
+ default-resource-name="ContentEntityLabels"
title="Content Type Entity">
<field name="contentTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
@@ -685,6 +689,7 @@
</entity>
<entity entity-name="DataCategory"
package-name="org.ofbiz.content.data"
+ default-resource-name="ContentEntityLabels"
title="Data Category Entity">
<field name="dataCategoryId" type="id-ne"></field>
<field name="parentCategoryId" type="id"></field>
@@ -873,6 +878,7 @@
</entity>
<entity entity-name="DataResourceType"
package-name="org.ofbiz.content.data"
+ default-resource-name="ContentEntityLabels"
title="Data Object Type Entity">
<field name="dataResourceTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
@@ -902,6 +908,7 @@
</entity>
<entity entity-name="DataTemplateType"
package-name="org.ofbiz.content.data"
+ default-resource-name="ContentEntityLabels"
title="Data Template Type Entity">
<field name="dataTemplateTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -940,6 +947,7 @@
</entity>
<entity entity-name="MetaDataPredicate"
package-name="org.ofbiz.content.data"
+ default-resource-name="ContentEntityLabels"
title="Data Meta-Data Predicate Entity">
<field name="metaDataPredicateId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -947,6 +955,7 @@
</entity>
<entity entity-name="MimeType"
package-name="org.ofbiz.content.data"
+ default-resource-name="ContentEntityLabels"
title="Mime Type Entity">
<field name="mimeTypeId" type="id-long-ne"></field>
<field name="description" type="description"></field>
@@ -1417,6 +1426,7 @@
</entity>
<entity entity-name="SurveyQuestionType"
package-name="org.ofbiz.content.survey"
+ default-resource-name="ContentEntityLabels"
title="Survey Question Type Entity">
<field name="surveyQuestionTypeId" type="id-ne"/>
<field name="description" type="description"/>
Modified: trunk/applications/content/webapp/content/data/DataResourceForms.xml
===================================================================
--- trunk/applications/content/webapp/content/data/DataResourceForms.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/data/DataResourceForms.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -239,9 +239,9 @@
<form name="ImageUpload" target="uploadImage" title="" type="upload"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="dataResourceId"><display/></field>
- <field name="objectInfo" title="Image File Name"><display description="${currentValue.objectInfo}"/></field>
+ <field name="objectInfo"><display description="${currentValue.objectInfo}"/></field>
<field name="imageData" entity-name="ImageDataResource"><file/></field>
- <field name="submitButton" title="Upload" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<!-- DataResourceAttribute forms -->
<form name="AddDataResourceAttribute"
Modified: trunk/applications/content/webapp/content/layout/EditLayoutHtml.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/EditLayoutHtml.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/EditLayoutHtml.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -1,3 +1,3 @@
${singleWrapper.renderFormString()}
-<p/><div class="head1">Other Layouts that use this subcontent</div>
+<p/><div class="head1">${uiLabelMap.ContentOtherLayout}</div>
${listWrapper.renderFormString()}
Modified: trunk/applications/content/webapp/content/layout/EditLayoutImage.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/EditLayoutImage.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/EditLayoutImage.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -9,5 +9,5 @@
<img src="<@ofbizUrl>img?imgId=${drDataResourceId}</@ofbizUrl>" />
-->
</#if>
-<p/><div class="head1">Other Layouts that use this subcontent</div>
+<p/><div class="head1">${uiLabelMap.ContentOtherLayout}</div>
${listWrapper.renderFormString()}
Modified: trunk/applications/content/webapp/content/layout/EditLayoutText.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/EditLayoutText.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/EditLayoutText.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -1,3 +1,3 @@
${singleWrapper.renderFormString()}
-<p/><div class="head1">Other Layouts that use this subcontent</div>
+<p/><div class="head1">${uiLabelMap.ContentOtherLayout}</div>
${listWrapper.renderFormString()}
Modified: trunk/applications/content/webapp/content/layout/EditLayoutUrl.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/EditLayoutUrl.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/EditLayoutUrl.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -1,3 +1,3 @@
${singleWrapper.renderFormString()}
-<p/><div class="head1">Other Layouts that use this subcontent</div>
+<p/><div class="head1">${uiLabelMap.ContentOtherLayout}</div>
${listWrapper.renderFormString()}
Modified: trunk/applications/content/webapp/content/layout/LookupListLayout.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/LookupListLayout.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/LookupListLayout.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -1,2 +1,2 @@
-<div class="head1">Templates</div>
+<div class="head1">${uiLabelMap.ContentTemplates}</div>
${listWrapper.renderFormString()}
Modified: trunk/applications/content/webapp/content/layout/LookupSubContent.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/LookupSubContent.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/LookupSubContent.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -24,7 +24,7 @@
*@since 3.0
-->
-<div class="head1">Find ${page.getProperty("entityName")}</div>
+<div class="head1">${uiLabelMap.CommonFind} ${page.getProperty("entityName")}</div>
<br/>
${mruWrapper.renderFormString()}
<br/>
Modified: trunk/applications/content/webapp/content/layout/layout_menu.ftl
===================================================================
--- trunk/applications/content/webapp/content/layout/layout_menu.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/layout/layout_menu.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -23,11 +23,11 @@
<a href="<@ofbizUrl>FindLayout</@ofbizUrl>" class="${selectedClassMap.FindLayout?default(unselectedClassName)}">${uiLabelMap.CommonFind}</a>
<a href="<@ofbizUrl>EditLayout</@ofbizUrl>" class="${layoutClass}">${uiLabelMap.ContentLayout}</a>
<!--
-<a href="<@ofbizUrl>EditLayoutContent</@ofbizUrl>" class="${selectedClassMap.EditLayoutContent?default(unselectedClassName)}">SubContent</a>
-<a href="<@ofbizUrl>EditLayoutText</@ofbizUrl>" class="${selectedClassMap.EditLayoutText?default(unselectedClassName)}">Text</a>
-<a href="<@ofbizUrl>EditLayoutHtml</@ofbizUrl>" class="${selectedClassMap.EditLayoutHtml?default(unselectedClassName)}">Html</a>
-<a href="<@ofbizUrl>EditLayoutImage</@ofbizUrl>" class="${selectedClassMap.EditLayoutImage?default(unselectedClassName)}">Image</a>
-<a href="<@ofbizUrl>EditLayoutUrl</@ofbizUrl>" class="${selectedClassMap.EditLayoutUrl?default(unselectedClassName)}">Url</a>
-<a href="<@ofbizUrl>EditLayoutFile</@ofbizUrl>" class="${selectedClassMap.EditLayoutFile?default(unselectedClassName)}">File</a>
+<a href="<@ofbizUrl>EditLayoutContent</@ofbizUrl>" class="${selectedClassMap.EditLayoutContent?default(unselectedClassName)}">${uiLabelMap.ContentSubContent}</a>
+<a href="<@ofbizUrl>EditLayoutText</@ofbizUrl>" class="${selectedClassMap.EditLayoutText?default(unselectedClassName)}">${uiLabelMap.ContentText}</a>
+<a href="<@ofbizUrl>EditLayoutHtml</@ofbizUrl>" class="${selectedClassMap.EditLayoutHtml?default(unselectedClassName)}">${uiLabelMap.ContentHtml}</a>
+<a href="<@ofbizUrl>EditLayoutImage</@ofbizUrl>" class="${selectedClassMap.EditLayoutImage?default(unselectedClassName)}">${uiLabelMap.ContentImage}</a>
+<a href="<@ofbizUrl>EditLayoutUrl</@ofbizUrl>" class="${selectedClassMap.EditLayoutUrl?default(unselectedClassName)}">${uiLabelMap.ContentUrl}</a>
+<a href="<@ofbizUrl>EditLayoutFile</@ofbizUrl>" class="${selectedClassMap.EditLayoutFile?default(unselectedClassName)}">${uiLabelMap.ContentFile}</a>
-->
</div>
Modified: trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
===================================================================
--- trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -60,7 +60,7 @@
<input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}">
<tr valign="middle">
<td><div class="tabletext">${surveyQuestionAndAppl.surveyQuestionId}</div></td>
- <td><div class="tabletext">${questionType.description}</div></td>
+ <td><div class="tabletext">${questionType.get("description",locale)}</div></td>
<td><div class="tabletext">${(questionCat.description)?if_exists}</div></td>
<td><div class="tabletext">${surveyQuestionAndAppl.description?if_exists}</div></td>
<td><input type="text" name="question" size="30" class="inputBox" value="${surveyQuestionAndAppl.question?if_exists?html}">
@@ -154,7 +154,7 @@
<tr valign="middle">
<td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${question.surveyQuestionId}&surveyQuestionCategoryId=${requestParameters.surveyQuestionCategoryId}#edit</@ofbizUrl>" class="buttontext">${question.surveyQuestionId}</a></td>
<td><div class="tabletext">${question.description?if_exists}</div></td>
- <td><div class="tabletext">${questionType.description}</div></td>
+ <td><div class="tabletext">${questionType.get("description",locale)}</div></td>
<td><div class="tabletext">${question.question?if_exists}</div></td>
<td>
<select class="selectBox" name="surveyPageId">
Modified: trunk/applications/content/webapp/content/survey/SurveyForms.xml
===================================================================
--- trunk/applications/content/webapp/content/survey/SurveyForms.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/survey/SurveyForms.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -185,7 +185,7 @@
</drop-down>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="CreateSurveyQuestion" type="single"
target="createSurveyQuestion" title="" default-map-name="surveyQuestion"
Modified: trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
===================================================================
--- trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl 2006-06-30 22:09:23 UTC (rev 7911)
@@ -42,9 +42,9 @@
<#-- standard questions -->
<td align='right' nowrap>
- <#assign answerString = "answers">
+ <#assign answerString = "${uiLabelMap.ContentAnswers}">
<#if (results._total?default(0) == 1)>
- <#assign answerString = "answer">
+ <#assign answerString = "${uiLabelMap.ContentAnswer}">
</#if>
<div class="tabletext">${question.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div>
<#if question.hint?has_content>
@@ -58,10 +58,10 @@
<#if question.surveyQuestionTypeId == "BOOLEAN">
<#assign selectedOption = (answer.booleanResponse)?default("Y")>
<div class="tabletext">
- <nobr>Y [${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]</nobr>
+ <nobr>${uiLabelMap.CommonY} [${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]</nobr>
</div>
<div class="tabletext">
- <nobr>N [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</nobr>
+ <nobr>${uiLabelMap.CommonN} [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</nobr>
</div>
<#elseif question.surveyQuestionTypeId == "OPTION">
<#assign options = question.getRelated("SurveyQuestionOption", sequenceSort)?if_exists>
Modified: trunk/applications/content/widget/SurveyScreens.xml
===================================================================
--- trunk/applications/content/widget/SurveyScreens.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/SurveyScreens.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -156,6 +156,7 @@
<screen name="EditSurveyQuestions">
<section>
<actions>
+
<set field="titleProperty" value="PageTitleEditSurveyQuestions"/>
<set field="tabButtonItem" value="SurveyQuestions"/>
<set field="labelTitleProperty" value="PageTitleEditSurveyQuestions"/>
Modified: trunk/applications/content/widget/content/ContentForms.xml
===================================================================
--- trunk/applications/content/widget/content/ContentForms.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/content/ContentForms.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -54,7 +54,7 @@
<field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field>
<field name="localeString">
<drop-down allow-empty="true">
- <entity-options entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"/>
+ <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"/>
</drop-down>
</field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -72,7 +72,7 @@
</actions>
<field name="contentId"><hidden/></field>
- <field name="contentName" title="Name [id]" widget-style="tabletext">
+ <field name="contentName" widget-style="tabletext">
<display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
<sub-hyperlink target="editContent?contentId=${contentId}" description="[${contentId}]" link-style="buttontext"/>
</display-entity>
@@ -134,7 +134,7 @@
</field>
<field name="dataResourceId">
<lookup target-form-name="LookupDataResource">
- <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="editDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+ <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="editDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/>
</lookup>
</field>
<field name="ownerContentId"><lookup target-form-name="LookupContent"/></field>
@@ -159,8 +159,8 @@
</entity-options>
</drop-down>
</field>
- <field name="createButton" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="updateButton" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="createButton" title="${uiLabelMap.CommonCreate}" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<!--form name="AddContent" target="createContent" title="" type="single"
@@ -227,7 +227,7 @@
<field name="contentIdTo" title="" widget-style="tabletext"><display/></field>
<field name="contentAssocTypeId" title="" widget-style="tabletext"><display/></field>
<field name="fromDate" widget-style="tabletext"><display/></field>
- <field name="updateButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="AddContentAssoc" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
@@ -247,7 +247,7 @@
<entity-options description="${description}" entity-name="MetaDataPredicate"/>
</drop-down>
</field>
- <field name="submitButton" title="Create" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
<field name="createdDate"><hidden/></field>
@@ -257,7 +257,7 @@
</form>
<form name="ListContentAssocFrom" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="tabletext"
- target="updateContentAssoc" title="Assoc From this Content" type="list">
+ target="updateContentAssoc" type="list">
<actions>
<entity-and entity-name="ContentAssoc" use-cache="true">
<field-map env-name="contentId" field-name="contentId" />
@@ -277,14 +277,14 @@
<field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field>
<field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Delete]" target="removeContentAssoc?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/>
+ <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeContentAssoc?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/>
</field>
<field name="thruDate"><date-time/></field>
- <field name="updateButton" widget-style="buttontext">
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
<submit button-type="text-link"/>
</field>
</form>
- <form name="ListContentAssocTo" target="EditContentAssoc" title="Assoc To this Content" type="list" extends="ListContentAssocFrom">
+ <form name="ListContentAssocTo" target="EditContentAssoc" type="list" extends="ListContentAssocFrom">
<actions>
<entity-and entity-name="ContentAssoc" use-cache="true">
<field-map env-name="contentId" field-name="contentIdTo" />
@@ -309,7 +309,7 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="Add" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -317,7 +317,7 @@
default-tooltip-style="tabletext" default-widget-style="inputBox"
target="Edit${contentRoleTarget}ContentRole" title="" type="single">
<auto-fields-service service-name="createContentRole"/>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentRole" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
@@ -330,11 +330,11 @@
<auto-fields-service service-name="updateContentRole" default-field-type="display" />
<field name="thruDate" widget-style="buttontext"><date-time/></field>
<field name="thruDate" widget-style="buttontext"><date-time/></field>
- <field name="submitButton" title="Update" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Delete]" target="remove${contentRoleTarget}ContentRole?contentId=${contentId}&roleTypeId=${roleTypeId}&partyId=${partyId}&fromDate=${fromDate}"/>
+ <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="remove${contentRoleTarget}ContentRole?contentId=${contentId}&roleTypeId=${roleTypeId}&partyId=${partyId}&fromDate=${fromDate}"/>
</field>
</form>
@@ -350,7 +350,7 @@
<entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
</drop-down>
</field>
- <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentPurpose" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
@@ -361,9 +361,9 @@
</entity-and>
</actions>
<auto-fields-service service-name="updateContentPurpose" default-field-type="display" />
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Delete]" target="removeContentPurpose?contentId=${contentId}&contentPurposeTypeId=${contentPurposeTypeId}"/>
+ <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeContentPurpose?contentId=${contentId}&contentPurposeTypeId=${contentPurposeTypeId}"/>
</field>
</form>
@@ -374,7 +374,7 @@
<field name="contentId" title="" widget-style="buttontext" >
<lookup target-form-name="LookupContent" />
</field>
- <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
name="ListContentAttribute"
@@ -386,9 +386,9 @@
</actions>
<auto-fields-service service-name="updateContentAttribute" default-field-type="display" />
<field name="attrValue" widget-style="buttontext"><text/></field>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Delete]" target="removeContentAttribute?contentId=${contentId}&attrName=${attrName}"/>
+ <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeContentAttribute?contentId=${contentId}&attrName=${attrName}"/>
</field>
</form>
@@ -405,7 +405,7 @@
<entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
</drop-down>
</field>
- <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListContentMetaData" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
@@ -416,11 +416,11 @@
</entity-and>
</actions>
<auto-fields-service service-name="updateContentMetaData" default-field-type="edit" />
- <field name="contentId" title="ContentId" widget-style="buttontext"><display/></field>
- <field name="metaDataPredicateId" title="MetaDataPredicateId" widget-style="buttontext"><display/></field>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="contentId" widget-style="buttontext"><display/></field>
+ <field name="metaDataPredicateId" widget-style="buttontext"><display/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Delete]" target="removeContentMetaData?contentId=${contentId}&metaDataPredicateId=${metaDataPredicateId}"/>
+ <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeContentMetaData?contentId=${contentId}&metaDataPredicateId=${metaDataPredicateId}"/>
</field>
</form>
Modified: trunk/applications/content/widget/content/ContentMenus.xml
===================================================================
--- trunk/applications/content/widget/content/ContentMenus.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/content/ContentMenus.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -34,11 +34,11 @@
<menu-item name="CMS" title="${uiLabelMap.ContentCMS}"><link target="CMSContentFind"/></menu-item>
<menu-item name="CompDoc" title="${uiLabelMap.ContentCompDoc}"><link target="FindCompDoc"/></menu-item>
- <menu-item name="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
<condition><not><if-empty field-name="userLogin"/></not></condition>
<link target="logout"/>
</menu-item>
- <menu-item name="Login" title="Login" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
@@ -56,28 +56,28 @@
selected-menuitem-context-field-name="tabButtonItem"
title="" type="simple">
- <menu-item name="content" title="Content" >
+ <menu-item name="content" title="${uiLabelMap.ContentContent}">
<condition>
<not><if-empty field-name="currentValue.contentId"/></not>
</condition>
<link target="EditContent?contentId=${parameters.contentId}"/>
</menu-item>
- <menu-item name="association" title="Association" >
+ <menu-item name="association" title="${uiLabelMap.ContentAssociation}">
<condition>
<not><if-empty field-name="currentValue.contentId"/></not>
</condition>
<link target="EditContentAssoc?contentId=${parameters.contentId}"/>
</menu-item>
- <menu-item name="role" title="Role" >
+ <menu-item name="role" title="${uiLabelMap.FormFieldTitle_roles}" >
<condition>
<not><if-empty field-name="currentValue.contentId"/></not>
</condition>
<link target="EditContentRole?contentId=${parameters.contentId}"/>
</menu-item>
- <menu-item name="purpose" title="Purpose" >
+ <menu-item name="purpose" title="${uiLabelMap.FormFieldTitle_purposes}" >
<condition>
<not>
<if-empty field-name="currentValue.contentId" />
@@ -86,14 +86,14 @@
<link target="EditContentPurpose?contentId=${contentId}"/>
</menu-item>
- <menu-item name="attribute" title="Attribute" >
+ <menu-item name="attribute" title="${uiLabelMap.ContentAttribute}" >
<condition>
<not><if-empty field-name="currentValue.contentId"/></not>
</condition>
<link target="EditContentAttribute?contentId=${contentId}"/>
</menu-item>
- <menu-item name="metaData" title="Metadata" >
+ <menu-item name="metaData" title="${uiLabelMap.ContentMetadata}" >
<condition>
<not><if-empty field-name="currentValue.contentId"/></not>
</condition>
@@ -119,7 +119,7 @@
</condition>
<link target="EditContent"/>
</menu-item>
- <menu-item name="NewContentAssoc" title="${uiLabelMap.CommonCreateNew} Assoc">
+ <menu-item name="NewContentAssoc" title="${uiLabelMap.CommonCreateNew} ${uiLabelMap.ContentAssociation}">
<condition>
<if-compare field-name="tabButtonItem" operator="equals" value="association"/>
</condition>
Modified: trunk/applications/content/widget/content/ContentScreens.xml
===================================================================
--- trunk/applications/content/widget/content/ContentScreens.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/content/ContentScreens.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -27,7 +27,6 @@
</condition>
<actions>
<set field="headerItem" value="Content"/>
- <set field="title" value="PageTitleFindContent"/>
<set field="titleProperty" value="PageTitleFindContent"/>
<set field="entityName" value="Content"/>
<set field="queryString" from-field="result.queryString"/>
@@ -40,7 +39,7 @@
<container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
<label style="head1" text="${uiLabelMap.PageTitleFindContent}"/>
<include-form name="FindContent" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="Content List"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleListContent}"></label>
<include-form name="ListContent" location="component://content/widget/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -53,7 +52,6 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="tabButtonItem" value="content"/>
<set field="contentId" from-field="parameters.contentId"/>
@@ -96,10 +94,9 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set field="title" value="Content Edit Page"/>
<set field="titleProperty" value="PageTitleEditContentAssoc"/>
<set field="currentContentMenuItemName" value="contentassoc" to-scope="user"/>
- <set field="extraFunctionName" value="'From'"/>
+ <set field="extraFunctionName" value="'${uiLabelMap.CommonFrom}'"/>
<set field="tabButtonItem" value="association"/>
<set field="contentId" from-field="parameters.contentId" />
<set field="contentIdTo" from-field="parameters.contentIdTo" />
@@ -112,7 +109,7 @@
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentAssocFrom" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="List associations 'to'"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleListAssociations} '${uiLabelMap.CommonTo}'"></label>
<include-form name="ListContentAssocTo" location="component://content/widget/content/ContentForms.xml"/>
<section>
<condition>
@@ -124,7 +121,7 @@
</and>
</condition>
<widgets>
- <label style="head1" text="Edit an association"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleEditAssociation}"></label>
<include-form name="EditContentAssoc" location="component://content/widget/content/ContentForms.xml"/>
</widgets>
</section>
@@ -138,7 +135,7 @@
</or>
</condition>
<widgets>
- <label style="head1" text="Add an association"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleAddAssociation}"></label>
<include-form name="AddContentAssoc" location="component://content/widget/content/ContentForms.xml"/>
</widgets>
</section>
@@ -154,8 +151,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="title" value="Content Edit Page"/>
+ <script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentRole"/>
<set field="tabButtonItem" value="role"/>
@@ -169,7 +165,7 @@
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="Add a Role"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleAddRole}"></label>
<include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -183,8 +179,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="title" value="Content Edit Page"/>
+ <script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentPurpose"/>
<set field="tabButtonItem" value="purpose"/>
<set field="contentId" from-field="parameters.contentId" />
@@ -196,7 +191,7 @@
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="Add a purpose"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleAddPurpose}"></label>
<include-form name="AddContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -210,8 +205,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="title" value="Content Edit Page"/>
+ <script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentAttribute"/>
<set field="tabButtonItem" value="attribute"/>
<set field="contentId" from-field="parameters.contentId" />
@@ -223,7 +217,7 @@
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="Add an attribute"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleAddAttribute}"></label>
<include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -238,8 +232,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="title" value="Content Edit Page"/>
+ <script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentMetadata"/>
<set field="tabButtonItem" value="metaData"/>
<set field="contentId" from-field="parameters.contentId" />
@@ -251,7 +244,7 @@
<decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ListContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="Add a metadata"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleAddMetaData}"></label>
<include-form name="AddContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
</decorator-section>
</decorator-screen>
Modified: trunk/applications/content/widget/content/DataResourceForms.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceForms.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/content/DataResourceForms.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -44,7 +44,7 @@
</field>
<field name="localeString" position="2">
<drop-down allow-empty="true">
- <entity-options entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"/>
+ <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"/>
</drop-down>
</field>
<field name="createdByUserLogin" position="1"><lookup target-form-name="LookupPerson"/></field>
@@ -66,7 +66,7 @@
</service>
</actions>
<field name="dataResourceId"><hidden/></field>
- <field name="dataResourceName" title="Name [id]" widget-style="tabletext">
+ <field name="dataResourceName" widget-style="tabletext">
<display-entity entity-name="DataResource" description="${dataResourceName}" key-field-name="dataResourceId">
<sub-hyperlink target="editDataResource?dataResourceId=${dataResourceId}" description="[${dataResourceId}]" link-style="buttontext"/>
</display-entity>
@@ -154,8 +154,8 @@
<entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
</drop-down>
</field>
- <field name="createButton" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="updateButton" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="createButton" title="${uiLabelMap.CommonCreate}" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<!--form name="DataResourceMaster" target="createDataResource" title="" type="single" default-map-name="currentValue"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
Modified: trunk/applications/content/widget/content/DataResourceMenus.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceMenus.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/content/DataResourceMenus.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -75,43 +75,43 @@
</menu>
<menu name="dataresource">
- <menu-item name="editDataResource" title="Data Resource" >
+ <menu-item name="editDataResource" title="${uiLabelMap.ContentDataResource}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
<link target="editDataResource?dataResourceId=${parameters.dataResourceId}"/>
</menu-item>
- <menu-item name="editElectronicText" title="Text" >
+ <menu-item name="editElectronicText" title="${uiLabelMap.ContentDataResourceText}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
<link target="EditElectronicText?dataResourceId=${parameters.dataResourceId}"/>
</menu-item>
- <menu-item name="editHtmlText" title="Html" >
+ <menu-item name="editHtmlText" title="${uiLabelMap.ContentDataResourceHtml}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
<link target="EditHtmlText?dataResourceId=${parameters.dataResourceId}"/>
</menu-item>
- <menu-item name="uploadImage" title="Image" >
+ <menu-item name="uploadImage" title="${uiLabelMap.ContentDataResourceImage}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
<link target="UploadImage?dataResourceId=${parameters.dataResourceId}"/>
</menu-item>
- <menu-item name="editDataResourceAttribute" title="Attribute" >
+ <menu-item name="editDataResourceAttribute" title="${uiLabelMap.ContentDataResourceAttribute}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
<link target="EditDataResourceAttribute?dataResourceId=${parameters.dataResourceId}"/>
</menu-item>
- <menu-item name="editDataResourceRole" title="Role" >
+ <menu-item name="editDataResourceRole" title="${uiLabelMap.ContentDataResourceRole}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
<link target="EditDataResourceRole?dataResourceId=${parameters.dataResourceId}"/>
</menu-item>
- <menu-item name="editDataResourceProductFeatures" title="Product Features" >
+ <menu-item name="editDataResourceProductFeatures" title="${uiLabelMap.ContentDataResourceProductFeatures}" >
<condition>
<not><if-empty field-name="currentValue.dataResourceId"/></not>
</condition>
Modified: trunk/applications/content/widget/content/DataResourceScreens.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceScreens.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/content/DataResourceScreens.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -35,7 +35,7 @@
<container><link target="editDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
<label style="head1" text="${uiLabelMap.PageTitleFindDataResource}"/>
<include-form name="FindDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
- <label style="head1" text="Data Resource List"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleListDataResource}"></label>
<include-form name="ListDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -48,7 +48,8 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set field="title" value="Lookup Data Resource"/>
+ <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupDataResource}"/>
<set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
@@ -69,6 +70,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResource"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResource"/>
<set field="dataResourceId" from-field="parameters.dataResourceId"/>
@@ -108,6 +110,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleUploadImageDataResource"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="uploadImage"/>
<entity-one entity-name="DataResource" value-name="currentValue">
@@ -147,6 +150,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleAddDataResourceText"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="adddataresourcetext"/>
</actions>
@@ -165,6 +169,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleAddDataResourceUrl"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="adddataresourceurl"/>
</actions>
@@ -184,6 +189,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleAddDataResourceUpload"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="adddataresourceupload"/>
</actions>
@@ -202,6 +208,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResourceText"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="editdataresourcetext"/>
</actions>
@@ -220,6 +227,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResourceUrl"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="editdataresourceurl"/>
</actions>
@@ -238,6 +246,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResourceUpload"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="editdataresourceupload"/>
</actions>
@@ -256,6 +265,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditElectronicText"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="editelectronictext"/>
<set field="tabButtonItem" value="editElectronicText"/>
@@ -278,6 +288,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResourceAttribute"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResourceAttribute"/>
<entity-one entity-name="DataResource" value-name="currentValue">
@@ -300,6 +311,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResourceRole"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResourceRole"/>
<entity-one entity-name="DataResource" value-name="currentValue">
@@ -322,6 +334,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditDataResourceProductFeatures"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResourceProductFeatures"/>
<entity-one entity-name="DataResource" value-name="currentValue">
@@ -344,6 +357,7 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set field="titleProperty" value="PageTitleEditHtmlText"/>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="edithtmltext"/>
<set field="tabButtonItem" value="editHtmlText"/>
Modified: trunk/applications/content/widget/data/DataResourceForms.xml
===================================================================
--- trunk/applications/content/widget/data/DataResourceForms.xml 2006-06-30 22:03:40 UTC (rev 7910)
+++ trunk/applications/content/widget/data/DataResourceForms.xml 2006-06-30 22:09:23 UTC (rev 7911)
@@ -228,7 +228,7 @@
</field>
<field name="objectInfo" title="Image File Name"><display/></field>
<field name="imageData" map-name="ImageDataResource"><file/></field>
- <field name="submitButton" title="Upload" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<!-- DataResourceAttribute forms -->
<form name="AddDataResourceAttribute"
@@ -328,7 +328,7 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductFeature" list-name="entityList" paginate-target="LookupProductFeature" title="" type="list"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
More information about the Svn
mailing list