svn commit: r618433 - in /ofbiz/trunk/specialpurpose/oa
Locked
 
|
Author: mrisaliti
Date: Mon Feb 4 13:02:27 2008 New Revision: 618433 URL: http://svn.apache.org/viewvc?rev=618433&view=rev Log: All the Oagis forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1616) Added: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties (with props) Modified: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.properties ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml Modified: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.properties?rev=618433&r1=618432&r2=618433&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.properties Mon Feb 4 13:02:27 2008 @@ -16,22 +16,26 @@ # specific language governing permissions and limitations # under the License. ############################################################################### -#### -# OFBiz UiLabel Properties used for the product component +OagisApplication=Oagis Implementation +OagisCompanyName=OFBiz: Oagis +OagisCompanySubtitle=Part of the Open For Business Family of Open Source Software + +OagisEditMessageInfo=Edit Message Info +OagisEditMessageErrorInfo=Edit Message Error Info OagisListMessageErrorInfo=Message Error Infos OagisListMessageInfo=Message Infos -OagisNewMessageInfo = New Message Info +OagisNewMessageInfo=New Message Info OagisMessageDataFileUpload=Oagis Message DataFile Upload OagisMessageErrorInfo=Message Error Info OagisMessageInfo=Message Info OagisMessageUpload=Upload Oagis Message -OagisNewMessageErrorInfo = New Message Error Info -OagisErrorInCreatingDataForOagisMessageInfoEntity = Error in creating data for OagisMessageInfo Entity -OagisErrorInExportingMessageFromScreen = Error in exporting message from screen +OagisNewMessageErrorInfo=New Message Error Info +OagisErrorInCreatingDataForOagisMessageInfoEntity=Error in creating data for OagisMessageInfo Entity +OagisErrorInExportingMessageFromScreen=Error in exporting message from screen OagisInventoryDescription=Inventory Description OagisInventoryLevelDateTime=date/time OagisQuantityDiff=Qty Difference -PageTitleOagisInventoryMismatchNotice=Inventory Mismatch Notice +PageTitleOagisInventoryMismatchNotice=Inventory Mismatch Notice \ No newline at end of file Added: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties?rev=618433&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties (added) +++ ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties Mon Feb 4 13:02:27 2008 @@ -0,0 +1,41 @@ +############################################################################### +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +############################################################################### +OagisApplication=Implementazione Oagis +OagisCompanyName=OFBiz: Oagis +OagisCompanySubtitle=Part of the Open For Business Family of Open Source Software + +OagisEditMessageInfo=Aggiorna Informazioni sui Messaggi +OagisEditMessageErrorInfo=Aggiorna Informazioni sui Messaggi di Errore + +OagisListMessageErrorInfo=Informazioni sui Messaggi di Errore +OagisListMessageInfo=Informazioni sui Messaggi +OagisNewMessageInfo=Nuove Informazioni sui Messaggi + +OagisMessageDataFileUpload=Oagis Carica File Dati Messaggi +OagisMessageErrorInfo=Informazioni sui Messaggi di Errore +OagisMessageInfo=Informazioni sui Messaggi +OagisMessageUpload=Carica Messaggio Oagis +OagisNewMessageErrorInfo=Nuove Informazioni sui Messaggi Errori +OagisErrorInCreatingDataForOagisMessageInfoEntity=Errore nella creazioni dei dati per Entit\u00e0 OagisMessageInfo +OagisErrorInExportingMessageFromScreen=Errore nell\'esportazione del messaggio sullo schermo + +OagisInventoryDescription=Descrizione Inventario +OagisInventoryLevelDateTime=data/ora +OagisQuantityDiff=Differenza Qnt +PageTitleOagisInventoryMismatchNotice=Notizia Non Corrispondenza di Inventario \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels_it.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=618433&r1=618432&r2=618433&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Mon Feb 4 13:02:27 2008 @@ -34,18 +34,19 @@ <div class="boxhead">${uiLabelMap.OagisInventoryDescription}<b></b></div> </div> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0"> - <tr align="left" valign="bottom"> - <td width="10%" align="left"><span class="tableheadtext"><b>${uiLabelMap.EcommerceProduct}</b></span></td> - <td width="10%" align="center"><span class="tableheadtext"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQuantity} (Message)</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OagisQuantityDiff}.</b></span></td> + <table class="basic-table" cellspacing="0"> + <tr align="left" valign="bottom" class="header-row"> + <td width="10%" align="left"><b>${uiLabelMap.EcommerceProduct}</b></td> + <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td> + <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td> + <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td> + <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td> + <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td> </tr> - <tr><td colspan="10"><hr class="sepbar"/></td></tr> + <tr><td colspan="10"><hr/></td></tr> + <#assign alt_row = false> <#list inventoryMapList as inventoryMap> - <tr> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td align="left" valign="top"> ${inventoryMap.productId?if_exists}</td> <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td> <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td> @@ -53,9 +54,11 @@ <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td> <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td> </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> </#list> - <tr><td colspan="10"><hr class="sepbar"/></td></tr> + <tr><td colspan="10"><hr/></td></tr> </table> </div> </body> -</html> +</html> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml?rev=618433&r1=618432&r2=618433&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/widget/CommonScreens.xml Mon Feb 4 13:02:27 2008 @@ -29,11 +29,10 @@ <!-- The two default (global) stylesheets are added to the list of stylesheets to the first and second position --> <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/> - <set field="layoutSettings.companyName" value="Ofbiz Oagis" global="true"/> - <set field="layoutSettings.companySubtitle" value="Ofbiz Oagis Impl" global="true"/> - <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, - then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. --> - <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>--> + <set field="layoutSettings.companyName" value="OFBiz Oagis" global="true"/> + <set field="layoutSettings.companySubtitle" value="OFBiz Oagis Impl" global="true"/> + <set field="layoutSettings.companyName" from-field="uiLabelMap.OagisCompanyName" global="true"/> + <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.OagisCompanySubtitle" global="true"/> <set field="activeApp" value="oagis" global="true"/> <set field="applicationMenuName" value="OagisAppBar" global="true"/> <set field="applicationMenuLocation" value="component://oagis/widget/Menus.xml" global="true"/> Modified: ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml?rev=618433&r1=618432&r2=618433&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/widget/Menus.xml Mon Feb 4 13:02:27 2008 @@ -20,7 +20,8 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="OagisAppBar" default-menu-item-name="task" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="Oagis Implementation"> + <menu name="OagisAppBar" default-menu-item-name="task" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" + default-selected-style="selected" title="${uiLabelMap.OagisApplication}"> <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item> <menu-item name="MessageInfos" title="${uiLabelMap.OagisMessageInfo}"><link target="FindMessageInfo"/></menu-item> Modified: ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml?rev=618433&r1=618432&r2=618433&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml Mon Feb 4 13:02:27 2008 @@ -22,19 +22,45 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> <screen name="FindMessageInfo"> <section> - <actions> + <actions> + <set field="titleProperty" value="OagisListMessageInfo"/> <set field="headerItem" value="MessageInfos"/> </actions> <widgets> <decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.OagisListMessageInfo}</label></container> - <container> - <link target="EditMessageInfo" text="${uiLabelMap.OagisNewMessageInfo}" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OagisListMessageInfo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container> + <link target="EditMessageInfo" text="${uiLabelMap.OagisNewMessageInfo}" style="buttontext"/> + </container> + <label><br/></label> + <include-form name="FindMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OagisListMessageInfo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + </widgets> + </section> + </container> </container> - <label><br/></label> - <include-form name="FindMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> - <include-form name="ListMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -43,7 +69,8 @@ <screen name="EditMessageInfo"> <section> - <actions> + <actions> + <set field="titleProperty" value="OagisEditMessageInfo"/> <set field="headerItem" value="MessageInfos"/> <set field="logicalId" from-field="parameters.logicalId"/> <set field="component" from-field="parameters.component"/> @@ -54,7 +81,20 @@ <widgets> <decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditMessageInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OagisEditMessageInfo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditMessageInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -64,18 +104,44 @@ <screen name="FindMessageErrorInfo"> <section> <actions> + <set field="titleProperty" value="OagisListMessageErrorInfo"/> <set field="headerItem" value="MessageErrorInfos"/> </actions> <widgets> <decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.OagisListMessageErrorInfo}</label></container> - <container> - <link target="EditMessageErrorInfo" text="${uiLabelMap.OagisNewMessageErrorInfo}" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OagisListMessageErrorInfo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container> + <link target="EditMessageErrorInfo" text="${uiLabelMap.OagisNewMessageErrorInfo}" style="buttontext"/> + </container> + <label><br/></label> + <include-form name="FindMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OagisListMessageErrorInfo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + </widgets> + </section> + </container> </container> - <label><br/></label> - <include-form name="FindMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> - <include-form name="ListMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -84,7 +150,8 @@ <screen name="EditMessageErrorInfo"> <section> - <actions> + <actions> + <set field="titleProperty" value="OagisEditMessageErrorInfo"/> <set field="headerItem" value="MessageErrorInfos"/> <set field="logicalId" from-field="parameters.logicalId"/> <set field="component" from-field="parameters.component"/> @@ -96,7 +163,20 @@ <widgets> <decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditMessageErrorInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.OagisEditMessageErrorInfo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditMessageErrorInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -132,5 +212,4 @@ </widgets> </section> </screen> - -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml?rev=618433&r1=618432&r2=618433&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml Mon Feb 4 13:02:27 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListMessageInfos" type="list" list-name="listIt" title="" paginate-target="FindMessageInfo"> + <form name="ListMessageInfos" type="list" list-name="listIt" title="" paginate-target="FindMessageInfo" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="OagisMessageInfo"/> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> @@ -31,7 +32,8 @@ <auto-fields-entity entity-name="OagisMessageInfo" default-field-type="display"/> </form> - <form name="FindMessageInfos" type="single" target="FindMessageInfo" > + <form name="FindMessageInfos" type="single" target="FindMessageInfo" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="OagisMessageInfo" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> @@ -39,7 +41,8 @@ </field> </form> - <form name="EditMessageInfo" type="single" title="" target="updateOagisMessageInfo" default-map-name="oagisMessageInfo" paginate-target="FindMessageInfo" > + <form name="EditMessageInfo" type="single" title="" target="updateOagisMessageInfo" default-map-name="oagisMessageInfo" paginate-target="FindMessageInfo" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="oagisMessageInfo==null" target="createOagisMessageInfo"/> <auto-fields-service service-name="updateOagisMessageInfo" default-field-type="edit"/> <field name="processingStatusId"> @@ -55,7 +58,8 @@ </field> </form> - <form name="ListMessageErrorInfos" type="list" list-name="listIt" title="" paginate-target="FindMessageErrorInfo"> + <form name="ListMessageErrorInfos" type="list" list-name="listIt" title="" paginate-target="FindMessageErrorInfo" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="entityName" value="OagisMessageErrorInfo"/> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> @@ -69,7 +73,8 @@ </field> </form> - <form name="FindMessageErrorInfos" type="single" target="FindMessageErrorInfo" > + <form name="FindMessageErrorInfos" type="single" target="FindMessageErrorInfo" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="OagisMessageErrorInfo" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> @@ -77,12 +82,12 @@ </field> </form> - <form name="EditMessageErrorInfo" type="single" title="" target="updateOagisMessageErrorInfo" default-map-name="oagisMessageErrorInfo" paginate-target="FindMessageErrorInfo" > + <form name="EditMessageErrorInfo" type="single" title="" target="updateOagisMessageErrorInfo" default-map-name="oagisMessageErrorInfo" paginate-target="FindMessageErrorInfo" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="oagisMessageErrorInfo==null" target="createOagisMessageErrorInfo"/> <auto-fields-service service-name="updateOagisMessageErrorInfo" default-field-type="edit"/> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> <submit button-type="button"/> </field> - </form> - -</forms> + </form> +</forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |