svn commit: r745286 [1/2] - in /ofbiz/trunk: applications/content/config/ applications/content/webapp/co
Locked
svn commit: r745286 [1/2] - in /ofbiz/trunk: applications/content/config/ applications/content/webapp/co
 
|
Author: mrisaliti
Date: Tue Feb 17 22:57:14 2009 New Revision: 745286 URL: http://svn.apache.org/viewvc?rev=745286&view=rev Log: A lot of hardcoded labels cleaning and changes some wrong references Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/content/widget/SurveyScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml ofbiz/trunk/applications/content/widget/forum/BlogForms.xml ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/order/config/OrderUiLabels.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Tue Feb 17 22:57:14 2009 @@ -90,6 +90,10 @@ <value xml:lang="en">List of Blog articles</value> <value xml:lang="fr">Liste des articles du blog</value> </property> + <property key="ContentBlogDescription"> + <value xml:lang="en">Blog Description</value> + <value xml:lang="it">Descrizione blog</value> + </property> <property key="ContentBlogEdit"> <value xml:lang="en">Edit a Blog</value> <value xml:lang="fr">Modifier un blog</value> @@ -98,6 +102,18 @@ <value xml:lang="en">List of Blogs</value> <value xml:lang="fr">Liste des blogs</value> </property> + <property key="ContentBlogName"> + <value xml:lang="en">Blog Name</value> + <value xml:lang="it">Nome blog</value> + </property> + <property key="ContentBlogSummary"> + <value xml:lang="en">Summary</value> + <value xml:lang="fr">Summario</value> + </property> + <property key="ContentBrowse"> + <value xml:lang="en">Browse</value> + <value xml:lang="fr">Sfoglia</value> + </property> <property key="ContentCMS"> <value xml:lang="ar">CMS</value> <value xml:lang="de">CMS</value> @@ -172,6 +188,10 @@ <value xml:lang="en">Add Composite Document Instance Page for Template</value> <value xml:lang="it">Aggiungi composizione documenti pagina istanza per template.</value> </property> + <property key="ContentCompDocAfter"> + <value xml:lang="en">+Aft</value> + <value xml:lang="it">+Dopo</value> + </property> <property key="ContentCompDocApprovals"> <value xml:lang="de">Genehmigungen</value> <value xml:lang="en">Approvals</value> @@ -186,6 +206,18 @@ <value xml:lang="it">Approvazioni Contenuto</value> <value xml:lang="th">หัวà¸à¹à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸à¸ªà¸³à¸«à¸£à¸±à¸</value> </property> + <property key="ContentCompDocApprovalStatus"> + <value xml:lang="en">Approval Status</value> + <value xml:lang="it">Stato approvazione</value> + </property> + <property key="ContentCompDocBefore"> + <value xml:lang="en">+Bef</value> + <value xml:lang="it">+Prima</value> + </property> + <property key="ContentCompDocChild"> + <value xml:lang="en">+Child</value> + <value xml:lang="it">+Figlio</value> + </property> <property key="ContentCompDocContentRoleEditPage"> <value xml:lang="en">Content Role Edit Page</value> <value xml:lang="it">Pagina aggiornamento ruolo contenuto composizione documenti</value> @@ -194,6 +226,26 @@ <value xml:lang="en">Comp Doc Current Instance</value> <value xml:lang="it">Istanza attuale</value> </property> + <property key="ContentCompDocCurrentTemplate"> + <value xml:lang="en">Current Template CompDoc</value> + <value xml:lang="it">Template attuale</value> + </property> + <property key="ContentCompDocDown"> + <value xml:lang="en">vDn</value> + <value xml:lang="it">vGiù</value> + </property> + <property key="ContentCompDocGeneratePDF"> + <value xml:lang="en">Generate Composite PDF</value> + <value xml:lang="it">Genera PDF composizione</value> + </property> + <property key="ContentCompDocGoBack"> + <value xml:lang="en">Go Back to CompDoc Root</value> + <value xml:lang="it">Torna indietro alla composizione documenti</value> + </property> + <property key="ContentCompDocParentContentId"> + <value xml:lang="en">Parent Content ID</value> + <value xml:lang="it">Contenuto padre</value> + </property> <property key="ContentCompDocRev"> <value xml:lang="de">Ver.</value> <value xml:lang="en">rev.</value> @@ -222,10 +274,18 @@ <value xml:lang="it">Revisioni</value> <value xml:lang="th">à¸à¸£à¸±à¸à¸à¸£à¸¸à¸à¹à¸«à¸¡à¹</value> </property> + <property key="ContentCompDocStartApprovalProcess"> + <value xml:lang="en">Start Approval Process</value> + <value xml:lang="it">Inizio processo approvazione</value> + </property> <property key="ContentCompDocTemplateName"> <value xml:lang="en">Comp Doc Template Name</value> <value xml:lang="it">Nome template composizione documenti</value> </property> + <property key="ContentCompDocUp"> + <value xml:lang="en">^Up</value> + <value xml:lang="it">^Sù</value> + </property> <property key="ContentCompDocViewInstances"> <value xml:lang="de">Instanz Anzeigen</value> <value xml:lang="en">View Instances</value> @@ -658,6 +718,10 @@ <value xml:lang="en">JPEG</value> <value xml:lang="it">JPEG</value> </property> + <property key="ContentLatest"> + <value xml:lang="en">Latest</value> + <value xml:lang="it">Ultimo</value> + </property> <property key="ContentLayout"> <value xml:lang="ar">اÙÙضعÙØ©</value> <value xml:lang="de">Layout</value> @@ -832,6 +896,10 @@ <value xml:lang="it">Sotto-contenuto veloce</value> <value xml:lang="th">หัวà¸à¹à¸à¸¢à¹à¸à¸¢à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value> </property> + <property key="ContentRejected"> + <value xml:lang="en">Rejected</value> + <value xml:lang="it">Rifiutato</value> + </property> <property key="ContentResourceAudio"> <value xml:lang="de">Audio</value> <value xml:lang="en">Audio</value> @@ -881,6 +949,14 @@ <value xml:lang="it">Video</value> <value xml:lang="th">วิà¸à¸µà¹à¸</value> </property> + <property key="ContentRoot"> + <value xml:lang="en">Root</value> + <value xml:lang="it">Principale</value> + </property> + <property key="ContentSoftRejected"> + <value xml:lang="en">Soft Rejected</value> + <value xml:lang="it">Rifiutato leggermente</value> + </property> <property key="ContentSubContent"> <value xml:lang="ar">Ù ØتÙ٠تØتÙ</value> <value xml:lang="de">Untergeordneter Inhalt</value> @@ -1240,6 +1316,18 @@ <value xml:lang="th">รูà¸à¹à¸à¸</value> <value xml:lang="zh">模æ¿</value> </property> + <property key="ContentTemplateImageCentered"> + <value xml:lang="en">Image centered above</value> + <value xml:lang="it">Immagine centrata sopra</value> + </property> + <property key="ContentTemplateImageLeft"> + <value xml:lang="en">Image left, text flows around.</value> + <value xml:lang="it">Immagine a sinistra.</value> + </property> + <property key="ContentTemplateTextOnly"> + <value xml:lang="en">Text only</value> + <value xml:lang="it">Solo testo</value> + </property> <property key="ContentText"> <value xml:lang="ar">Ùص</value> <value xml:lang="de">Text</value> @@ -1380,6 +1468,10 @@ <value xml:lang="th">à¹à¸§à¹à¸à¹à¸à¸à¹</value> <value xml:lang="zh">ç½ç«</value> </property> + <property key="ContentWelcome"> + <value xml:lang="en">Welcome to the Content Manager!</value> + <value xml:lang="it">Benvenuti nella gestione contenuti!</value> + </property> <property key="FormFieldTitle_acroFormContentId"> <value xml:lang="ar">AcroForm (PDF) Content ID</value> <value xml:lang="de">AcroForm (PDF) Inhalt ID</value> @@ -2739,6 +2831,14 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´</value> <value xml:lang="zh">æ°å»ºå±æ§</value> </property> + <property key="PageTitleAddCompositeDocumentInstance"> + <value xml:lang="en">Add Composite Document Instance Part Page</value> + <value xml:lang="it">Aggiungi instanza composizione documenti</value> + </property> + <property key="PageTitleAddCompositeDocumentTemplate"> + <value xml:lang="en">Add Composite Document Template Page</value> + <value xml:lang="it">Aggiungi template composizione documenti</value> + </property> <property key="PageTitleAddContent"> <value xml:lang="ar">إضاÙØ© Ù ØتÙÙ</value> <value xml:lang="de">Inhalt hinzufügen</value> @@ -2811,6 +2911,10 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸³à¸à¸à¸à¹à¸à¸à¹à¸à¸à¸§à¸²à¸¡:</value> <value xml:lang="zh">æ°å»ºåçï¼ä¿¡æ¯</value> </property> + <property key="PageTitleAddCompDocInstance"> + <value xml:lang="en">Add CompDoc Instance</value> + <value xml:lang="it">Aggiungi Istanza CompDoc</value> + </property> <property key="PageTitleAddMetaData"> <value xml:lang="ar">إضاÙØ© Ù Ùتا ٠عÙÙ٠ات</value> <value xml:lang="de">Metadaten hinzufügen</value> @@ -3618,6 +3722,18 @@ <value xml:lang="th">à¹à¸«à¸¥à¸à¸£à¸¹à¸à¸ าà¸</value> <value xml:lang="zh">ä¸ä¼ å¾ç</value> </property> + <property key="PageTitleViewCompDocContent"> + <value xml:lang="en">View CompDoc Content</value> + <value xml:lang="it">Mostra contenuto composizione documenti</value> + </property> + <property key="PageTitleViewCompDocTemplateTree"> + <value xml:lang="en">View Template Tree</value> + <value xml:lang="it">Mostra albero template</value> + </property> + <property key="PageTitleViewCompDocTree"> + <value xml:lang="en">View Tree</value> + <value xml:lang="it">Mostra albero</value> + </property> <property key="PageTitleViewSurveyResponses"> <value xml:lang="ar">٠شاÙدة أجÙبة اÙتصÙÙت</value> <value xml:lang="de">Befragung Antworten anzeigen</value> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Tue Feb 17 22:57:14 2009 @@ -62,9 +62,9 @@ </field> <field name="dataResourceId" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="TEMPLATE_TEXT_ONLY" description="Text only" /> - <option key="TEMPLATE_IMAGE_CENTERED" description="Image centered above" /> - <option key="TEMPLATE_IMAGE_LEFT" description="Image left, text flows around." /> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.ContentTemplateTextOnly}" /> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.ContentTemplateImageCentered}" /> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.ContentTemplateImageLeft}" /> </drop-down> </field> <field name="ftlContentId" position="1"> @@ -82,7 +82,7 @@ <field name="description"> <text size="60"/> </field> - <field name="summaryData" title="Summary" + <field name="summaryData" title="${uiLabelMap.ContentBlogSummary}" use-when=""${summaryDataResourceTypeId}".length()>0" id-name="summaryData"> <textarea rows="8" cols="80" /> @@ -489,10 +489,10 @@ </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="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/> + <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> <!-- - <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/> - <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/> + <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> + <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/> --> </lookup> </field> Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Tue Feb 17 22:57:14 2009 @@ -136,10 +136,10 @@ <option key="text/plain" description="${uiLabelMap.ContentPlainText}" /> </drop-down> </field> - <field name="drObjectInfo" title="File Path"> + <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> <text /> </field> - <field name="textData" title="Text (Use '<>' to enter plain text)" id-name="textData"> + <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"> <textarea rows="24" cols="80" /> </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"> @@ -227,7 +227,7 @@ <field name="drMimeTypeId" > <display description="text/plain"/> </field> - <field name="textData" title="Text (Use '<>' to enter plain text)" id-name="textData"> + <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"> <textarea rows="24" cols="80" /> </field> <field name="createdByUserLogin" position="1"> @@ -256,7 +256,7 @@ <field name="drMimeTypeId" > <display description="text/plain"/> </field> - <field name="textData" title="Text" > + <field name="textData" title="${uiLabelMap.ContentText}" > <textarea rows="24" cols="80" /> </field> <field name="createdByUserLogin" position="1"> @@ -289,7 +289,7 @@ <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/> </drop-down> </field> - <field name="drObjectInfo" title="Image File Name"> + <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> <display description="${currentValue.drObjectInfo}" /> </field> <field name="imageData" entity-name="ImageDataResource" map-name="dummy"> @@ -327,7 +327,7 @@ <option key="image/tiff" description="${uiLabelMap.ContentTIFF}" /> </drop-down> </field> - <field name="drObjectInfo" title="Image File Name"> + <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> <display description="${currentValue.drObjectInfo}" /> </field> <field name="imageData" entity-name="ImageDataResource"> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Tue Feb 17 22:57:14 2009 @@ -290,10 +290,10 @@ <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-header"> - <label style="boxhead" text="Content Manager Main Page"/> + <label style="boxhead" text="${uiLabelMap.ContentWelcome}"/> </container> <container style="screenlet-body"> - <container><label style="tabletext" text="Welcome to the Content Manager!"/></container> + <container><label style="tabletext" text=""/></container> </container> </container> </decorator-section> Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Tue Feb 17 22:57:14 2009 @@ -343,7 +343,7 @@ <widgets> <section> <condition><not><if-empty field="parameters.rootContentId"/></not></condition> - <widgets><container><link text="Go Back to CompDoc Root [${parameters.rootContentId}]" target="ViewCompDocInstanceTree?rootContentId=${parameters.rootContentId}" style="buttontext"/></container></widgets> + <widgets><container><link text="${uiLabelMap.ContentCompDocGoBack} [${parameters.rootContentId}]" target="ViewCompDocInstanceTree?rootContentId=${parameters.rootContentId}" style="buttontext"/></container></widgets> </section> <platform-specific><html><html-template location="component://content/webapp/content/survey/ViewSurveyResponses.ftl"/></html></platform-specific> </widgets> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Tue Feb 17 22:57:14 2009 @@ -81,7 +81,7 @@ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc?rootContentId=${contentId}"/> </field> <field name="templateTree" widget-style="buttontext"> - <hyperlink also-hidden="false" description="Tree" target="ViewCompDocInstanceTree?rootContentId=${contentId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree?rootContentId=${contentId}"/> </field> </form> @@ -177,9 +177,9 @@ </field> <field name="approvalStatusId" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"> <drop-down allow-empty="true"> - <option key="SOFT_REJ" description="Soft Rejected"/> - <option key="REJECTED" description="Rejected"/> - <option key="APPROVED" description="Approved"/> + <option key="SOFT_REJ" description="${uiLabelMap.ContentSoftRejected}"/> + <option key="REJECTED" description="${uiLabelMap.ContentRejected}"/> + <option key="APPROVED" description="${uiLabelMap.CommonApproved}"/> </drop-down> </field> <field name="approvalDate" widget-style="inputBox"><date-time/></field> @@ -226,9 +226,9 @@ </field> <field name="approvalStatusId" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"> <drop-down allow-empty="true"> - <option key="SOFT_REJ" description="Soft Rejected"/> - <option key="REJECTED" description="Rejected"/> - <option key="APPROVED" description="Approved"/> + <option key="SOFT_REJ" description="${uiLabelMap.ContentSoftRejected}"/> + <option key="REJECTED" description="${uiLabelMap.ContentRejected}"/> + <option key="APPROVED" description="${uiLabelMap.CommonApproved}"/> </drop-down> </field> <field name="approvalDate" widget-style="inputBox" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"><date-time/></field> @@ -256,9 +256,9 @@ </field> <field name="approvalStatusId" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"> <drop-down allow-empty="true"> - <option key="SOFT_REJ" description="Soft Rejected"/> - <option key="REJECTED" description="Rejected"/> - <option key="APPROVED" description="Approved"/> + <option key="SOFT_REJ" description="${uiLabelMap.ContentSoftRejected}"/> + <option key="REJECTED" description="${uiLabelMap.ContentRejected}"/> + <option key="APPROVED" description="${uiLabelMap.CommonApproved}"/> </drop-down> </field> <field name="approvalDate" widget-style="inputBox"><date-time/></field> @@ -311,8 +311,8 @@ <field name="contentId"><ignored/></field> <field name="contentName"><text/></field> <field name="contentTypeId"><hidden/></field> - <field name="instanceOfContentId" use-when=""DOCUMENT".equals(contentTypeId)" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="caContentIdTo" entry-name="rootContentId" map-name="parameters" widget-style="tabletext" title="Parent Content ID"> + <field name="instanceOfContentId" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="caContentIdTo" entry-name="rootContentId" map-name="parameters" widget-style="tabletext" title="${uiLabelMap.ContentCompDocParentContentId}"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/> </field> <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType"/></field> @@ -353,7 +353,7 @@ <field name="contentId" widget-style="tabletext"><display/></field> <field name="contentName" map-name="itemContent"><text/></field> <field name="contentTypeId" map-name="itemContent"><hidden/></field> - <field name="instanceOfContentId" map-name="itemContent" use-when=""DOCUMENT".equals(contentTypeId)" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="instanceOfContentId" map-name="itemContent" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> <field name="contentIdTo" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field> <field name="fromDate" widget-style="tabletext"><display/></field> @@ -422,8 +422,8 @@ <field name="contentId" widget-style="tabletext"><display/></field> <field name="contentName" map-name="itemContent"><display/></field> <field name="contentTypeId" map-name="itemContent"><hidden/></field> - <field name="instanceOfContentId" map-name="itemContent" use-when="contentTypeId.equals("DOCUMENT")" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="contentIdTo" widget-style="tabletext" title="Parent Content ID"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="instanceOfContentId" map-name="itemContent" use-when="contentTypeId.equals("DOCUMENT")" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="contentIdTo" widget-style="tabletext" title="${uiLabelMap.ContentCompDocParentContentId}"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> @@ -490,7 +490,7 @@ <field name="dataResourceTypeId" map-name="dataResource"><hidden/></field> <field name="mimeTypeId" map-name="dataResource"><hidden/></field> <!-- would show previous file name... doesn't make too much sense <field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field> --> - <field name="imageData" title="File"><file/></field> + <field name="imageData" title="${uiLabelMap.ContentFile}"><file/></field> <field name="rootContentId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit/></field> </form> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Tue Feb 17 22:57:14 2009 @@ -65,7 +65,7 @@ <menu name="subtree" menu-container-style="button-bar tab-bar" default-selected-style="selected" default-menu-item-name="content" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> - <menu-item name="viewtree" title="View Tree"> + <menu-item name="viewtree" title="${uiLabelMap.PageTitleViewCompDocTree}"> <condition> <or> <if-compare value="COMPDOC_TEMPLATE" field="contentTypeId" operator="equals"></if-compare> @@ -74,7 +74,7 @@ </condition> <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> </menu-item> - <menu-item name="viewtree2" title="View Tree"> + <menu-item name="viewtree2" title="${uiLabelMap.PageTitleViewCompDocTree}"> <condition> <or> <if-compare value="COMPDOC_INSTANCE" field="contentTypeId" operator="equals"></if-compare> @@ -96,13 +96,13 @@ <menu-item name="edit-link" title="${uiLabelMap.CommonEdit}"> <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/> </menu-item> - <menu-item name="child" title="+Child"> + <menu-item name="child" title="${uiLabelMap.ContentCompDocChild}"> <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/> </condition> <link target="AddChildCompDocTemplate?rootContentId=${contentId}&sequenceNum=9999"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& --> </menu-item> - <menu-item name="latest" title="Current Template CompDoc"> + <menu-item name="latest" title="${uiLabelMap.ContentCompDocCurrentTemplate}"> <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="greater" to-field="rootContentRevisionSeqId"/> </condition> @@ -130,25 +130,25 @@ <link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999"/> </menu-item> --> - <menu-item name="bef" title="+Bef"> + <menu-item name="bef" title="${uiLabelMap.ContentCompDocBefore}"> <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/> </condition> <link target="AddChildCompDocTemplate?contentId=${contentId}&rootContentId=${rootContentId}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}"/> <!-- &contentRevisionSeqId=${contentRevisionSeqId} --> </menu-item> - <menu-item name="aft" title="+Aft"> + <menu-item name="aft" title="${uiLabelMap.ContentCompDocAfter}"> <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/> </condition> <link target="AddChildCompDocTemplate?contentId=${contentId}&rootContentId=${rootContentId}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${fromDate}"/> <!-- &contentRevisionSeqId=${contentRevisionSeqId} --> </menu-item> - <menu-item name="up" title="^Up"> + <menu-item name="up" title="${uiLabelMap.ContentCompDocUp}"> <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/> </condition> <link target="resequenceCompDocPart?contentId=${contentId}&dir=up&contentAssocTypeId=COMPDOC_PART&contentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> </menu-item> - <menu-item name="down" title="vDn"> + <menu-item name="down" title="${uiLabelMap.ContentCompDocDown}"> <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/> </condition> @@ -163,7 +163,7 @@ <menu-item name="edit" title="${uiLabelMap.CommonEdit}"> <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/> </menu-item> - <menu-item name="viewtree" title="View Template Tree"> + <menu-item name="viewtree" title="${uiLabelMap.PageTitleViewCompDocTemplateTree}"> <link target="ViewCompDocTemplateTree?rootContentRevisionSeqId=${templateContentRevisionSeqId}&rootContentId=${templateContentId}"/> </menu-item> <menu-item name="latest" title="${uiLabelMap.ContentCompDocCurrentInstance}"> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Tue Feb 17 22:57:14 2009 @@ -618,7 +618,7 @@ <if-compare field="itemContent.contentTypeId" operator="equals" value="TEMPLATE"/> </condition> <actions> - <set field="title" value="Edit CompDoc Template Part [${contentId}, part of ${rootContentId}]"/> + <set field="title" value="${uiLabelMap.PageTitleEditCompDocTemplate} [${contentId}, part of ${rootContentId}]"/> <set field="childCompDocTarget" value="updateChildCompDocTemplate"/> <set field="contentTypeId" value="TEMPLATE"/> </actions> @@ -646,8 +646,8 @@ </condition> <widgets> <container> - <label style="tableheadtext" text="Viewing Revision [${rootContentRevisionSeqId}], Latest is [${mostRecentRevisionSeqId}]"/> - <link style="buttontext" text="Latest" target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}"></link> + <label style="tableheadtext" text="${uiLabelMap.ContentCompDocRevisions} [${rootContentRevisionSeqId}], Latest is [${mostRecentRevisionSeqId}]"/> + <link style="buttontext" text="${uiLabelMap.ContentLatest}" target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}"></link> <include-screen name="ContentViewLink"/> </container> <include-form name="ViewChildCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/> @@ -662,7 +662,7 @@ <if-compare field="itemContent.contentTypeId" operator="equals" value="DOCUMENT"/> </condition> <actions> - <set field="title" value="Edit CompDoc Instance Part [${contentId} of ${contentId}]"/> + <set field="title" value="${uiLabelMap.PageTitleEditCompDocInstance} [${contentId} of ${contentId}]"/> <set value="updateChildCompDocInstance" field="childCompDocTarget"/> <set value="DOCUMENT" field="contentTypeId"/> <!-- @@ -720,7 +720,7 @@ <actions> </actions> <widgets> - <container><link target="ViewCompDocContentBinary?contentId=${contentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container> + <container><link target="ViewCompDocContentBinary?contentId=${contentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="${uiLabelMap.PageTitleViewCompDocContent}" style="buttontext"/></container> </widgets> </section> <section> @@ -733,7 +733,7 @@ <actions> </actions> <widgets> - <container><link target="ViewCompDocContentHtml?contentId=${contentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container> + <container><link target="ViewCompDocContentHtml?contentId=${contentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="${uiLabelMap.PageTitleViewCompDocContent}" style="buttontext"/></container> </widgets> </section> <section> @@ -744,7 +744,7 @@ </actions> <widgets> <!-- link on form - <container><link target="EditSurvey?surveyId=${dataResource.relatedDetailId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container> + <container><link target="EditSurvey?surveyId=${dataResource.relatedDetailId}&rootContentId=${rootContentId}" text="${uiLabelMap.PageTitleViewCompDocContent}" style="buttontext"/></container> --> </widgets> </section> @@ -756,7 +756,7 @@ </actions> <widgets> <!-- link on form - <container><link target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container> + <container><link target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}&rootContentId=${rootContentId}" text="${uiLabelMap.PageTitleViewCompDocContent}" style="buttontext"/></container> --> </widgets> </section> @@ -950,7 +950,7 @@ </condition> <actions> <set field="menuName" value="tree"/> - <set field="title" value="Add Composite Document Template Page"/> + <set field="titleProperty" value="PageTitleAddCompositeDocumentTemplate"/> <set field="contentTypeId" value="COMPDOC_TEMPLATE"/> <set field="createChildCompDoc" value="createChildCompDocTemplate"/> </actions> @@ -970,7 +970,7 @@ </condition> <actions> <set field="menuName" value="tree"/> - <set field="title" value="Add Composite Document Instance Part Page"/> + <set field="titleProperty" value="PageTitleAddCompositeDocumentInstance"/> <set field="contentIdTo" from-field="parameters.rootContentId"/> <set field="templateContentId" from-field="parameters.instanceOfContentId"/> <entity-one entity-name="Content" value-field="templateContent"> @@ -1006,7 +1006,7 @@ </condition> <actions> <set field="menuName" value="tree"/> - <set field="title" value="Add Composite Document Template Part Page"/> + <set field="titleProperty" value="PageTitleAddCompositeDocumentTemplate"/> <set field="contentIdTo" from-field="parameters.rootContentId" default-value="${parameters.contentIdTo}"/> <set field="rootContentId" from-field="contentIdTo"/> <set field="rootContentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId"/> @@ -1049,8 +1049,8 @@ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <container> - <link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="View Instances" style="buttontext"/> - <link target="AddRootCompDocInstance?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/> + <link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="${uiLabelMap.ContentCompDocViewInstances}" style="buttontext"/> + <link target="AddRootCompDocInstance?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" text="${uiLabelMap.PageTitleCreateInstanceOfThisTemplate}" style="buttontext"/> </container> <include-tree name="CompDocTemplateTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/> </decorator-section> @@ -1088,12 +1088,12 @@ <order-by field-name="-contentRevisionSeqId"/> </entity-condition> <set field="templateContentRevisionSeqId" from-field="contentTemplateRevisions[0].contentRevisionSeqId"/> - <set field="title" value="Root ${rootContentId}, rev. ${rootContentRevisionSeqId} instance of ${instanceContent.instanceOfContentId}, rev. ${templateContentRevisionSeqId}"/> + <set field="title" value="${uiLabelMap.ContentRoot} ${rootContentId}, ${uiLabelMap.ContentCompDocRev} ${rootContentRevisionSeqId} ${uiLabelMap.FormFieldTitle_instanceOfContentId} ${instanceContent.instanceOfContentId}, ${uiLabelMap.ContentCompDocRev} ${templateContentRevisionSeqId}"/> </actions> <widgets> <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> - <container><link target="GenCompDocPdf?contentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="Generate Composite PDF" style="buttontext"/></container> + <container><link target="GenCompDocPdf?contentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="${uiLabelMap.ContentCompDocGeneratePDF}" style="buttontext"/></container> <include-tree name="CompDocInstanceTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/> </decorator-section> </decorator-screen> @@ -1128,7 +1128,7 @@ </actions> <widgets> <container> - <label text="Approval Status: ${statusItem.description}" style="h2"/> + <label text="${uiLabelMap.ContentCompDocApprovalStatus}: ${statusItem.description}" style="h2"/> <section> <condition> <and> @@ -1137,7 +1137,7 @@ </and> </condition> <widgets> - <link text="Start Approval Process" target="prepForApproval?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" style="buttontext"/> + <link text="${uiLabelMap.ContentCompDocStartApprovalProcess}" target="prepForApproval?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" style="buttontext"/> </widgets> </section> </container> @@ -1207,7 +1207,7 @@ <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/> </condition> <widgets> - <link text="Add Instance" + <link text="${uiLabelMap.PageTitleAddCompDocInstance}" target="AddChildCompDocInstance?rootContentId=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}" style="buttontext"/> </widgets> @@ -1226,10 +1226,10 @@ <widgets> <container> <label text="- ${instanceContent.contentName} [${instanceContent.contentId}] - ${instanceDataResource.objectInfo} ${instanceDataResource.relatedDetailId}" style="tableheadtext"/> - <link text="Edit Instance" + <link text="${uiLabelMap.PageTitleEditCompDocInstance}" target="EditChildCompDoc?contentId=${assocRevisionItemView.contentId}&rootContentId=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" style="buttontext"/> - <link text="View as PDF" + <link text="${uiLabelMap.ContentCompDocGeneratePDF}" target="GenContentPdf?contentId=${assocRevisionItemView.contentId}&caSequenceNum=${sequenceNum}" style="buttontext"/> </container> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Tue Feb 17 22:57:14 2009 @@ -109,7 +109,7 @@ <field name="contentId"> <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/> </field> - <field name="contentName" title="contenName" widget-style="tabletext"><display/></field> + <field name="contentName" widget-style="tabletext"><display/></field> <field name="createdByUserLogin"><ignored/></field> </form> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Tue Feb 17 22:57:14 2009 @@ -85,7 +85,7 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="DataResource" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></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> <sort-order> <field-group> <sort-field name="dataResourceId"/> @@ -125,15 +125,15 @@ <field name="dataResourceId"> <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/> </field> - <field name="dataResourceName" title="Name"><display/></field> + <field name="dataResourceName"><display/></field> </form> <form name="mruLookupDataResource" default-entity-name="DataResource" list-name="mruList" target="" title="" type="list" default-widget-style="display" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="contentId" title="Id" widget-style="buttontext"> + <field name="contentId" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/> </field> - <field name="dataResourceName" title="Name" widget-style="buttontext"><display/></field> - <field name="dataCategoryId" title="Category" widget-style="buttontext"><display/></field> + <field name="dataResourceName" widget-style="buttontext"><display/></field> + <field name="dataCategoryId" widget-style="buttontext"><display/></field> </form> <form name="EditDataResource" target="updateDataResource" title="" type="single" default-map-name="currentValue" header-row-style="header-row" default-table-style="basic-table"> @@ -423,7 +423,7 @@ </form> <form name="mruLookupProductFeature" default-entity-name="ProductFeature" list-name="mruList" target="" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="contentId" title="Id" widget-style="buttontext"> + <field name="contentId" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/> </field> <field name="description" title="Name" widget-style="buttontext"><display/></field> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Tue Feb 17 22:57:14 2009 @@ -22,52 +22,52 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="contentsetup" selected-menuitem-context-field-name="tabButtonItem"> - <menu-item name="adddataresource" title="Add" > + <menu-item name="adddataresource" title="${uiLabelMap.CommonAdd}" > <link target="AddDataResource" name="AddDataResource" target-window="_top" style="tabButton" /> </menu-item> <menu-item name="finddataresource" title="${uiLabelMap.CommonFind}" > <link target="FindDataResource" name="FindDataResource" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="browsedataresource" title="Browse" > + <menu-item name="browsedataresource" title="${uiLabelMap.ContentBrowse}" > <link target="BrowseDataResource" name="BrowseDataResource" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="editdataresource" title="Data Resource" > + <menu-item name="editdataresource" title="${uiLabelMap.ContentDataResource}"> <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditDataResource" name="EditDataResource" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="editelectronictext" title="Text" > + <menu-item name="editelectronictext" title="${uiLabelMap.ContentDataResourceText}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditElectronicText" name="EditElectronicText" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="edithtmltext" title="Html" > + <menu-item name="edithtmltext" title="${uiLabelMap.ContentHtml}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditHtmlText" name="EditHtmlText" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="uploadimage" title="Image" > + <menu-item name="uploadimage" title="${uiLabelMap.ContentImage}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId" /></not> </condition> <link target="UploadImage" name="UploadImage" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="editdataresourceattribute" title="Attribute" > + <menu-item name="editdataresourceattribute" title="${uiLabelMap.ContentAttribute}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId" /></not> </condition> <link target="EditDataResourceAttribute" name="EditDataResourceAttribute" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="editdataresourcerole" title="Role" > + <menu-item name="editdataresourcerole" title="${uiLabelMap.ContentDataResourceRole}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId"/></not> </condition> <link target="EditDataResourceRole" name="EditDataResourceRole" target-window="_top" style="tabButton" /> </menu-item> - <menu-item name="editdataresourceproductfeatures" title="Product Features" > + <menu-item name="editdataresourceproductfeatures" title="${uiLabelMap.ContentDataResourceProductFeatures}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId" /></not> </condition> Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Tue Feb 17 22:57:14 2009 @@ -53,8 +53,8 @@ <field name="contentTypeId" use-when="content==null"><hidden value="WEB_SITE_PUB_PT"/></field> <field name="contentIdFrom" use-when="content==null"><hidden value="BLOGROOT"/></field> <field name="contentAssocTypeId"><hidden value="SUB_CONTENT"/></field> - <field name="contentName" title="${uiLabelMap.BlogName}"><text size="30" maxlength="60"/></field> - <field name="description" title="${uiLabelMap.BlogDescription}"><text size="30" maxlength="60"/></field> + <field name="contentName" title="${uiLabelMap.ContentBlogName}"><text size="30" maxlength="60"/></field> + <field name="description" title="${uiLabelMap.ContentBlogDescription}"><text size="30" maxlength="60"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml Tue Feb 17 22:57:14 2009 @@ -39,7 +39,7 @@ <decorator-section-include name="body"/> </widgets> <fail-widgets> - <label style="h3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label> + <label style="h3">${uiLabelMap.ContentViewPermissionError}</label> </fail-widgets> </section> </decorator-section> @@ -224,20 +224,20 @@ <container><label text="${blogEntry.contentName}: ${blogEntry.description}" style="h2"/></container> <horizontal-separator/> <container style="lefthalf"> - <label style="h3" text="Image"/> + <label style="h3" text="${uiLabelMap.ContentImage}"/> <container> <sub-content content-id="${contentId}" map-key="IMAGE"/> </container> </container> <container style="righthalf"> - <label style="h3" text="Summary"/> + <label style="h3" text="${uiLabelMap.ContentBlogSummary}"/> <container> <sub-content content-id="${contentId}" map-key="SUMMARY"/> </container> </container> <container style="clear"/> <horizontal-separator/> - <label style="h3" text="Article"/> + <label style="h3" text="${uiLabelMap.ContentBlogActicle}"/> <container> <sub-content content-id="${contentId}" map-key="MAIN"/> </container> Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Tue Feb 17 22:57:14 2009 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForums?forumGroupId=${contentId}" description="forums"/></field> + <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForums?forumGroupId=${contentId}" description="${uiLabelMap.FormFieldTitle_forums}"/></field> <field name="forumGroupName" entry-name="contentName" parameter-name="contentName"><text/></field> <field name="forumGroupDescription" entry-name="description" parameter-name="description"><text/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Tue Feb 17 22:57:14 2009 @@ -48,7 +48,7 @@ <decorator-section-include name="body"/> </widgets> <fail-widgets> - <label style="h3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label> + <label style="h3">${uiLabelMap.ContentViewPermissionError}</label> </fail-widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Tue Feb 17 22:57:14 2009 @@ -36,13 +36,13 @@ <field name="caFromDate" title="${uiLabelMap.CommonFromDate}"> <date-find/> </field> - <field name="contentId" title="Content Id"> + <field name="contentId" title="${uiLabelMap.ContentContent}"> <text-find/> </field> - <field name="dataResourceId" title="Data Resource Id"> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResource}"> <text-find/> </field> - <field name="contentName" title="Name"> + <field name="contentName"> <text-find/> </field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> @@ -69,13 +69,13 @@ <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&drDataResourceId=${drDataResourceId}&contentIdTo=${contentIdTo}"/> </field> - <field name="contentId" title="Content Id"> + <field name="contentId" title="${uiLabelMap.ContentContent}"> <display/> </field> - <field name="dataResourceId" title="Data Resource Id"> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResource}"> <display/> </field> - <field name="contentName" title="Name"> + <field name="contentName"> <display/> </field> </form> @@ -98,7 +98,7 @@ <option key="CTNT_INITIAL_DRAFT" description="PREVIEW"/> </radio> </field> - <field name="submitButton" title="Submit" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> <submit button-type="button"/> </field> <field name="blogContentId" entry-name="blogContentId" map-name="rsp"> @@ -165,7 +165,7 @@ <option key="CTNT_INITIAL_DRAFT" description="PREVIEW"/> </radio> </field> - <field name="submitButton" title="Submit" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> <submit button-type="button"/> </field> <field name="blogContentId" entry-name="blogContentId" map-name="rsp"> @@ -212,12 +212,12 @@ <option key="CTNT_INITIAL_DRAFT" description="Preview"/> </drop-down> </field> - <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="editFormSubmit" target="" title="" type="single" skip-start="true" skip-end="true" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox"> - <field name="submitButton" title="Submit" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> <submit button-type="button"/> </field> </form> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Tue Feb 17 22:57:14 2009 @@ -486,7 +486,7 @@ </form> <form name="ProductionRunTaskInventoryProducedList" type="list" title="" list-name="prunInventoryProduced" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="inventoryItemId" title="${uiLabelMap.FacilityInventoryItem}" widget-style="buttontext"> + <field name="inventoryItemId" title="${uiLabelMap.ProductInventoryItem}" widget-style="buttontext"> <hyperlink target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/> </field> </form> Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Feb 17 22:57:14 2009 @@ -1282,6 +1282,10 @@ <value xml:lang="zh">è°æ´</value> <value xml:lang="zh_CN">è°æ´</value> </property> + <property key="OrderAffiliate"> + <value xml:lang="en">Affiliate</value> + <value xml:lang="it">Affiliato</value> + </property> <property key="OrderAgent"> <value xml:lang="de">Auftrag Bearbeiter</value> <value xml:lang="en">Order Agent</value> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Tue Feb 17 22:57:14 2009 @@ -130,7 +130,7 @@ <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="Quick Add All" also-hidden="false"/> </field> <field name="returnToOrderEntry" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="orderentry" description="Return" also-hidden="false"/> + <hyperlink target="orderentry" description="${uiLabelMap.OrderOrderReturn}" also-hidden="false"/> </field> </form> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Tue Feb 17 22:57:14 2009 @@ -89,7 +89,7 @@ <screen name="ReturnPDF"> <section> <actions> - <set field="title" value="Return"/> + <set field="titleProperty" value="OrderOrderReturn"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> Modified: ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml Tue Feb 17 22:57:14 2009 @@ -19,12 +19,24 @@ under the License. --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <property key="ProductCreateCommunicationEventProductPermissionError"> + <value xml:lang="en">Create Communication Event Product Permission Error</value> + <value xml:lang="it">Errore di permesso durante la creazione evento comunicazione prodotto</value> + </property> + <property key="ProductErrorInventoryItemLabelIdNotFound"> + <value xml:lang="en">Error Inventory Item Label Id Not Found</value> + <value xml:lang="it">Errore riga etichetta inventario non trovata</value> + </property> <property key="ProductFeatureTypeIdMustContainsLettersAndDigits"> <value xml:lang="de">Die Produktmerkmal Typ ID darf nur Buchstaben, Zahlen und _ enthalten. Bitte erneut eingeben.</value> <value xml:lang="en">The Product Feature TypeId must contains only letters, underscore and digits. Please re-enter</value> <value xml:lang="fr">La réf. de type de caractéristique d'article ne doit contenir que des lettres, le tiret bas "_" et des chiffres. Recommencez SVP</value> <value xml:lang="it">Il tipo caratteristica prodotto deve contenere solamente lettere, underscore e numeri. Prego reinserire</value> </property> + <property key="ProductRemoveCommunicationEventProductPermissionError"> + <value xml:lang="en">Remove Communication Event Product Permission Error</value> + <value xml:lang="it">Errore permesso durante la rimozione dell'evento comunicazione prodotto</value> + </property> <property key="ProductReturnNotYetAcceptedOrAlreadyReceived"> <value xml:lang="de">Diese Retoure wurde noch nicht akzeptiert oder wurde schon erhalten.</value> <value xml:lang="en">This return is not yet accepted or already received.</value> Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Feb 17 22:57:14 2009 @@ -43,6 +43,10 @@ <value xml:lang="th">OFBiz: à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">OFBizï¼åºæ管çç¨åº</value> </property> + <property key="FacilityCompanySubtitle"> + <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value> + <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value> + </property> <property key="FacilityFacility"> <value xml:lang="de">Lager</value> <value xml:lang="en">Facility</value> @@ -8585,6 +8589,10 @@ <value xml:lang="it">creato/modificato da</value> <value xml:lang="th">สรà¹à¸²à¸/à¸à¸£à¸±à¸à¸à¸£à¸¸à¸à¹à¸à¸¢</value> </property> + <property key="ProductCreateSimpleTextContentForAlternateLocale"> + <value xml:lang="en">Create Simple Text Content For Alternate Locale</value> + <value xml:lang="it">Creare testo semplice per contenuto con locale alternativo</value> + </property> <property key="ProductCrossSell"> <value xml:lang="de">Sie könnten auch diese Interessant finden:</value> <value xml:lang="en">You might be interested in these as well:</value> @@ -11742,6 +11750,10 @@ <value xml:lang="ru">Тип ÑÑÑлки</value> <value xml:lang="th">à¹à¸à¸à¹à¸à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸</value> </property> + <property key="ProductListAssociatedContentInfos"> + <value xml:lang="en">List Associated Content Infos</value> + <value xml:lang="it">Lista informazioni contenuto associato</value> + </property> <property key="ProductListFeatureInteractions"> <value xml:lang="de">Liste Merkmal Interaktionen</value> <value xml:lang="en">List Feature Interactions</value> @@ -12327,7 +12339,7 @@ <value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¸à¸³à¸à¸§à¸à¸à¹à¸à¸¢</value> <value xml:lang="zh">æå°å计</value> </property> - <property key="ProductMinTotalMesssage"> + <property key="ProductMinTotalMessage"> <value xml:lang="de">Wird nur angezeigt falls der Totalpreis gleich oder grösser diesem Wert ist</value> <value xml:lang="en">Displays only if total price is equal/greater than this value</value> <value xml:lang="es">Se muestra sólo si el precio total es igual o mayor que este valor</value> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml Tue Feb 17 22:57:14 2009 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createCommunicationEventProduct" short-description="Create a CommunicationEventProduct"> <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCreateCommunicationEventProductPermissionError"/> + <fail-property resource="ProductErrorUiLabels" property="ProductCreateCommunicationEventProductPermissionError"/> </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="CommunicationEventProduct"/> @@ -32,7 +32,7 @@ </simple-method> <simple-method method-name="removeCommunicationEventProduct" short-description="Remove a CommunicationEventProduct"> <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="PartyUiLabels" property="ProductRemoveCommunicationEventProductPermissionError"/> + <fail-property resource="PartyErrorUiLabels" property="ProductRemoveCommunicationEventProductPermissionError"/> </check-permission> <check-errors/> <entity-one entity-name="CommunicationEventProduct" value-field="eventProduct"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Tue Feb 17 22:57:14 2009 @@ -583,8 +583,8 @@ <field name="maxSize" tooltip="${uiLabelMap.ProductMaxSizeMessage}"><text/></field> <field name="minWeight" tooltip="${uiLabelMap.ProductMinWeightMessage}"><text/></field> <field name="maxWeight" tooltip="${uiLabelMap.ProductMaxWeightMessage}"><text/></field> - <field name="minTotal" tooltip="${uiLabelMap.ProductMinTotalMesssage}"><text/></field> - <field name="maxTotal" tooltip="${uiLabelMap.ProductMaxTotalMesssage}"><text/></field> + <field name="minTotal" tooltip="${uiLabelMap.ProductMinTotalMessage}"><text/></field> + <field name="maxTotal" tooltip="${uiLabelMap.ProductMaxTotalMessage}"><text/></field> <field name="allowUspsAddr" tooltip="${uiLabelMap.ProductAllowUSPSAddr}"> <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Tue Feb 17 22:57:14 2009 @@ -145,7 +145,7 @@ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantityToBin}#</fo:block></fo:table-cell> <#-- Not display details here, just the summary info for the bins - <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderItemss}</fo:block></fo:table-cell> + <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderItems}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryItems}</fo:block></fo:table-cell> --> </fo:table-row> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Tue Feb 17 22:57:14 2009 @@ -105,7 +105,7 @@ </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductDescription}</td> + <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductDescription}</td> <td width="6%"> </td> <td width="74%"> ${product.description?if_exists} Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Tue Feb 17 22:57:14 2009 @@ -23,7 +23,6 @@ <screen name="EditProdCatalog"> <section> <actions> - <set field="title" value="Edit Product Catalog"/> <set field="titleProperty" value="PageTitleEditProductCatalog"/> <set field="leftbarScreenName" value="leftbar"/> <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> @@ -61,7 +60,6 @@ <screen name="EditProdCatalogCategories"> <section> <actions> - <set field="title" value="Edit Product Catalog Categories"/> <set field="titleProperty" value="PageTitleEditProductCatalogCategories"/> <set field="leftbarScreenName" value="leftbar"/> <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> @@ -123,7 +121,6 @@ <screen name="EditProdCatalogParties"> <section> <actions> - <set field="title" value="Edit Product Catalog Parties"/> <set field="titleProperty" value="PageTitleEditProductCatalogParties"/> <set field="leftbarScreenName" value="leftbar"/> <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> @@ -181,7 +178,6 @@ <screen name="EditProdCatalogStores"> <section> <actions> - <set field="title" value="Edit Product Catalog Stores"/> <set field="titleProperty" value="PageTitleEditProductCatalogStores"/> <set field="leftbarScreenName" value="leftbar"/> <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=745286&r1=745285&r2=745286&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Tue Feb 17 22:57:14 2009 @@ -114,7 +114,7 @@ <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> <set field="MainColumnStyle" value="leftonly"/> - <set field="title" value="Find Product By ID"/> + <set field="titleProperty" value="ProductFindProductWithIdValue"/> <set field="idValue" from-field="parameters.idValue"/> <entity-one entity-name="Product" value-field="idProduct" auto-field-map="false"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |