svn commit: r531390 [1/2] - in /ofbiz/trunk/applications/acco
Locked
svn commit: r531390 [1/2] - in /ofbiz/trunk/applications/acco
 
|
Author: jacopoc
Date: Mon Apr 23 02:12:50 2007 New Revision: 531390 URL: http://svn.apache.org/viewvc?view=rev&rev=531390 Log: A lot of layout improvements to the accounting application by Adrian Crum: OFBIZ-915 Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/EditGlobalGlAccount.ftl ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/FindGlobalGlAccount.ftl ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/Menus.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl Mon Apr 23 02:12:50 2007 @@ -16,12 +16,13 @@ specific language governing permissions and limitations under the License. --> -<#assign unselectedClassName = "buttontext"> -<#assign selectedClassMap = {page.checksTabButtonItem?default("void") : "buttontext"}> - <#if organizationPartyId?has_content> - <div class='tabContainer'> - <a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.PrintChecksTabButton?default(unselectedClassName)}">${uiLabelMap.AccountingPrintChecks}</a> - <a href="<@ofbizUrl>listChecksToSend?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.SendChecksTabButton?default(unselectedClassName)}">${uiLabelMap.AccountingSendChecks}</a> + <#assign selected = page.checksTabButtonItem?default("void")> + <div class="button-bar button-style-1"> + <ul> + <li<#if selected == "PrintChecksTabButton"> class="selected"</#if>><a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPrintChecks}</a></li> + <li<#if selected == "SendChecksTabButton"> class="selected"</#if>><a href="<@ofbizUrl>listChecksToSend?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingSendChecks}</a></li> + </ul> + <br class="clear"/> </div> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Mon Apr 23 02:12:50 2007 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> <form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties"> - <field name="partyId" title="${uiLabelMap.AccountingCompanies}" widget-style="tabletext"><display-entity entity-name="PartyGroup" description="${groupName}"/></field> + <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field> <field name="admin" title="${uiLabelMap.AccountingAdmin}"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAdmin}"/></field> <field name="accounts" title="${uiLabelMap.AccountingAccounts}"><hyperlink target="ListGlAccountOrganization?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounts}"/></field> </form> @@ -312,8 +312,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> <!-- forms for payment method Type to GLAccounts --> - <form name="ListPaymentMethodTypeGlAssignments" type="list" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + <form name="ListPaymentMethodTypeGlAssignments" type="list"> <actions> <entity-condition entity-name="PaymentMethodTypeGlAccount"> <condition-expr field-name="organizationPartyId" operator="equals" value="${organizationPartyId}"/> @@ -356,7 +355,7 @@ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> </field> - <field name="amount" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> + <field name="amount" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="effectiveDate"><display/></field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> <field name="submitButton" title="${uiLabelMap.CommonPrint}" widget-style="smallSubmit"> @@ -371,7 +370,7 @@ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/> </field> - <field name="amount" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> + <field name="amount" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="effectiveDate"><display/></field> <field name="paymentRefNum"><text/></field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl Mon Apr 23 02:12:50 2007 @@ -16,26 +16,30 @@ specific language governing permissions and limitations under the License. --> -<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#if (parameters.organizationPartyId)?exists><#assign organizationPartyId = parameters.organizationPartyId></#if> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> -<div class="head1">${title?if_exists} ${labelTitleProperty?if_exists} ${uiLabelMap.CommonFor} ${uiLabelMap.Organization}: ${organizationPartyId}</div> -<div class="tabContainer"> - <a href="<@ofbizUrl>TimePeriods?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.TimePeriods?default(unselectedClassName)}">${uiLabelMap.TimePeriod}</a> - <a href="<@ofbizUrl>PartyAcctgPreference?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.PartyAcctgPreference?default(unselectedClassName)}">${uiLabelMap.AccountingPreference}</a> - <a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ChecksTabButton?default(unselectedClassName)}">${uiLabelMap.AccountingChecks}</a> - <a href="<@ofbizUrl>viewFXConversions?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ViewFXConversions?default(unselectedClassName)}">${uiLabelMap.AccountingFX}</a> - <a href="<@ofbizUrl>EditGlJournalEntry?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.EditGlJournalEntry?default(unselectedClassName)}">${uiLabelMap.AccountingManualJournalEntry}</a> - <a href="<@ofbizUrl>ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ListUnpostedAcctgTrans?default(unselectedClassName)}">${uiLabelMap.AccountingManualPostTrans}</a> - <a href="<@ofbizUrl>GlAccountAssignment?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.GlAccountAssignment?default(unselectedClassName)}">${uiLabelMap.AccountingGlAccountDefault}</a> +<#assign selected = page.tabButtonItem?default("void")> +<h1>${title?if_exists} ${labelTitleProperty?if_exists} ${uiLabelMap.CommonFor} ${uiLabelMap.Organization}: ${organizationPartyId}</h1> +<div class="button-bar button-style-1"> + <ul> + <li<#if selected == "TimePeriods"> class="selected"</#if>><a href="<@ofbizUrl>TimePeriods?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.TimePeriod}</a></li> + <li<#if selected == "PartyAcctgPreference"> class="selected"</#if>><a href="<@ofbizUrl>PartyAcctgPreference?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPreference}</a></li> + <li<#if selected == "ChecksTabButton"> class="selected"</#if>><a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingChecks}</a></li> + <li<#if selected == "ViewFXConversions"> class="selected"</#if>><a href="<@ofbizUrl>viewFXConversions?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingFX}</a></li> + <li<#if selected == "EditGlJournalEntry"> class="selected"</#if>><a href="<@ofbizUrl>EditGlJournalEntry?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingManualJournalEntry}</a></li> + <li<#if selected == "ListUnpostedAcctgTrans"> class="selected"</#if>><a href="<@ofbizUrl>ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingManualPostTrans}</a></li> + <li<#if selected == "GlAccountAssignment"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountAssignment?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingGlAccountDefault}</a></li> + </ul> + <br class="clear"/> </div> -<#if (page.tabButtonItem)?exists && page.tabButtonItem == "GlAccountAssignment"> -<div> - <a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingInvoiceSales}]</a> - <a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingInvoicePurchase}]</a> - <a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}]</a> - <a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}]</a> -</div> -<br/> +<#if selected == "GlAccountAssignment"> + <div class="button-bar button-style-2"> + <ul> + <li><a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoiceSales}</a></li> + <li><a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoicePurchase}</a></li> + <li><a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}</a></li> + <li><a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}</a></li> + </ul> + <br class="clear"/> + </div> + <br/> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl Mon Apr 23 02:12:50 2007 @@ -19,7 +19,7 @@ <#-- TODO: probably some kind of permission checking to see that this userLogin can view such and such reports --> -<div class="tabletext"> +<div> <script language="javascript"> function submitReconcile(form) { Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Mon Apr 23 02:12:50 2007 @@ -177,7 +177,7 @@ <field name="termTypeId" title="${uiLabelMap.AccountingTermTypeId}"> <display-entity entity-name="TermType"/> </field> - <field name="invoiceItemTypeId" widget-style="selectBox"> + <field name="invoiceItemTypeId"> <drop-down allow-empty="true"> <entity-options entity-name="InvoiceItemType" description="${description}"> <entity-order-by field-name="description"/> @@ -199,7 +199,7 @@ </field> <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field> <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field> - <field name="invoiceItemTypeId" widget-style="selectBox"> + <field name="invoiceItemTypeId"> <drop-down allow-empty="true"> <entity-options entity-name="InvoiceItemType" description="${description}"> <entity-order-by field-name="description"/> @@ -221,7 +221,7 @@ </field> <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field> <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field> - <field name="invoiceItemTypeId" widget-style="selectBox"> + <field name="invoiceItemTypeId"> <drop-down allow-empty="true"> <entity-options entity-name="InvoiceItemType" description="${description}"> <entity-order-by field-name="description"/> @@ -242,7 +242,7 @@ <field name="internalName" entry-name="productId"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/> </field> - <field name="price" widget-area-style="tabletextright"><display/></field> + <field name="price" widget-area-style="align-text"><display/></field> <field name="deleteLink" title="" widget-style="buttontext"> <hyperlink target="removeAgreementItemProduct?productId=${productId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}" description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/> </field> @@ -261,8 +261,7 @@ <field name="agreementItemSeqId"><display/></field> <field name="currencyUomId"><display/></field> </form> - <form name="ListAgreementItemProductsForReport" list-name="agreementProducts" target="" title="" type="list" - default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"> + <form name="ListAgreementItemProductsForReport" list-name="agreementProducts" target="" title="" type="list"> <field name="productId" title-area-style="tableheadmedium"><display/></field> <field name="internalName" entry-name="productId"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl Mon Apr 23 02:12:50 2007 @@ -16,24 +16,29 @@ specific language governing permissions and limitations under the License. --> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> +<#assign selected = page.tabButtonItem?default("void")> <#if agreement?has_content> - <div class="tabContainer"> - <a href="<@ofbizUrl>EditAgreement?agreementId=${agreement.agreementId}</@ofbizUrl>" class="${selectedClassMap.EditAgreement?default(unselectedClassName)}">${uiLabelMap.AccountingAgreement}</a> - <a href="<@ofbizUrl>EditAgreementTerms?agreementId=${agreement.agreementId}</@ofbizUrl>" class="${selectedClassMap.EditAgreementTerms?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementTerms}</a> - <a href="<@ofbizUrl>ListAgreementItems?agreementId=${agreement.agreementId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItems?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementItems}</a> - </div> + <div class="button-bar button-style-1"> + <ul> + <li<#if selected == "EditAgreement"> class="selected"</#if>><a href="<@ofbizUrl>EditAgreement?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreement}</a></li> + <li<#if selected == "EditAgreementTerms"> class="selected"</#if>><a href="<@ofbizUrl>EditAgreementTerms?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementTerms}</a></li> + <li<#if selected == "ListAgreementItems"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementItems?agreementId=${agreement.agreementId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementItems}</a></li> + </ul> + <br class="clear"/> + </div> </#if> <#if agreementItem?has_content> - <div class="tabContainer"> - <a href="<@ofbizUrl>EditAgreementItem?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.EditAgreementItem?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementItem}</a> - <a href="<@ofbizUrl>ListAgreementPromoAppls?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementPromoAppls?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementPromoAppls}</a> - <a href="<@ofbizUrl>ListAgreementItemTerms?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItemTerms?default(unselectedClassName)}">${uiLabelMap.AccountingAgreementItemTerms}</a> - <a href="<@ofbizUrl>ListAgreementItemProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItemProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a> - <a href="<@ofbizUrl>ListAgreementItemParties?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementItemParties?default(unselectedClassName)}">${uiLabelMap.Party}</a> - <a href="<@ofbizUrl>ListAgreementGeographicalApplic?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>" class="${selectedClassMap.ListAgreementGeographicalApplic?default(unselectedClassName)}">${uiLabelMap.CommonGeo}</a> - </div> + <div class="button-bar button-style-1"> + <ul> + <li<#if selected == "EditAgreementItem"> class="selected"</#if>><a href="<@ofbizUrl>EditAgreementItem?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementItem}</a></li> + <li<#if selected == "ListAgreementPromoAppls"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementPromoAppls?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementPromoAppls}</a></li> + <li<#if selected == "ListAgreementItemTerms"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementItemTerms?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>">${uiLabelMap.AccountingAgreementItemTerms}</a></li> + <li<#if selected == "ListAgreementItemProducts"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementItemProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>">${uiLabelMap.ProductProducts}</a></li> + <li<#if selected == "ListAgreementItemParties"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementItemParties?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>">${uiLabelMap.Party}</a></li> + <li<#if selected == "ListAgreementGeographicalApplic"> class="selected"</#if>><a href="<@ofbizUrl>ListAgreementGeographicalApplic?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}</@ofbizUrl>">${uiLabelMap.CommonGeo}</a></li> + </ul> + <br class="clear"/> + </div> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl Mon Apr 23 02:12:50 2007 @@ -17,14 +17,14 @@ under the License. --> <#if agreement?exists> -<form action="<@ofbizUrl>copyAgreement</@ofbizUrl>" method="post" style="margin: 0;"> +<form action="<@ofbizUrl>copyAgreement</@ofbizUrl>" method="post"> <input type="hidden" name="agreementId" value="${agreementId}"/> - <div class="tabletext"> + <div> <b>${uiLabelMap.AccountingCopyAgreement}:</b> - ${uiLabelMap.AccountingAgreementTerms} <input type="checkbox" class="checkBox" name="copyAgreementTerms" value="Y" checked/> - ${uiLabelMap.ProductProducts} <input type="checkbox" class="checkBox" name="copyAgreementProducts" value="Y" checked/> - ${uiLabelMap.Party} <input type="checkbox" class="checkBox" name="copyAgreementParties" value="Y" checked/> + ${uiLabelMap.AccountingAgreementTerms} <input type="checkbox" name="copyAgreementTerms" value="Y" checked/> + ${uiLabelMap.ProductProducts} <input type="checkbox" name="copyAgreementProducts" value="Y" checked/> + ${uiLabelMap.Party} <input type="checkbox" name="copyAgreementParties" value="Y" checked/> </div> - <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonCopy}"/> + <input type="submit" value="${uiLabelMap.CommonCopy}"/> </form> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl Mon Apr 23 02:12:50 2007 @@ -17,28 +17,26 @@ under the License. --> -<div class="head1">${uiLabelMap.AccountingBillingAccountPayments}</div> - +<h1>${uiLabelMap.AccountingBillingAccountPayments}</h1> <br/> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.AccountingPayment} #</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonType}</div></td> - <td><div class="tableheadtext">${uiLabelMap.AccountingInvoice} #</div></td> - <td><div class="tableheadtext">${uiLabelMap.AccountingInvoiceItem}</div></td> - <td><div class="tableheadtext">${uiLabelMap.AccountingPaymentDate}</div></td> - <td align="right"><div class="tableheadtext">${uiLabelMap.AccountingAmount}</div></td> +<table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.AccountingPayment} #</td> + <td>${uiLabelMap.CommonType}</td> + <td>${uiLabelMap.AccountingInvoice} #</td> + <td>${uiLabelMap.AccountingInvoiceItem}</td> + <td>${uiLabelMap.AccountingPaymentDate}</td> + <td class="align-text">${uiLabelMap.AccountingAmount}</td> </tr> - <tr><td colspan="6"><hr class="sepbar"></td></tr> <#list payments as payment> <#assign paymentMethodType = payment.getRelatedOne("PaymentMethodType")> <tr> - <td><div class="tabletext">${payment.paymentId?if_exists}</div></td> - <td><div class="tabletext">${paymentMethodType.get("description",locale)?default(uiLabelMap.CommonNA)}</div></td> - <td><div class="tabletext">${payment.invoiceId?default(uiLabelMap.CommonNA)}</div></td> - <td><div class="tabletext">${payment.invoiceItemSeqId?default(uiLabelMap.CommonNA)}</div></td> - <td><div class="tabletext">${payment.effectiveDate?string}</div></td> - <td align="right"><div class="tabletext"><@ofbizCurrency amount=payment.amountApplied isoCode=payment.currencyUomId?if_exists/> of <@ofbizCurrency amount=payment.amount isoCode=payment.currencyUomId?if_exists/></div></td> + <td>${payment.paymentId?if_exists}</td> + <td>${paymentMethodType.get("description",locale)?default(uiLabelMap.CommonNA)}</td> + <td>${payment.invoiceId?default(uiLabelMap.CommonNA)}</td> + <td>${payment.invoiceItemSeqId?default(uiLabelMap.CommonNA)}</td> + <td>${payment.effectiveDate?string}</td> + <td class="align-text"><@ofbizCurrency amount=payment.amountApplied isoCode=payment.currencyUomId?if_exists/> of <@ofbizCurrency amount=payment.amount isoCode=payment.currencyUomId?if_exists/></td> </tr> </#list> </table> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl Mon Apr 23 02:12:50 2007 @@ -17,15 +17,16 @@ under the License. --> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> - <#if billingAccount?has_content> - <div class='tabContainer'> - <a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="${selectedClassMap.EditBillingAccount?default(unselectedClassName)}">${uiLabelMap.AccountingAccount}</a> - <a href="<@ofbizUrl>EditBillingAccountRoles?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="${selectedClassMap.EditBillingAccountRoles?default(unselectedClassName)}">${uiLabelMap.PartyRoles}</a> - <a href="<@ofbizUrl>EditBillingAccountTerms?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="${selectedClassMap.EditBillingAccountTerms?default(unselectedClassName)}">${uiLabelMap.PartyTerms}</a> - <a href="<@ofbizUrl>BillingAccountInvoices?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="${selectedClassMap.BillingAccountInvoices?default(unselectedClassName)}">${uiLabelMap.AccountingInvoices}</a> - <a href="<@ofbizUrl>BillingAccountPayments?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="${selectedClassMap.BillingAccountPayments?default(unselectedClassName)}">${uiLabelMap.AccountingPayments}</a> - </div> + <#assign selected = page.tabButtonItem?default("void")> + <div class="button-bar button-style-1"> + <ul> + <li<#if selected == "EditBillingAccount"> class="selected"</#if>><a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.AccountingAccount}</a></li> + <li<#if selected == "EditBillingAccountRoles"> class="selected"</#if>><a href="<@ofbizUrl>EditBillingAccountRoles?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.PartyRoles}</a></li> + <li<#if selected == "EditBillingAccountTerms"> class="selected"</#if>><a href="<@ofbizUrl>EditBillingAccountTerms?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.PartyTerms}</a></li> + <li<#if selected == "BillingAccountInvoices"> class="selected"</#if>><a href="<@ofbizUrl>BillingAccountInvoices?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.AccountingInvoices}</a></li> + <li<#if selected == "BillingAccountPayments"> class="selected"</#if>><a href="<@ofbizUrl>BillingAccountPayments?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.AccountingPayments}</a></li> + </ul> + <br class="clear"/> + </div> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl Mon Apr 23 02:12:50 2007 @@ -17,20 +17,18 @@ under the License. --> -<div class="head1">${uiLabelMap.PageTitleEditBillingAccountTerms} - ${uiLabelMap.AccountingAccountId}: ${billingAccount.billingAccountId}</div> - +<h1>${uiLabelMap.PageTitleEditBillingAccountTerms} - ${uiLabelMap.AccountingAccountId}: ${billingAccount.billingAccountId}</h1> <br/> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyTerm}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonValue}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonUom}</div></td> +<table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyTerm}</td> + <td>${uiLabelMap.CommonValue}</td> + <td>${uiLabelMap.CommonUom}</td> <td> </td> </tr> - <tr><td colspan="5"><hr class="sepbar"></td></tr> <#if !billingAccountTerms?exists || billingAccountTerms?size == 0> <tr> - <td colspan="5"><div class="tabletext">${uiLabelMap.AccountingNoBillingAccountTerm}</div></td> + <td colspan="5">${uiLabelMap.AccountingNoBillingAccountTerm}</td> </tr> <#else> <#list billingAccountTerms as term> @@ -39,12 +37,12 @@ <#assign uom = term.getRelatedOne("Uom")> </#if> <tr> - <td><div class="tabletext">${(termType.get("description",locale))?if_exists}</div></td> - <td><div class="tabletext">${term.termValue?if_exists}</div></td> - <td><div class="tabletext"><#if uom?has_content>${uom.get("description",locale)?if_exists}<#else> </#if></div></td> - <td align="right"> - <a href="<@ofbizUrl>EditBillingAccountTerms?billingAccountId=${term.billingAccountId}&billingAccountTermId=${term.billingAccountTermId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a> - <a href="<@ofbizUrl>removeBillingAccountTerm?billingAccountId=${term.billingAccountId}&billingAccountTermId=${term.billingAccountTermId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a> + <td>${(termType.get("description",locale))?if_exists}</td> + <td>${term.termValue?if_exists}</td> + <td><#if uom?has_content>${uom.get("description",locale)?if_exists}<#else> </#if></td> + <td class="button-col"> + <a href="<@ofbizUrl>EditBillingAccountTerms?billingAccountId=${term.billingAccountId}&billingAccountTermId=${term.billingAccountTermId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> + <a href="<@ofbizUrl>removeBillingAccountTerm?billingAccountId=${term.billingAccountId}&billingAccountTermId=${term.billingAccountTermId}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a> </td> </tr> </#list> @@ -53,22 +51,22 @@ <br/> <#if billingAccountTerm?has_content> - <div class="head1">${uiLabelMap.PageTitleEditBillingAccountTerms}</div> + <h1>${uiLabelMap.PageTitleEditBillingAccountTerms}</h1> <br/> <form name="billingform" method="post" action="<@ofbizUrl>updateBillingAccountTerm</@ofbizUrl>"> <input type="hidden" name="billingAccountTermId" value="${billingAccountTerm.billingAccountTermId}"> <#else> - <div class="head1">${uiLabelMap.AccountingCreateBillingAccountTerm}</div> + <h1>${uiLabelMap.AccountingCreateBillingAccountTerm}</h1> <br/> <form name="billingform" method="post" action="<@ofbizUrl>createBillingAccountTerm</@ofbizUrl>"> </#if> <input type="hidden" name="billingAccountId" value="${billingAccount.billingAccountId}"> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyTermType}</div></td> + <td width="26%" align="right" valign="top">${uiLabelMap.PartyTermType}</td> <td width="5"> </td> <td width="74%"> - <select class="selectBox" name="termTypeId"> + <select name="termTypeId"> <#list termTypes as termType> <option value="${termType.termTypeId}" <#if termData?has_content && termData.termTypeId?default("") == termType.termTypeId>SELECTED</#if>>${(termType.get("description",locale))?if_exists}</option> </#list> @@ -76,10 +74,10 @@ *</td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonUom}</div></td> + <td width="26%" align="right" valign="top">${uiLabelMap.CommonUom}</td> <td width="5"> </td> <td width="74%"> - <select class="selectBox" name="uomId"> + <select name="uomId"> <option></option> <#list uoms as uom> <option value="${uom.uomId}" <#if termData?has_content && termData.uomId?default("") == uom.uomId>SELECTED</#if>>${uom.get("description",locale)?if_exists}</option> @@ -88,15 +86,15 @@ </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyTermValue}</div></td> + <td width="26%" align="right" valign="top">${uiLabelMap.PartyTermValue}</td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" name="termValue" value="${termData.termValue?if_exists}"> + <input type="text" size="10" name="termValue" value="${termData.termValue?if_exists}"> *</td> </tr> <tr> <td width="26%" align="right" valign="top"> - <input type="submit" value="${uiLabelMap.CommonSave}" class="smallSubmit"> + <input type="submit" value="${uiLabelMap.CommonSave}"> </td> <td width="5"> </td> <td width="74%"> </td> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl Mon Apr 23 02:12:50 2007 @@ -17,49 +17,48 @@ under the License. --> -<div class="head1">${uiLabelMap.AccountingBillingAccounts}</div> -<div><a href="<@ofbizUrl>EditBillingAccount<#if (requestParameters.partyId)?has_content>?partyId=${requestParameters.partyId}&roleTypeId=BILL_TO_CUSTOMER</#if></@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingNewAccount}</a></div> +<h1>${uiLabelMap.AccountingBillingAccounts}</h1> +<div class="button-bar"><a href="<@ofbizUrl>EditBillingAccount<#if (requestParameters.partyId)?has_content>?partyId=${requestParameters.partyId}&roleTypeId=BILL_TO_CUSTOMER</#if></@ofbizUrl>" class="smallSubmit">${uiLabelMap.AccountingNewAccount}</a></div> <br/> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.AccountingAccountId}</div></td> - <td><div class="tableheadtext">${uiLabelMap.AccountingAccountLimit}</div></td> +<table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.AccountingAccountId}</td> + <td>${uiLabelMap.AccountingAccountLimit}</td> <#if billingAccountRolesByParty?has_content> <#assign colSpan = "4"> - <td><div class="tableheadtext">${uiLabelMap.PartyRoleTypeId}</div></td> + <td>${uiLabelMap.PartyRoleTypeId}</td> <#else> <#assign colSpan = "3"> </#if> <td> </td> </tr> - <tr><td colspan="${colSpan}"><hr class="sepbar"></td></tr> <#if billingAccountRolesByParty?has_content> <#list billingAccountRolesByParty as role> <#assign billingAccount = role.getRelatedOne("BillingAccount")> <#assign roleType = role.getRelatedOne("RoleType")> <tr> - <td><div class="tabletext">${billingAccount.billingAccountId}</div></td> - <td><div class="tabletext"><@ofbizCurrency amount=billingAccount.accountLimit isoCode=billingAccount.accountCurrencyUomId/></div></td> - <td><div class="tabletext">${roleType.get("description",locale)}</div></td> - <td align="right"> - <a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <td>${billingAccount.billingAccountId}</td> + <td><@ofbizCurrency amount=billingAccount.accountLimit isoCode=billingAccount.accountCurrencyUomId/></td> + <td>${roleType.get("description",locale)}</td> + <td class="button-col"> + <a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> </td> </tr> </#list> <#elseif billingAccounts?has_content> <#list billingAccounts as billingAccount> <tr> - <td><div class="tabletext">${billingAccount.billingAccountId}</div></td> - <td><div class="tabletext"><@ofbizCurrency amount=billingAccount.accountLimit isoCode=billingAccount.accountCurrencyUomId/></div></td> - <td align="right"> - <a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <td>${billingAccount.billingAccountId}</td> + <td><@ofbizCurrency amount=billingAccount.accountLimit isoCode=billingAccount.accountCurrencyUomId/></td> + <td class="button-col"> + <a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> </td> </tr> </#list> <#else> <tr> - <td colspan='3'><div class="tabletext">${uiLabelMap.AccountingNoBillingAccountFound}</div></td> + <td colspan='3'>${uiLabelMap.AccountingNoBillingAccountFound}</td> </tr> </#if> </table> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/EditGlobalGlAccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/EditGlobalGlAccount.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/EditGlobalGlAccount.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/EditGlobalGlAccount.ftl Mon Apr 23 02:12:50 2007 @@ -17,21 +17,20 @@ under the License. --> -<#assign uiLabelMap = requestAttributes.uiLabelMap> <#if hasPermission> - -<#if glAccountId?has_content> - <div class='tabContainer'> - <a href="<@ofbizUrl>EditGlobalGlAccount?glAccountId=${glAccountId}</@ofbizUrl>" class="tabButtonSelected">GL Account</a> - <a href="<@ofbizUrl>EditGlobalGlAccountOrganizations?glAccountId=${glAccountId}</@ofbizUrl>" class="tabButton">Organizations</a> - <a href="<@ofbizUrl>EditGlobalGlAccountRoles?glAccountId=${glAccountId}</@ofbizUrl>" class="tabButton">Roles</a> - </div> -</#if> -<div class="head1">GL Account <span class='head2'><#if (glAccount.accountName)?has_content>"${glAccount.accountName}"</#if> [${uiLabelMap.CommonId}:${glAccountId?if_exists}]</span></div> -<a href="<@ofbizUrl>EditGlobalGlAccount</@ofbizUrl>" class="buttontext">[New Global GL Account]</a> - -${editGlAccountWrapper.renderFormString()} - + <#if glAccountId?has_content> + <div class="button-bar button-style-1"> + <ul> + <li class="selected"><a href="<@ofbizUrl>EditGlobalGlAccount?glAccountId=${glAccountId}</@ofbizUrl>">GL Account</a></li> + <li><a href="<@ofbizUrl>EditGlobalGlAccountOrganizations?glAccountId=${glAccountId}</@ofbizUrl>">Organizations</a></li> + <li><a href="<@ofbizUrl>EditGlobalGlAccountRoles?glAccountId=${glAccountId}</@ofbizUrl>">Roles</a></li> + </ul> + <br class="clear"/> + </div> + </#if> + <span class="head1">GL Account </span><span class='head2'><#if (glAccount.accountName)?has_content>"${glAccount.accountName}"</#if> [${uiLabelMap.CommonId}:${glAccountId?if_exists}]</span><br/> + <a href="<@ofbizUrl>EditGlobalGlAccount</@ofbizUrl>" class="buttontext">[New Global GL Account]</a> + ${editGlAccountWrapper.renderFormString()} <#else> <h3>${uiLabelMap.AccountingViewPermissionError}</h3> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/FindGlobalGlAccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/FindGlobalGlAccount.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/FindGlobalGlAccount.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/FindGlobalGlAccount.ftl Mon Apr 23 02:12:50 2007 @@ -17,44 +17,39 @@ under the License. --> -<#assign uiLabelMap = requestAttributes.uiLabelMap> <#if hasPermission> - -<div class="head1">Find Global GL Account</div> -<div><a href="<@ofbizUrl>EditGlobalGlAccount</@ofbizUrl>" class="buttontext">[Create New Global GL Account]</a></div> -<br/> -<table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td><div class="tabletext"><b>ID</b></div></td> - <td><div class="tabletext"><b>Name</b></div></td> - <td><div class="tabletext"><b>Code</b></div></td> - <td><div class="tabletext"><b>Parent ID</b></div></td> - <td><div class="tabletext"><b>Type</b></div></td> - <td><div class="tabletext"><b>Class</b></div></td> - <td><div class="tabletext"><b>Resource</b></div></td> - <td><div class="tabletext"> </div></td> - </tr> -<#list glAccounts as glAccount> - <#assign glAccountType = glAccount.getRelatedOne("GlAccountType")> - <#assign glAccountClass = glAccount.getRelatedOne("GlAccountClass")> - <#assign glResourceType = glAccount.getRelatedOne("GlResourceType")> - <tr valign="middle"> - <td><div class="tabletext"> <a href="<@ofbizUrl>EditGlobalGlAccount?glAccountId=${glAccount.glAccountId}</@ofbizUrl>" class="buttontext">[${glAccount.glAccountId}]</a></div></td> - <td><div class="tabletext"> ${glAccount.accountName?if_exists}</div></td> - <td><div class="tabletext"> ${glAccount.accountCode?if_exists}</div></td> - <td><div class="tabletext"> ${glAccount.parentGlAccountId?if_exists}</div></td> - <td><div class="tabletext"> ${glAccountType.description?default(glAccount.glAccountTypeId)}</div></td> - <td><div class="tabletext"> ${glAccountClass.description?default(glAccount.glAccountClassId)}</div></td> - <td><div class="tabletext"> ${glResourceType.description?default(glAccount.glResourceTypeId)}</div></td> - <td> - <a href="<@ofbizUrl>EditGlobalGlAccount?glAccountId=${glAccount.glAccountId}</@ofbizUrl>" class="buttontext"> - [${uiLabelMap.CommonEdit}]</a> - </td> - </tr> -</#list> -</table> -<br/> - + <h1>Find Global GL Account</h1> + <div class="button-bar"><a href="<@ofbizUrl>EditGlobalGlAccount</@ofbizUrl>" class="smallSubmit">Create New Global GL Account</a></div> + <br/> + <table class="basic-table dark-grid" cellspacing="0"> + <tr class="header-row"> + <td>ID</td> + <td>Name</td> + <td>Code</td> + <td>Parent ID</td> + <td>Type</td> + <td>Class</td> + <td>Resource</td> + <td> </td> + </tr> + <#list glAccounts as glAccount> + <#assign glAccountType = glAccount.getRelatedOne("GlAccountType")> + <#assign glAccountClass = glAccount.getRelatedOne("GlAccountClass")> + <#assign glResourceType = glAccount.getRelatedOne("GlResourceType")> + <tr> + <td class="button-col"><a href="<@ofbizUrl>EditGlobalGlAccount?glAccountId=${glAccount.glAccountId}</@ofbizUrl>">${glAccount.glAccountId}</a></td> + <td>${glAccount.accountName?default(" ")}</td> + <td>${glAccount.accountCode?default(" ")}</td> + <td>${glAccount.parentGlAccountId?default(" ")}</td> + <td>${glAccountType.description?default(glAccount.glAccountTypeId)}</td> + <td>${glAccountClass.description?default(glAccount.glAccountClassId)}</td> + <td>${glResourceType.description?default(glAccount.glResourceTypeId)}</td> + <td class="button-col"> + <a href="<@ofbizUrl>EditGlobalGlAccount?glAccountId=${glAccount.glAccountId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> + </td> + </tr> + </#list> + </table> <#else> <h3>${uiLabelMap.AccountingViewPermissionError}</h3> </#if> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml Mon Apr 23 02:12:50 2007 @@ -22,21 +22,21 @@ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> <form name="EditGlJournalEntry" type="single" target="createGlJournalEntry" title="" default-map-name="journal"> - <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}" widget-style="selectBox"> + <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}"> <drop-down> <entity-options entity-name="AcctgTransType" description="${description}"> <entity-order-by field-name="acctgTransTypeId"/> </entity-options> </drop-down> </field> - <field name="glFiscalTypeId" widget-style="selectBox"> + <field name="glFiscalTypeId"> <drop-down> <entity-options entity-name="GlFiscalType" description="${description}"> <entity-order-by field-name="glFiscalTypeId"/> </entity-options> </drop-down> </field> - <field name="organizationPartyId" parameter-name="organizationPartyId" widget-style="selectBox"> + <field name="organizationPartyId" parameter-name="organizationPartyId"> <drop-down> <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${partyId}"> <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" --> @@ -45,14 +45,14 @@ </entity-options> </drop-down> </field> - <field name="partyId" parameter-name="partyId" widget-style="selectBox"> + <field name="partyId" parameter-name="partyId"> <drop-down> <entity-options entity-name="Party" key-field-name="partyId" description="${partyId}"> <entity-order-by field-name="partyId"/> </entity-options> </drop-down> </field> - <field name="roleTypeId" parameter-name="roleTypeId" widget-style="selectBox"> + <field name="roleTypeId" parameter-name="roleTypeId"> <drop-down> <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}"> <entity-order-by field-name="roleTypeId"/> @@ -62,14 +62,14 @@ <field name="invoiceId"><text size="20" maxlength="20"/></field> <field name="paymentId"><text size="20" maxlength="20"/></field> <field name="produtId"><text size="20" maxlength="20"/></field> - <field name="debitGlAccountId" widget-style="selectBox"> + <field name="debitGlAccountId"> <drop-down> <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId"> <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> </field> - <field name="creditGlAccountId" widget-style="selectBox"> + <field name="creditGlAccountId"> <drop-down> <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId"> <entity-order-by field-name="glAccountId"/> @@ -101,15 +101,15 @@ <!-- field name="glAccountId" title="Edit" widget-style="buttontext" --> - <field name="glAccountId" widget-style="selectBox"> + <field name="glAccountId"> <drop-down> <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}"> <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> </field> - <!-- field name="organizationPartyId" title="Party" widget-style="selectBox" --> - <field name="partyId" parameter-name="organizationPartyId" widget-style="selectBox"> + <!-- field name="organizationPartyId" title="Party" --> + <field name="partyId" parameter-name="organizationPartyId"> <drop-down> <entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" > <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" --> @@ -134,17 +134,17 @@ </actions> <!--auto-fields-entity entity-name="GlAccount" default-field-type="display"/--> - <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext" title-area-style="tableheadsmall"> + <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/> </field> - <field name="accountName" title-area-style="tableheadwide"><display/></field> + <field name="accountName"><display/></field> <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field> <field name="glAccountClassId"><display-entity entity-name="GlAccountClass"/></field> - <field name="glResourceTypeId" title-area-style="tableheadsmall"><display-entity entity-name="GlResourceType"></display-entity></field> - <field name="glXbrlClassId" title-area-style="tableheadsmall"><display-entity entity-name="GlXbrlClass"></display-entity></field> - <field name="parentGlAccountId" title-area-style="tableheadwide"><display-entity entity-name="GlAccount" description="${accountName}[${glAccountId}]" key-field-name="glAccountId"></display-entity></field> + <field name="glResourceTypeId"><display-entity entity-name="GlResourceType"></display-entity></field> + <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass"></display-entity></field> + <field name="parentGlAccountId"><display-entity entity-name="GlAccount" description="${accountName}[${glAccountId}]" key-field-name="glAccountId"></display-entity></field> <field name="accountCode"><hidden/></field> - <field name="postedBalance" widget-area-style="tabletextright" widget-style="tabletext" title-area-style="tableheadsmall"><display type="currency" currency="${defaultCurrencyUomId}"/></field> + <field name="postedBalance" widget-area-style="align-text" title-area-style="align-text"><display type="currency" currency="${defaultCurrencyUomId}"/></field> </form> <form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount"> @@ -156,35 +156,35 @@ <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too --> <field use-when="glAccount==null&&glAccountId==null" name="glAccountId"><text size="20" maxlength="20"/></field> - <field name="glAccountTypeId" widget-style="selectBox"> + <field name="glAccountTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="GlAccountType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="glAccountClassId" widget-style="selectBox"> + <field name="glAccountClassId"> <drop-down allow-empty="false"> <entity-options entity-name="GlAccountClass" description="${description}"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="glResourceTypeId" widget-style="selectBox"> + <field name="glResourceTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="GlResourceType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="glXbrlClassId" widget-style="selectBox"> + <field name="glXbrlClassId"> <drop-down allow-empty="true"> <entity-options entity-name="GlXbrlClass" description="${description}"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="parentGlAccountId" widget-style="selectBox"> + <field name="parentGlAccountId"> <drop-down allow-empty="true"> <entity-options key-field-name="glAccountId" entity-name="GlAccount" description="[${glAccountId}] ${accountName}-${accountCode}"> <entity-order-by field-name="glAccountId"/> @@ -204,7 +204,7 @@ <field name="acctgTransEntrySeqId"><display/></field> <field name="glAccountId"> <display-entity entity-name="GlAccount" description="${accountName}"> - <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}]" link-style="tabletext"/> + <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}]"/> </display-entity> </field> <field name="description"><display/></field> @@ -235,7 +235,7 @@ <field name="glAccountId"> <display-entity entity-name="GlAccount" description="${accountName}"> <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}&amp;organizationPartyId=${organizationPartyId}" - description="[${glAccountId}]" link-style="tabletext"/> + description="[${glAccountId}]"/> </display-entity> </field> <field name="reconciledBalance"><display/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl Mon Apr 23 02:12:50 2007 @@ -17,14 +17,14 @@ under the License. --> -<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> - -<div class="tabContainer"> - <a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>" class="${selectedClassMap.FindGlobalGlAccount?default(unselectedClassName)}">${uiLabelMap.AcctgChartOfAcctsTabMenu}</a> - <a href="<@ofbizUrl>GlAccountNavigate</@ofbizUrl>" class="${selectedClassMap.GlAccountNavigate?default(unselectedClassName)}">${uiLabelMap.AcctgNavigateAccts}</a> - <a href="<@ofbizUrl>AssignGlAccount</@ofbizUrl>" class="${selectedClassMap.AssignGlAccount?default(unselectedClassName)}">${uiLabelMap.AcctgAssignGlAccount}</a> - <a href="<@ofbizUrl>EditGlJournalEntry</@ofbizUrl>" class="${selectedClassMap.EditGlJournalEntry?default(unselectedClassName)}">${uiLabelMap.AcctgEditGlJournalEntry}</a> - <a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>" class="${selectedClassMap.ListGlAccountOrganization?default(unselectedClassName)}">${uiLabelMap.AcctgListGlAcctOrg}</a> +<#assign selected = page.tabButtonItem?default("void")> +<div class="button-bar button-style-1"> + <ul> + <li<#if selected == "FindGlobalGlAccount"> class="selected"</#if>><a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>">${uiLabelMap.AcctgChartOfAcctsTabMenu}</a></li> + <li<#if selected == "GlAccountNavigate"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountNavigate</@ofbizUrl>">${uiLabelMap.AcctgNavigateAccts}</a></li> + <li<#if selected == "AssignGlAccount"> class="selected"</#if>><a href="<@ofbizUrl>AssignGlAccount</@ofbizUrl>">${uiLabelMap.AcctgAssignGlAccount}</a></li> + <li<#if selected == "EditGlJournalEntry"> class="selected"</#if>><a href="<@ofbizUrl>EditGlJournalEntry</@ofbizUrl>">${uiLabelMap.AcctgEditGlJournalEntry}</a></li> + <li<#if selected == "ListGlAccountOrganization"> class="selected"</#if>><a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>">${uiLabelMap.AcctgListGlAcctOrg}</a></li> + </ul> + <br class="clear"/> </div> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Mon Apr 23 02:12:50 2007 @@ -42,11 +42,11 @@ <alt-target use-when="fixedAsset==null" target="createFixedAsset"/> <auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/> - <field use-when="fixedAsset!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> + <field use-when="fixedAsset!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="fixedAsset==null&&fixedAssetId==null" name="fixedAssetId"><text size="20" maxlength="20"/></field> <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field> - <field name="fixedAssetTypeId" widget-style="selectBox"> + <field name="fixedAssetTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="FixedAssetType" description="${description}"> <entity-order-by field-name="description"/> @@ -54,7 +54,7 @@ </drop-down> </field> <field name="instanceOfProductId" title=""><lookup target-form-name="LookupProduct"/></field> - <field name="classEnumId" widget-style="selectBox"> + <field name="classEnumId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/> @@ -63,14 +63,14 @@ </drop-down> </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPerson"/></field> - <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" widget-style="selectBox"> + <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"> <drop-down allow-empty="true"> <entity-options entity-name="RoleType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="uomId" title="${uiLabelMap.CommonUom}" widget-style="selectBox"> + <field name="uomId" title="${uiLabelMap.CommonUom}"> <drop-down allow-empty="true"> <entity-options entity-name="UomAndType" description="[${typeDescription}] ${description}"> <entity-order-by field-name="uomTypeId"/> @@ -78,7 +78,7 @@ </drop-down> </field> <!--<field name="calendarId"><hidden/></field>--> <!-- not show, can better be maintained by the system --> - <field name="calendarId" widget-style="selectBox"> + <field name="calendarId"> <drop-down allow-empty="true"> <entity-options entity-name="TechDataCalendar" description="[${calendarId}] ${description}"> <entity-order-by field-name="calendarId"/> @@ -96,10 +96,10 @@ <form name="ListFixedAssetProducts" type="list" list-name="fixedAssetProducts" target="updateFixedAssetProduct"> - <field name="productId" title="${uiLabelMap.AccountingProduct}" widget-style="tabletext"><display-entity entity-name="Product" description="${description}[${productId}]"/></field> - <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}" widget-style="tabletext"><display-entity entity-name="FixedAssetProductType"/></field> + <field name="productId" title="${uiLabelMap.AccountingProduct}"><display-entity entity-name="Product" description="${description}[${productId}]"/></field> + <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"><date-time/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="fixedAssetId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> @@ -115,14 +115,14 @@ <field name="fixedAssetId"><hidden/></field> <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> - <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductTypeId}" widget-style="selectBox"> + <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductTypeId}"> <drop-down allow-empty="true"> <entity-options entity-name="FixedAssetProductType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="quantityUomId" widget-style="selectBox"> + <field name="quantityUomId"> <drop-down allow-empty="true"> <entity-options entity-name="UomAndType" key-field-name="uomId" description="[${typeDescription}] ${description}"> <entity-order-by field-name="uomTypeId"/> @@ -233,7 +233,7 @@ </actions> <auto-fields-service service-name="updateFixedAssetIdent"/> <field name="fixedAssetId"><hidden/></field> - <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}" widget-style="tabletext"> + <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}"> <display-entity entity-name="FixedAssetIdentType"/> </field> <field name="idValue" title="${uiLabelMap.AccountingFixedAssetIdentIdValue}"/> @@ -268,7 +268,7 @@ </actions> <auto-fields-service service-name="updateFixedAssetRegistration"/> <field name="fixedAssetId"><hidden/></field> - <field name="fromDate" widget-style="tabletext"><display/></field> + <field name="fromDate"><display/></field> <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20" /></field> <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20" /></field> <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl Mon Apr 23 02:12:50 2007 @@ -17,33 +17,29 @@ under the License. --> -<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> -<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if> -<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if> -<#assign unselectedLeftClassName = "headerButtonLeft"> -<#assign unselectedRightClassName = "headerButtonRight"> -<#assign selectedLeftClassMap = {page.headerItem?default("void") : "headerButtonLeftSelected"}> -<#assign selectedRightClassMap = {page.headerItem?default("void") : "headerButtonRightSelected"}> +<#assign selected = page.headerItem?default("void")> -<div class="apptitle">${uiLabelMap.AccountingManagerApplication}</div> -<div class="row"> - <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.AccountingMainMenu}</a></div> - <div class="col"><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>" class="${selectedLeftClassMap.agreement?default(unselectedLeftClassName)}">${uiLabelMap.AccountingAgreements}</a></div> - <div class="col"><a href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>" class="${selectedLeftClassMap.billingaccount?default(unselectedLeftClassName)}">${uiLabelMap.AccountingBillingMenu}</a></div> - <div class="col"><a href="<@ofbizUrl>findInvoices</@ofbizUrl>" class="${selectedLeftClassMap.invoices?default(unselectedLeftClassName)}">${uiLabelMap.AccountingInvoicesMenu}</a></div> - <div class="col"><a href="<@ofbizUrl>findPayments</@ofbizUrl>" class="${selectedLeftClassMap.payments?default(unselectedLeftClassName)}">${uiLabelMap.AccountingPaymentsMenu}</a></div> - <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> - <div class="col"><a href="<@ofbizUrl>FindGatewayResponses</@ofbizUrl>" class="${selectedLeftClassMap.transaction?default(unselectedLeftClassName)}">${uiLabelMap.AccountingTransactions}</a></div> - </#if> - <div class="col"><a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>" class="${selectedLeftClassMap.chartofaccounts?default(unselectedLeftClassName)}">${uiLabelMap.AccountingChartOfAcctsMenu}</a></div> - <div class="col"><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>" class="${selectedLeftClassMap.ListFixedAssets?default(unselectedLeftClassName)}">${uiLabelMap.AccountingFixedAssets}</a></div> - <div class="col"><a href="<@ofbizUrl>FindTaxAuthority</@ofbizUrl>" class="${selectedLeftClassMap.TaxAuthorities?default(unselectedLeftClassName)}">${uiLabelMap.AccountingTaxAuthorities}</a></div> - <div class="col"><a href="<@ofbizUrl>ListCompanies</@ofbizUrl>" class="${selectedLeftClassMap.companies?default(unselectedLeftClassName)}">${uiLabelMap.AccountingCompanies}</a></div> - <div class="col"><a href="<@ofbizUrl>FindFinAccount</@ofbizUrl>" class="${selectedLeftClassMap.FindFinAccount?default(unselectedLeftClassName)}">${uiLabelMap.AccountingFinAccount}</a></div> - <#if userLogin?has_content> - <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div> - <#else> - <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div> - </#if> - <div class="col-fill"> </div> +<div id="app-navigation"> + <h2>${uiLabelMap.AccountingManagerApplication}</h2> + <ul> + <li<#if selected == "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li> + <li<#if selected == "agreement"> class="selected"</#if>><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>">${uiLabelMap.AccountingAgreements}</a></li> + <li<#if selected == "billingaccount"> class="selected"</#if>><a href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>">${uiLabelMap.AccountingBillingMenu}</a></li> + <li<#if selected == "invoices"> class="selected"</#if>><a href="<@ofbizUrl>findInvoices</@ofbizUrl>">${uiLabelMap.AccountingInvoicesMenu}</a></li> + <li<#if selected == "payments"> class="selected"</#if>><a href="<@ofbizUrl>findPayments</@ofbizUrl>">${uiLabelMap.AccountingPaymentsMenu}</a></li> + <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> + <li<#if selected == "transaction"> class="selected"</#if>><a href="<@ofbizUrl>FindGatewayResponses</@ofbizUrl>">${uiLabelMap.AccountingTransactions}</a></li> + </#if> + <li<#if selected == "chartofaccounts"> class="selected"</#if>><a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>">${uiLabelMap.AccountingChartOfAcctsMenu}</a></li> + <li<#if selected == "ListFixedAssets"> class="selected"</#if>><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingFixedAssets}</a></li> + <li<#if selected == "TaxAuthorities"> class="selected"</#if>><a href="<@ofbizUrl>FindTaxAuthority</@ofbizUrl>">${uiLabelMap.AccountingTaxAuthorities}</a></li> + <li<#if selected == "companies"> class="selected"</#if>><a href="<@ofbizUrl>ListCompanies</@ofbizUrl>">${uiLabelMap.AccountingCompanies}</a></li> + <li<#if selected == "FindFinAccount"> class="selected"</#if>><a href="<@ofbizUrl>FindFinAccount</@ofbizUrl>">${uiLabelMap.AccountingFinAccount}</a></li> + <#if userLogin?has_content> + <li class="opposed"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> + <#else> + <li class="opposed"><a href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> + </#if> + </ul> + <br class="clear"/> </div> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Mon Apr 23 02:12:50 2007 @@ -76,13 +76,13 @@ </field> <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field> <field name="invoiceDate"><display/></field> - <field name="statusId" widget-style="tabletext"><display-entity entity-name="StatusItem" description="${description}"/></field> + <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="description"><display/></field> <field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field> <field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field> <field name="invoiceDate"><display description="${bsh:invoiceDate.toString().substring(0,10)}"/></field> - <field name="total" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> - <field name="amountToApply" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> + <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> + <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> </form> <form name="invoiceHeader" type="single" title="Invoice header information" default-map-name="invoice"> @@ -129,14 +129,14 @@ <field name="invoiceId"><hidden/></field> <field name="invoiceItemSeqId"><display/></field> <field name="invoiceItemTypeId"><display-entity description="${description}" entity-name="InvoiceItemType"/></field> - <field name="inventoryItemId" widget-area-style="tabletextright"><display/></field> - <field name="quantity" widget-area-style="tabletextright"><display/></field> - <field name="amount" widget-area-style="tabletextright" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> - <field name="amount" widget-area-style="tabletextright" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> - <field name="total" widget-style="tabletext" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> - <field name="total" widget-style="tabletext" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> + <field name="inventoryItemId" widget-area-style="align-text"><display/></field> + <field name="quantity" widget-area-style="align-text"><display/></field> + <field name="amount" widget-area-style="align-text" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> + <field name="amount" widget-area-style="align-text" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> + <field name="total" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> + <field name="total" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> <field name="productId" widget-style="linktext"><hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/></field> - <field name="overrideGlAccountId" widget-area-style="tabletextright"><hyperlink target="GlAccountNavigate?glAccountId=${overrideGlAccountId}" description="${overrideGlAccountId}"/></field> + <field name="overrideGlAccountId" widget-area-style="align-text"><hyperlink target="GlAccountNavigate?glAccountId=${overrideGlAccountId}" description="${overrideGlAccountId}"/></field> <field name="overrideGlAccountId"><hidden/></field> <field name="uomId"><hidden/></field> </form> @@ -162,15 +162,14 @@ <field name="invoiceItemSeqId"><display/></field> <field name="productId"><display/></field> <field name="description"><display/></field> - <field name="total" widget-area-style="tabletextright"><display type="currency" currency="${invoice.currencyUomId}"/></field> + <field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field> <field name="invoiceId"><hidden/></field> <field name="paymentId" widget-style="linktext"><hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/></field> <field name="billingAccountId"><hidden/></field> <field name="paymentApplicationId"><hidden/></field> - <field name="amountApplied" widget-area-style="tabletextright"><display type="currency" currency="${invoice.currencyUomId}"/></field> + <field name="amountApplied" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field> </form> - <form name="AcctgTransAndEntries" type="list" title="Accounting Transactions" list-name="AcctgTransAndEntries" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + <form name="AcctgTransAndEntries" type="list" title="Accounting Transactions" list-name="AcctgTransAndEntries"> <actions> <entity-condition entity-name="AcctgTransAndEntries"> <condition-expr field-name="invoiceId" env-name="invoiceId"/> @@ -186,7 +185,7 @@ <field name="invoiceId"><hidden/></field> <field position="1" name="invoiceDate"><date-time/></field> <field position="2" name="dueDate"><date-time/></field> - <field position="1" name="invoiceTypeId" title-style="tabletext" widget-style="tabletext" use-when="invoice!=null"><display-entity entity-name="InvoiceType" description="${description}"/></field> + <field position="1" name="invoiceTypeId" use-when="invoice!=null"><display-entity entity-name="InvoiceType" description="${description}"/></field> <field position="1" name="invoiceTypeId" use-when="invoice==null"> <drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE"> <entity-options description="${description}" entity-name="InvoiceType"> @@ -195,7 +194,7 @@ </drop-down> </field> <field name="statusId" use-when="invoice==null"><hidden value="INVOICE_IN_PROCESS"/></field> - <field position="2" name="statusId" title-style="tabletext" widget-style="tabletext" use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field> + <field position="2" name="statusId" use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field> <field position="1" name="description"><text size="100"/></field> <field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId"><lookup target-form-name="LookupPartyName"/></field> @@ -244,8 +243,8 @@ <field name="description"><text size="30"/></field> <!--field name="overrideGlAccountId"><text size="10"/></field--> <field name="amount"><text size="7"/></field> - <field name="total" widget-area-style="tabletextright" widget-style="tabletext" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> - <field name="total" widget-area-style="tabletextright" widget-style="tabletext" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> + <field name="total" widget-area-style="align-text" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> + <field name="total" widget-area-style="align-text" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" --> <field name="uomId"><hidden/></field> <field name="taxableFlag"><hidden/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field> @@ -298,7 +297,7 @@ <form name="ListInvoiceStatus" list-name="invoiceStatus" target="" title="" type="list" paginate-target="ListInvoiceStatus"> <field name="invoiceId"><hidden/></field> <field name="statusDate"><display description="${bsh:statusDate.toString().substring(0,10)}"/></field> - <field name="statusId" widget-style="tabletext"><display-entity entity-name="StatusItem" description="${description}"/></field> + <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> </form> <form name="EditInvoiceApplications" type="list" list-name="invoiceApplications" default-entity-name="invoiceItem" use-row-submit="true" target="updateInvoiceApplication" title="Apply payments to invoices" separate-columns="false"> @@ -307,12 +306,12 @@ <field name="invoiceItemSeqId"><display/></field> <field name="productId"><display/></field> <field name="description"><display/></field> - <field name="total" widget-style="tabletext" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> - <field name="total" widget-style="tabletext" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> + <field name="total" use-when="uomId!=null"><display type="currency" currency="${uomId}"/></field> + <field name="total" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> <field name="invoiceId"><hidden/></field> - <field name="paymentId" widget-style="inputBox"><lookup target-form-name="LookupPayment"/></field> + <field name="paymentId"><lookup target-form-name="LookupPayment"/></field> <field name="billingAccountId"><hidden/></field> - <field name="amountToApply" widget-style="inputBox"><text size="10" disabled="true"/></field> + <field name="amountToApply"><text size="10" disabled="true"/></field> <field name="updateButton" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="" widget-style="buttontext" use-when="paymentApplicationId!=null"> <hyperlink description="${uiLabelMap.CommonRemove}" target="removeInvoiceApplication?paymentApplicationId=${paymentApplicationId}&invoiceId=${invoiceId}"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl?view=diff&rev=531390&r1=531389&r2=531390 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl Mon Apr 23 02:12:50 2007 @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<div class="tabletext"> +<div> <table> <tr> <td colspan="3"><h1 class="head1">${uiLabelMap.AccountingAgreements}</h1></td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |