Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Tue Feb 12 10:55:41 2008 @@ -56,7 +56,7 @@ <#if (numberOfItems > 0)> <#-- spacer goes here --> - <tr><td colspan="5"><hr class="sepbar"/></td></tr> + <tr><td colspan="5"><hr/></td></tr> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Tue Feb 12 10:55:41 2008 @@ -92,7 +92,7 @@ <td> </td> <td valign='middle'> <div class='tabletext' valign='top'> - <select class="selectBox" name="currencyUomId"> + <select name="currencyUomId"> <option value=""></option> <#list currencies as currency> <option value="${currency.uomId}" <#if (defaultCurrencyUomId?has_content) && (currency.uomId == defaultCurrencyUomId)>selected</#if>>${currency.uomId}</option> @@ -109,7 +109,7 @@ </td> <td> </td> <td align="left"> - <select name='CURRENT_CATALOG_ID' class='selectBox'> + <select name='CURRENT_CATALOG_ID'> <option value='${currentCatalogId}'>${currentCatalogName}</option> <option value='${currentCatalogId}'></option> <#list catalogCol as catalogId> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Tue Feb 12 10:55:41 2008 @@ -79,7 +79,7 @@ </td> <td width="5"> </td> <td width="74%"> - <select name="termTypeId" class="selectBox"> + <select name="termTypeId"> <#if termTypes?has_content> <option value=""/> <#list termTypes as termType> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Tue Feb 12 10:55:41 2008 @@ -117,7 +117,7 @@ <#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)?if_exists> <#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists> - <hr class="sepbar"/> + <hr/> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> <td colspan="3"> @@ -128,7 +128,7 @@ <td colspan="3"> <div class="tabletext"> ${uiLabelMap.PartySupplier}: - <select class="selectBox" name="${shipGroupIndex?default("0")}_supplierPartyId"> + <select name="${shipGroupIndex?default("0")}_supplierPartyId"> <option value=""></option> <#list suppliers as supplier> <option value="${supplier.partyId}"<#if supplierPartyId?exists><#if supplier.partyId == supplierPartyId> selected</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Tue Feb 12 10:55:41 2008 @@ -285,10 +285,10 @@ </field> <field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}"><display/></field> <field name="idValue" title="UPCA"><display/></field> - <field name="minimumOrderQuantity" widget-area-style="tabletextright"><display/></field> - <field name="lastPrice" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> + <field name="minimumOrderQuantity" widget-area-style="align-text"><display/></field> + <field name="lastPrice" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="requiredByDate"><display/></field> - <field name="quantity" widget-area-style="tabletextright"><display/></field> + <field name="quantity" widget-area-style="align-text"><display/></field> <field name="comments"><display/></field> </form> <form name="ApprovedProductRequirements" type="multi" use-row-submit="true" target="quickPurchaseOrderEntry" title="" list-name="requirementsForSupplier" @@ -310,12 +310,12 @@ </field> <field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}"><display/></field> <field name="idValue" title="UPCA"><display/></field> - <field name="minimumOrderQuantity" title="${uiLabelMap.FormFieldTitle_minimumOrderQuantity}" widget-area-style="tabletextright"><display/></field> - <field name="lastPrice" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> + <field name="minimumOrderQuantity" title="${uiLabelMap.FormFieldTitle_minimumOrderQuantity}" widget-area-style="align-text"><display/></field> + <field name="lastPrice" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="requiredByDate"><display/></field> - <field name="atp" title="${uiLabelMap.ProductAtp}" widget-area-style="tabletextright"><display/></field> - <field name="qoh" title="${uiLabelMap.ProductQoh}" widget-area-style="tabletextright"><display/></field> - <field name="qtySold" title="${uiLabelMap.OrderQuantitySold}" widget-area-style="tabletextright"><display/></field> + <field name="atp" title="${uiLabelMap.ProductAtp}" widget-area-style="align-text"><display/></field> + <field name="qoh" title="${uiLabelMap.ProductQoh}" widget-area-style="align-text"><display/></field> + <field name="qtySold" title="${uiLabelMap.OrderQuantitySold}" widget-area-style="align-text"><display/></field> <field name="quantity"><text size="4"/></field> <field name="comments"><display/></field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> @@ -337,7 +337,7 @@ <field name="partyId"> <display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/> </field> - <field name="productId" title="${uiLabelMap.OrderVendorRequirementCount}" widget-area-style="tabletextright"><display also-hidden="false"/></field> + <field name="productId" title="${uiLabelMap.OrderVendorRequirementCount}" widget-area-style="align-text"><display also-hidden="false"/></field> <field name="billToCustomerPartyId"> <drop-down allow-empty="false"> <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName} ${groupName} (${partyId})" key-field-name="partyId"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Tue Feb 12 10:55:41 2008 @@ -17,11 +17,11 @@ under the License. --> -<div class='tabContainer'> - <#if security.hasEntityPermission("PAYPROC", "_VIEW", session)> - <a href="<@ofbizUrl>paysetup</@ofbizUrl>" class='tabButtonSelected'>Payment Setup</a> - </#if> -</div> +<#if security.hasEntityPermission("PAYPROC", "_VIEW", session)> + <div class='button-bar button-style-1'> + <a href="<@ofbizUrl>paysetup</@ofbizUrl>" class='selected'>Payment Setup</a> + </div> +</#if> <#if security.hasEntityPermission("PAYPROC", "_VIEW", session)> <table border="0" width='100%' cellpadding='0' cellspacing=0 class='boxoutside'> @@ -136,7 +136,7 @@ <b>${webSitePayment.siteName}</b> (This cannot be changed without re-creating the setting.) </div> <#else> - <select name="webSiteId" class="selectBox"> + <select name="webSiteId"> <#list webSites as nextWebSite> <option value='${nextWebSite.webSiteId}'>${nextWebSite.siteName}</option> </#list> @@ -154,7 +154,7 @@ <b>${webSitePayment.description}</b> (This cannot be changed without re-creating the setting.) </div> <#else> - <select name="paymentMethodTypeId" class="selectBox"> + <select name="paymentMethodTypeId"> <#list paymentMethodTypes as nextPayType> <option value='${nextPayType.paymentMethodTypeId}'>${nextPayType.description}</option> </#list> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Tue Feb 12 10:55:41 2008 @@ -45,7 +45,7 @@ <decorator-screen name="CommonOrderViewDecorator"> <decorator-section name="body"> <include-screen name="orderHeader"/> - <container style="bothclear"> + <container style="clear"> <platform-specific> <html><html-template location="component://order/webapp/ordermgr/order/orderitems.ftl"/></html> </platform-specific> @@ -158,7 +158,7 @@ <decorator-screen name="CommonOrderViewDecorator"> <decorator-section name="body"> <include-screen name="orderHeader"/> - <container style="bothclear"> + <container style="clear"> <platform-specific> <html><html-template location="component://order/webapp/ordermgr/order/editorderitems.ftl"/></html> </platform-specific> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Tue Feb 12 10:55:41 2008 @@ -50,7 +50,7 @@ header-row-style="header-row" default-table-style="basic-table"> <field name="timesheetId" map-name="currentTimesheet"><hidden/></field> <field name="partyId" map-name="userLogin"><hidden/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD" > <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> @@ -167,7 +167,7 @@ <field name="timesheetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field> - <field name="roleTypeId" title="${uiLabelMap.PartyRole}" widget-style="selectBox"> + <field name="roleTypeId" title="${uiLabelMap.PartyRole}"> <drop-down> <entity-options entity-name="RoleType" description="${description}"> <entity-order-by field-name="description"/> @@ -194,7 +194,7 @@ <field name="timesheetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> @@ -228,7 +228,7 @@ <field name="timesheetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Feb 12 10:55:41 2008 @@ -470,14 +470,14 @@ <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field> - <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox"> + <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}"> <drop-down> <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"> <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/> </entity-options> </drop-down> </field> - <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox"> + <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false" current-description="${currentStatus.description}"> <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> <entity-constraint name="statusId" value="${communicationEvent.statusId}"/> @@ -696,7 +696,7 @@ <field name="workEffortId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> @@ -728,7 +728,7 @@ </field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> @@ -758,7 +758,7 @@ <field name="timesheetId"><lookup size="10" target-form-name="LookupTimesheet"/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> Modified: ofbiz/trunk/framework/common/webcommon/includes/language.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/language.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/language.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/language.ftl Tue Feb 12 10:55:41 2008 @@ -37,7 +37,7 @@ <tr> <td align='center'> <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;"> - <select name="newLocale" class="selectBox"> + <select name="newLocale"> <#assign initialDisplayName = locale.getDisplayName(locale)> <#if 18 < initialDisplayName?length> <assign initialDisplayName = initialDisplayName[0..15] + "..."> Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Tue Feb 12 10:55:41 2008 @@ -191,6 +191,7 @@ } DIV.graybox { +/* deprecated */ background-color: #CCCCCC; border: 0.1em solid #000000; font-weight: bold; @@ -201,6 +202,7 @@ } DIV.tabletexthidden { +/* deprecated */ visibility: hidden; } @@ -213,14 +215,17 @@ } .tabletextright { +/* deprecated */ text-align: right; } .tabletextcenter { +/* deprecated */ text-align: center; } .tablebuttontext { +/* deprecated */ color: #1E3C66; } @@ -310,12 +315,14 @@ /* ===== Tab/Button Bar Styles ===== */ .tabContainer { +/* deprecated */ background-color: #FFFFFF; margin-bottom: 1em; padding-top: 0.4em; } A.tabButton { +/* deprecated */ background-color: #D4D0C8; border: solid #000099 0.1em; color: #000099; @@ -966,6 +973,10 @@ margin: 0.5em 0 0.5em 0; } +.hidden { +visibility: hidden; +} + .label { /* Used for <input> element labels */ font-weight: bold; @@ -991,6 +1002,10 @@ padding: 0.1em; } +.visible { +visibility: visible; +} + /* ================================== */ /* ===== Used to align elements ===== */ /* ================================== */ @@ -1007,6 +1022,10 @@ vertical-align: top; } +.centered { +text-align: center; +} + /* ==================================== */ /* ===== Masthead (Header) Styles ===== */ /* ==================================== */ @@ -1510,12 +1529,9 @@ /* ======================== */ .basic-table { -width: 100%; -} - -.basic-table { background-color: #ffffff; color: #000000; +width: 100%; } .basic-table tr td { @@ -1604,6 +1620,10 @@ text-decoration: none; } +.basic-table .collapsed { +visibility: collapse; +} + /* ===== Table decorator - Hover bar ===== */ .hover-bar tr:hover { @@ -1643,6 +1663,47 @@ .light-grid .header-row td{ border-bottom: 0.1em solid #cccccc; border-left: 0.1em solid #cccccc; +} + +/* ===== Table decorator - Calendar ===== */ + +.calendar { +border-right: 0.1em solid #cccccc; +border-top: 0.1em solid #cccccc; +} + +.calendar tr td { +border-bottom: 0.1em solid #cccccc; +border-left: 0.1em solid #cccccc; +height: 8em; +width: 10em; +vertical-align: top; +padding: 0.5em; +} + +.calendar .header-row td { +background-color: #69a9d9; +border-bottom: 0.1em solid #cccccc; +border-left: 0.1em solid #cccccc; +color: #ffffff; +height: auto; +text-align: center; +} + +.calendar tr td .add-new { +float: right; +} + +.calendar tr td .h1 { +float: left; +} + +.calendar tr .current-period { +background-color: #ffffcc; +} + +.calendar tr .active-period { +background-color: #eeeeee; } /* ======================= */ Modified: ofbiz/trunk/framework/shark/webapp/shark/repository/showRepository.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/webapp/shark/repository/showRepository.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/framework/shark/webapp/shark/repository/showRepository.ftl (original) +++ ofbiz/trunk/framework/shark/webapp/shark/repository/showRepository.ftl Tue Feb 12 10:55:41 2008 @@ -58,6 +58,6 @@ <div> </div> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>repository?upload=xpdl</@ofbizUrl>" name="xpdlUploadForm"> <input type="file" class="inputBox" size="50" name="fname"> - <div><hr class="sepbar"></div> + <div><hr></div> <input type="submit" class="smallSubmit" value="Upload"> </form> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml Tue Feb 12 10:55:41 2008 @@ -33,7 +33,7 @@ </field> <field name="webSiteUrl"><text size="50" maxlength="250"/></field> <field name="webSiteMountPoint"><text size="30" maxlength="30" default-value="ecommerce"/></field> - <field name="actionType" widget-style="selectBox"> + <field name="actionType"> <drop-down no-current-selected-key="insert"> <option key="insert" description="${uiLabelMap.CommonInsert}"/> <option key="update" description="${uiLabelMap.CommonUpdate}"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl Tue Feb 12 10:55:41 2008 @@ -56,7 +56,7 @@ <td class="label" >${uiLabelMap.TimesheetRateType}</td> <td> <#assign rateTypes = delegator.findAll("RateType")> - <select name="rateTypeId" class="selectBox"> + <select name="rateTypeId"> <#list rateTypes as rateType> <option value="${rateType.rateTypeId}">${rateType.description}</option> </#list> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl Tue Feb 12 10:55:41 2008 @@ -34,7 +34,7 @@ <td class="label">${uiLabelMap.ProjectMgrSkillType}</td> <td> <#assign skillTypes = delegator.findAll("SkillType")> - <select name="skillTypeId" class="selectBox"> + <select name="skillTypeId"> <#list skillTypes as skillType> <option value="${skillType.skillTypeId}">${skillType.description}</option> </#list> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl Tue Feb 12 10:55:41 2008 @@ -81,7 +81,7 @@ <tr> <td class="label" >${uiLabelMap.CommonStatus}</td> <td> - <select name="currentStatusId" class="selectBox"> + <select name="currentStatusId"> <#if project?exists> <#assign currentStatus = project.getRelatedOne("CurrentStatusItem")?if_exists> <option value="${currentStatus.statusId}">${currentStatus.description}</option> @@ -112,7 +112,7 @@ <#if project?has_content> <#assign priority = project.priority?if_exists> </#if> - <select name="priority" class="selectBox" size="1"> + <select name="priority" size="1"> <#if priority?exists> <option SELECTED value="${priority}">${priority}</option> <option></option> @@ -144,7 +144,7 @@ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td> <td> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))> - <select name="scopeEnumId" class="selectBox"> + <select name="scopeEnumId"> <#if project?exists> <#assign scopeEnumId = project.scopeEnumId?if_exists> <#list enumerations as enumeration> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Tue Feb 12 10:55:41 2008 @@ -87,7 +87,7 @@ <tr> <td class="label" >${uiLabelMap.CommonStatus}</td> <td> - <select name="currentStatusId" class="selectBox"> + <select name="currentStatusId"> <#if task?exists> <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists> <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option> @@ -118,7 +118,7 @@ <#if task?has_content> <#assign priority = task.priority?if_exists> </#if> - <select name="priority" class="selectBox" size="1"> + <select name="priority" size="1"> <#if priority?exists> <option SELECTED value="${priority}">${priority}</option> <option></option> @@ -150,7 +150,7 @@ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td> <td> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))> - <select name="scopeEnumId" class="selectBox"> + <select name="scopeEnumId"> <#if task?exists> <#assign scopeEnumId = task.scopeEnumId?if_exists> <#list enumerations as enumeration> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl Tue Feb 12 10:55:41 2008 @@ -60,7 +60,7 @@ <tr> <td class="label" >${uiLabelMap.ProjectMgrWorkEffortAssocTypeId}</td> <td> - <select class="selectBox" name="workEffortAssocTypeId"> + <select name="workEffortAssocTypeId"> <#assign WorkEffortAssocTypes = delegator.findAll("WorkEffortAssocType", Static["org.ofbiz.base.util.UtilMisc"].toList("description"))> <#list WorkEffortAssocTypes as WorkEffortAssocType> <option value="${WorkEffortAssocType.workEffortAssocTypeId?if_exists}">${WorkEffortAssocType.description?if_exists}</option> @@ -112,7 +112,7 @@ <tr> <td class="label" >${uiLabelMap.CommonStatus}</td> <td> - <select name="currentStatusId" class="selectBox"> + <select name="currentStatusId"> <#if task?exists> <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists> <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option> @@ -143,7 +143,7 @@ <#if task?has_content> <#assign priority = task.priority?if_exists> </#if> - <select name="priority" class="selectBox" size="1"> + <select name="priority" size="1"> <#if priority?exists> <option SELECTED value="${priority}">${priority}</option> <option></option> @@ -175,7 +175,7 @@ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td> <td> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))> - <select name="scopeEnumId" class="selectBox"> + <select name="scopeEnumId"> <#if task?exists> <#assign scopeEnumId = task.scopeEnumId?if_exists> <#list enumerations as enumeration> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl Tue Feb 12 10:55:41 2008 @@ -79,7 +79,7 @@ <tr> <td class="label" >${uiLabelMap.CommonStatus}</td> <td> - <select name="currentStatusId" class="selectBox"> + <select name="currentStatusId"> <#if task?exists> <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists> <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option> @@ -110,7 +110,7 @@ <#if task?has_content> <#assign priority = task.priority?if_exists> </#if> - <select name="priority" class="selectBox" size="1"> + <select name="priority" size="1"> <#if priority?exists> <option SELECTED value="${priority}">${priority}</option> <option></option> @@ -142,7 +142,7 @@ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td> <td> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))> - <select name="scopeEnumId" class="selectBox"> + <select name="scopeEnumId"> <#if task?exists> <#assign currentScope = task.getRelatedOne("ScopeEnumeration")?if_exists> <option value="${currentScope.enumId}">${currentScope.description}</option> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl Tue Feb 12 10:55:41 2008 @@ -32,7 +32,7 @@ <tr> <td class="label">${uiLabelMap.ProjectMgrSkillType}</td> <td> - <select name="skillTypeId" class="selectBox"> + <select name="skillTypeId"> <#assign skillTypes = delegator.findAll("SkillType")> <#list skillTypes as skillType> <option value="${skillType.skillTypeId}">${skillType.description}</option> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Tue Feb 12 10:55:41 2008 @@ -65,7 +65,7 @@ </td> </tr> <#if note_has_next> - <tr><td colspan="3"><hr class="sepbar"></td></tr> + <tr><td colspan="3"><hr></td></tr> </#if> </#list> </table> @@ -108,7 +108,7 @@ </tr> <tr> <td/><td class="tabletext">${uiLabelMap.OrderInternalNote} : - <select class="selectBox" name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td> + <select name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td> </tr> <tr> <td/><td class="tabletext"><i>${uiLabelMap.OrderInternalNoteMessage}</i></td> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Feb 12 10:55:41 2008 @@ -194,7 +194,7 @@ </drop-down> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field> - <field name="priority" title="${uiLabelMap.CommonPriority}" widget-style="selectBox" position="1"> + <field name="priority" title="${uiLabelMap.CommonPriority}" position="1"> <drop-down allow-empty="true"> <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/> <option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/> @@ -226,7 +226,7 @@ </entity-options> </drop-down> </field> - <field name="priority" title="${uiLabelMap.CommonPriority}" widget-style="selectBox"> + <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true"> <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/> <option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/> @@ -259,7 +259,7 @@ </drop-down> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field> - <field name="priority" title="${uiLabelMap.CommonPriority}" widget-style="selectBox" position="1"> + <field name="priority" title="${uiLabelMap.CommonPriority}" position="1"> <drop-down allow-empty="true"> <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/> <option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/> @@ -461,15 +461,15 @@ <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field entry-name="statusId" name="Status"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> - <field name="priority" title="${uiLabelMap.CommonPriority}" widget-area-style="tabletextcenter"> + <field name="priority" title="${uiLabelMap.CommonPriority}" widget-area-style="centered"> <display description="${priority}"/> </field> - <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}" widget-area-style="tabletextcenter"><display type="date"/></field> - <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" widget-area-style="tabletextcenter"><display type="date"/></field> - <field name="actualStartDate" title="${uiLabelMap.ProjectMgrWorkEffortActualStartDate}" widget-area-style="tabletextcenter"><display type="date"/></field> - <field name="actualCompletionDate" title="${uiLabelMap.ProjectMgrWorkEffortActualCompletionDate}" widget-area-style="tabletextcenter"><display type="date"/></field> - <field name="plannedHours" widget-area-style="tabletextcenter"><display/></field> - <field name="actualHours" widget-area-style="tabletextcenter"><display/></field> + <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}" widget-area-style="centered"><display type="date"/></field> + <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" widget-area-style="centered"><display type="date"/></field> + <field name="actualStartDate" title="${uiLabelMap.ProjectMgrWorkEffortActualStartDate}" widget-area-style="centered"><display type="date"/></field> + <field name="actualCompletionDate" title="${uiLabelMap.ProjectMgrWorkEffortActualCompletionDate}" widget-area-style="centered"><display type="date"/></field> + <field name="plannedHours" widget-area-style="centered"><display/></field> + <field name="actualHours" widget-area-style="centered"><display/></field> <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field> <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field> </form> @@ -495,13 +495,13 @@ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> - <field name="Priority" widget-area-style="tabletextcenter"><display description="${Priority}"/></field> - <field name="EstimatedStartDate" widget-area-style="tabletextcenter"><display type="date"/></field> - <field name="EstimatedCompletionDate" widget-area-style="tabletextcenter"><display type="date"/></field> + <field name="Priority" widget-area-style="centered"><display description="${Priority}"/></field> + <field name="EstimatedStartDate" widget-area-style="centered"><display type="date"/></field> + <field name="EstimatedCompletionDate" widget-area-style="centered"><display type="date"/></field> <field name="ActualStartDate" title="startDate"><display type="date"/></field> <field name="ActualCompletionDate" title="completionDate"><display type="date"/></field> - <field name="plannedHours" widget-area-style="tabletextcenter"><display/></field> - <field name="actualHours" widget-area-style="tabletextcenter"><display/></field> + <field name="plannedHours" widget-area-style="centered"><display/></field> + <field name="actualHours" widget-area-style="centered"><display/></field> <field name="CreatedStamp" title="CreatedStamp"><display type="date"/></field> </form> <form name="AddResourceProjectParty" target="addWorkEffortPartyAssign" title="" type="single" Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Feb 12 10:55:41 2008 @@ -52,14 +52,14 @@ <entity-options entity-name="CustRequestType" description="${description}"/> </drop-down> </field> - <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox"><ignored/></field> + <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}"><ignored/></field> <field name="custRequestCategoryId"> <drop-down allow-empty="true"> <entity-options entity-name="CustRequestCategory" description="${description}"/> </drop-down> </field> - <field use-when="custRequest==null" name="statusId" widget-style="selectBox"> + <field use-when="custRequest==null" name="statusId"> <drop-down allow-empty="false" current="first-in-list"> <entity-options entity-name="StatusItem" description="${description}"> <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/> @@ -67,7 +67,7 @@ </entity-options> </drop-down> </field> - <field use-when="custRequest!=null" name="statusId" widget-style="selectBox"> + <field use-when="custRequest!=null" name="statusId"> <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}"> <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> <entity-constraint name="statusId" value="${custRequest.statusId}"/> @@ -75,7 +75,7 @@ </entity-options> </drop-down> </field> - <field name="priority" widget-style="selectBox"> + <field name="priority"> <drop-down allow-empty="false"> <option key="9"/> <option key="8"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=627034&r1=627033&r2=627034&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Tue Feb 12 10:55:41 2008 @@ -149,7 +149,7 @@ <field name="timesheetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD"> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> @@ -179,7 +179,7 @@ </actions> <field name="timesheetId" map-name="currentTimesheet"><hidden/></field> <field name="partyId" map-name="userLogin"><hidden/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down no-current-selected-key="STANDARD" > <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> @@ -214,7 +214,7 @@ <field name="timesheetId"><hidden/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> - <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> + <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"> <drop-down> <entity-options entity-name="RateType" description="${description}"> <entity-order-by field-name="description"/> |
Free forum by Nabble | Edit this page |