svn commit: r1356888 [1/5] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1356888 [1/5] - in /ofbiz/branches/20120329_portl
 
|
Author: erwan
Date: Tue Jul 3 19:42:32 2012 New Revision: 1356888 URL: http://svn.apache.org/viewvc?rev=1356888&view=rev Log: Merging by hand as some commits were forgotten when merging. Now the branch should be up-to-date, minus the recent commits on trunk Removed: ofbiz/branches/20120329_portletWidget/framework/base/lib/Tidy.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/ant-trax-1.8.0.jar ofbiz/branches/20120329_portletWidget/framework/base/lib/commons/commons-vfs-20070730.jar ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/content/data/ContentTypeData.xml ofbiz/branches/20120329_portletWidget/applications/content/data/TemplateData.xml ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl ofbiz/branches/20120329_portletWidget/applications/content/testdef/data/LuceneTestsData.xml ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/AdminSearch.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSContentEdit.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSSites.ftl ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyResponse.ftl ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/compdoc/CompDocForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/contentsetup/ContentSetupForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/forum/BlogForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/survey/SurveyForms.xml ofbiz/branches/20120329_portletWidget/applications/content/widget/website/WebSiteForms.xml ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/order/config/OrderUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/entry/optionsettings.ftl ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/PartySettingsForm.xml ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/branches/20120329_portletWidget/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/TimesheetScreens.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortCommEventForms.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/WorkEffortRequirementForms.xml ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ObjectType.java ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/branches/20120329_portletWidget/framework/common/webcommon/portal/listPortalPortlets.ftl ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/entity/xmldsdump.jsp ofbiz/branches/20120329_portletWidget/framework/webtools/widget/PortalAdmForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/OrderScreens.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogMenus.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/themes/multiflex/includes/footer.ftl ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml Tue Jul 3 19:42:32 2012 @@ -39,7 +39,8 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/AccountingSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/PaymentGatewayConfData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml Tue Jul 3 19:42:32 2012 @@ -26,11 +26,13 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonExtSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/OfbizSetupSecurityGroupDemoData.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/data/ContentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/data/ContentTypeData.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/data/ContentTypeData.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/data/ContentTypeData.xml Tue Jul 3 19:42:32 2012 @@ -229,7 +229,7 @@ under the License. <#assign mimeTypeId=wrapMimeTypeId?if_exists/> <#assign subContentId=wrapSubContentId?if_exists/> <div id="divTwo" class="wrapOuter"> - <div class="tabletext"> + <div> ${mapKey?if_exists} <a class="buttontext" href="javascript:lookupSubContent('<@ofbizUrl>/LookupSubContent</@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}', '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')">[Find]</a> <#assign ofbizRequest=""/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/data/TemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/data/TemplateData.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/data/TemplateData.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/data/TemplateData.xml Tue Jul 3 19:42:32 2012 @@ -88,9 +88,9 @@ under the License. <#if requestAttributes.userLogin?has_content> <tr> <td> - <div class="tabletext"><a href="<@ofbizUrl>/logout</@ofbizUrl>" class="tableText">Logout</a></div> + <div><a href="<@ofbizUrl>/logout</@ofbizUrl>">Logout</a></div> <br/> - <div class="tabletext"><a href="<@ofbizUrl>/viewprofile</@ofbizUrl>" class="tableText">Profile</a></div> + <div><a href="<@ofbizUrl>/viewprofile</@ofbizUrl>">Profile</a></div> </td> </tr> <#else> @@ -103,7 +103,7 @@ under the License. <form method="POST" action="<@ofbizUrl>/login${previousParams?if_exists}</@ofbizUrl>" name="loginform" style='margin: 0;'> <table width='100%' border='0' cellpadding='0' cellspacing='2'> <tr align="center"> - <td align='left'><span class="tabletext">Username: </span></td> + <td align='left'><span>Username: </span></td> </tr> <tr> <td align=left> @@ -111,7 +111,7 @@ under the License. </td> </tr> <tr align="center"> - <td align='left'><span class="tabletext">Password: </span></td> + <td align='left'><span>Password: </span></td> </tr> <tr> <td align='left'><input type="password" class='inputBox' name="PASSWORD" value="" size="20"></td> @@ -129,12 +129,12 @@ under the License. </#if> <tr> <td valign='middle' align='center'> - <div class="tabletext"><a class="tableText" href="<@ofbizUrl>/forgotpasswd</@ofbizUrl>">Forgot Password?</a></div> + <div><a href="<@ofbizUrl>/forgotpasswd</@ofbizUrl>">Forgot Password?</a></div> </td> </tr> <tr> <td valign='middle' align='center'> - <div class="tabletext"><a class="tableText" href="<@ofbizUrl>/newblogger</@ofbizUrl>">New User</a></div> + <div><a href="<@ofbizUrl>/newblogger</@ofbizUrl>">New User</a></div> </td> </tr> </table> @@ -161,7 +161,7 @@ under the License. <#assign mimeTypeId=wrapMimeTypeId?if_exists/> <#assign subContentId=wrapSubContentId?if_exists/> <div id="divTwo" class="wrapOuter"> - <div class="tabletext"> + <div> ${mapKey?if_exists} <a class="buttontext" href="javascript:lookupSubContent('<@ofbizUrl>/LookupSubContent</@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}', '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')" >[Find]</a> @@ -302,7 +302,7 @@ ${wrappedContent?if_exists} <#assign mimeTypeId=wrapMimeTypeId?if_exists/> <#assign subContentId=wrapSubContentId?if_exists/> <div id="divTwo" class="wrapOuter"> - <div class="tabletext"> + <div> ${mapKey?if_exists} <a class="buttontext" href="javascript:lookupSubContent('<@ofbizUrl>/LookupSubContent</@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}', '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')" >[Find]</a> @@ -377,7 +377,7 @@ ResourceId=${subDataResourceId?if_exists <tr><td> <table border="0" width="100%"> <tr><td> -<span class="tabletext"> +<span> <#if 0 < lowIndex?if_exists > <#assign prevArg=(viewIndex - 1)?string /> <a href="<@ofbizUrl>/main</@ofbizUrl>?viewIndex=${prevArg?if_exists}">Prev</a> Modified: ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml Tue Jul 3 19:42:32 2012 @@ -36,7 +36,8 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/ContentSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/> @@ -44,7 +45,6 @@ under the License. <!-- these files cannot be loaded in their original component because they are earlier than the content component --> <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl Tue Jul 3 19:42:32 2012 @@ -18,17 +18,17 @@ under the License. --> <#macro renderSurveyQuestionText surveyQuestionAndAppl> - <div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div> + <div>${surveyQuestionAndAppl.question?if_exists}</div> <#if surveyQuestionAndAppl.hint?has_content> - <div class="tabletext">${surveyQuestionAndAppl.hint}</div> + <div>${surveyQuestionAndAppl.hint}</div> </#if> </#macro> <#macro renderSurveyQuestionRequired surveyQuestionAndAppl> <#if surveyQuestionAndAppl.requiredField?default("N") == "Y"> - <span class="tabletext">*[required]</span> + <span>*[required]</span> <#else/> - <span class="tabletext">[optional]</span> + <span>[optional]</span> </#if> </#macro> @@ -136,7 +136,7 @@ under the License. ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> <#else/> - <div class="tabletext">Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> + <div>Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> </#if> </#macro> @@ -163,7 +163,7 @@ under the License. <br /> <#if survey.comments?has_content> -<div class="tabletext">${survey.comments}</div> +<div>${survey.comments}</div> <br /> </#if> @@ -271,7 +271,7 @@ under the License. <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5"><div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div></td> + <td colspan="5"><div>${surveyQuestionAndAppl.question?if_exists}</div></td> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/> <td colspan="5"><hr /></td> <#else/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/testdef/data/LuceneTestsData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/testdef/data/LuceneTestsData.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/testdef/data/LuceneTestsData.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/testdef/data/LuceneTestsData.xml Tue Jul 3 19:42:32 2012 @@ -22,7 +22,7 @@ under the License. <DataResource dataResourceId="CNTGIZMOSLRG" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Large Gizmos"/> <ElectronicText dataResourceId="CNTGIZMOSLRG"> <textData><![CDATA[ - <div class="tabletext"> + <div> <ol> <li>Large Gizmos are for those who loves them large!</li> <li>A lot of them and more to come</li> @@ -33,7 +33,7 @@ under the License. <DataResource dataResourceId="CNTGIZMOSSML" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Small Gizmos"/> <ElectronicText dataResourceId="CNTGIZMOSSML"> <textData><![CDATA[ - <div class="tabletext"> + <div> <ol> <li>Not only for children</li> <li>Just need to be able to hold it in your hand</li> @@ -44,7 +44,7 @@ under the License. <DataResource dataResourceId="GIZMOSLRG" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Advocacy"/> <ElectronicText dataResourceId="GIZMOSLRG"> <textData><![CDATA[ - <div class="tabletext"> + <div> <ol> <li>Gizmos are the best ones</li> <li>Don't use widgets, use gizmos !</li> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/AdminSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/AdminSearch.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/AdminSearch.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/AdminSearch.ftl Tue Jul 3 19:42:32 2012 @@ -50,10 +50,10 @@ under the License. <table border="0" width="100%"> <tr> <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.ProductFeatures}:</div> + <div>${uiLabelMap.ProductFeatures}:</div> </td> <td align="right" valign="middle"> - <div class="tabletext"> + <div> ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked"/> ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any"/> </div> @@ -62,10 +62,10 @@ under the License. <#-- <tr> <td align="right" valign="middle"> - <div class="tabletext">Feature IDs:</div> + <div>Feature IDs:</div> </td> <td valign="middle"> - <div class="tabletext"> + <div> <input type="text" class="inputBox" name="SEARCH_FEAT" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> @@ -79,10 +79,10 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> <td align="right" valign="middle"> - <div class="tabletext">${(productFeatureType.description)?if_exists}:</div> + <div>${(productFeatureType.description)?if_exists}:</div> </td> <td valign="middle"> - <div class="tabletext"> + <div> <select name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonAny} -</option> <#list productFeatures as productFeature> @@ -96,14 +96,14 @@ under the License. <#if searchConstraintStrings?has_content> <tr> <td align="right" valign="top"> - <div class="tabletext">${uiLabelMap.CommonLast} ${uiLabelMap.CommonSearch}:</div> + <div>${uiLabelMap.CommonLast} ${uiLabelMap.CommonSearch}:</div> </td> <td valign="top"> <#list searchConstraintStrings as searchConstraintString> - <div class="tabletext"> - ${searchConstraintString}</div> + <div> - ${searchConstraintString}</div> </#list> - <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> - <div class="tabletext"> + <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> + <div> ${uiLabelMap.CommonNew} ${uiLabelMap.CommonSearch} <input type="radio" name="clearSearch" value="Y" checked="checked"/> ${uiLabelMap.CommonRefineSearch} <input type="radio" name="clearSearch" value="N"/> </div> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSContentEdit.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSContentEdit.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSContentEdit.ftl Tue Jul 3 19:42:32 2012 @@ -324,7 +324,7 @@ ${menuWrapper.renderMenuString()} <#local plusMinus="-"/> ${plusMinus} ${content.contentName?if_exists} </td > - <td class="tabletext" > + <td > <input type="checkbox" name="publish_o_${rowCount}" value="Y" ${isPublished}/> </td > <input type="hidden" name="contentIdTo_o_${rowCount}" value="${subContentId}" /> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSSites.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSSites.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/cms/CMSSites.ftl Tue Jul 3 19:42:32 2012 @@ -121,7 +121,7 @@ function call_fieldlookup4(rootForumId, <@loopSubContent contentId=forumId viewIndex=0 viewSize=9999 contentAssocTypeId="SUBSITE" returnAfterPickWhen="1==1";> <tr> - <td class="tabletext" > + <td > ${indent} <#local plusMinus="-"/> ${plusMinus} ${content.contentName?if_exists} @@ -156,28 +156,28 @@ function call_fieldlookup4(rootForumId, <#list mostRecentList as content> <@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_PUBLISH" subContentId=forumId > <tr> - <td class="tabletext"> <b>id:</b>${content.contentId} </td> - <td class="tabletext"> <b>name:</b>${content.contentName} </td> + <td> <b>id:</b>${content.contentId} </td> + <td> <b>name:</b>${content.contentName} </td> <@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK"> <td> <a class="tabButton" href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >View</a> </td> - <td class="tabletext"> + <td> <b>submitted:</b> <input type="radio" name="statusId_o_${row}" value="CTNT_FINAL_DRAFT" checked="checked"/> </td> - <td class="tabletext"> + <td> <b>publish:</b> <input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/> </td> - <td class="tabletext"> + <td> <b>reject:</b> <input type="radio" name="statusId_o_${row}" value="CTNT_DEACTIVATED"/> </td> </tr> <input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/> <tr> - <td colspan="6" class="tabletext"> + <td colspan="6"> <b>content:</b><br /> <@renderSubContentCache subContentId=content.contentId/> </td> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyResponse.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyResponse.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyResponse.ftl Tue Jul 3 19:42:32 2012 @@ -20,7 +20,7 @@ under the License. <#-- Render the survey --> <#if surveyString?has_content> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>updateSurveyResponse</@ofbizUrl>" name="EditSurveyResponseForm" style="margin: 0;"> - <div class="tabletext">${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> + <div>${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> <#-- pass through the dataResourceId so the response can be associated with it --> <input type="hidden" name="dataResourceId" value="${parameters.dataResourceId?if_exists}"/> <input type="hidden" name="rootContentId" value="${parameters.rootContentId?if_exists}"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/CommonScreens.xml Tue Jul 3 19:42:32 2012 @@ -392,7 +392,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentMain}"> - <container><label style="tabletext" text="${uiLabelMap.ContentWelcome}"/></container> + <container><label text="${uiLabelMap.ContentWelcome}"/></container> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/compdoc/CompDocForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/compdoc/CompDocForms.xml Tue Jul 3 19:42:32 2012 @@ -225,7 +225,7 @@ under the License. <!-- ContentApproval forms --> <form name="EditContentApproval" default-map-name="contentApproval" target="updateContentApproval" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentApprovalId" widget-style="tabletext"><display/></field> + <field name="contentApprovalId"><display/></field> <field name="contentId" widget-style="inputBox"><hidden/></field> <field name="contentRevisionSeqId" widget-style="inputBox"><text></text></field> <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field> @@ -273,7 +273,7 @@ under the License. <form name="ListContentApproval" target="updateContentApproval" list-name="contentApprovalList" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="contentApprovalId" widget-style="tabletext"><display/></field> + <field name="contentApprovalId"><display/></field> <field name="contentId"><hidden/></field> <field name="rootContentId" map-name="empty"><hidden/></field> <field name="contentRevisionSeqId"><hidden/></field> @@ -308,7 +308,7 @@ under the License. <form name="ListWaitingContentApproval" target="updateWaitingContentApproval" list-name="contentApprovalList" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="contentApprovalId" widget-style="tabletext"><display/></field> + <field name="contentApprovalId"><display/></field> <field name="contentId"><hidden/></field> <field name="rootContentId" map-name="empty"><hidden/></field> <field name="contentRevisionSeqId"><display/></field> @@ -336,7 +336,7 @@ under the License. <form name="AddRootCompDocInstance" default-map-name="" type="single" target="genCompDocInstance" header-row-style="header-row" default-table-style="basic-table"> <field name="contentName"><text/></field> - <field name="instanceOfContentId" entry-name="rootContentId" map-name="parameters" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="instanceOfContentId" entry-name="rootContentId" map-name="parameters"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> <field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field> <!-- <field name="rootContentId"><hidden/></field> @@ -347,9 +347,9 @@ under the License. <form name="EditRootCompDocInstance" default-map-name="content" type="single" target="updateRootCompDocTemplate" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" widget-style="tabletext"><display/></field> + <field name="contentId"><display/></field> <field name="contentName"><text/></field> - <field name="instanceOfContentId" widget-style="tabletext"><display/></field> + <field name="instanceOfContentId"><display/></field> <field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -365,7 +365,7 @@ under the License. <form name="EditRootCompDocTemplate" default-map-name="content" type="single" target="updateRootCompDocTemplate" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" widget-style="tabletext"><display/></field> + <field name="contentId"><display/></field> <field name="contentName"><text/></field> <field name="contentTypeId" map-name="dummy"><hidden value="COMPDOC_TEMPLATE"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -377,11 +377,11 @@ under the License. <field name="contentId"><ignored/></field> <field name="contentName"><text/></field> <field name="contentTypeId"><hidden/></field> - <field name="instanceOfContentId" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="caContentIdTo" entry-name="rootContentId" map-name="parameters" widget-style="tabletext" title="${uiLabelMap.ContentCompDocParentContentId}"> + <field name="instanceOfContentId" use-when=""DOCUMENT".equals(contentTypeId)"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="caContentIdTo" entry-name="rootContentId" map-name="parameters" title="${uiLabelMap.ContentCompDocParentContentId}"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/> </field> - <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType"/></field> + <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"/></field> <field name="fromDate"><date-time default-value="${nowTimestamp}"/></field> <field name="thruDate"><date-time/></field> <field name="sequenceNum"><text/></field> @@ -389,10 +389,10 @@ under the License. <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)"> <hidden value="application/vnd.ofbiz.survey.response"/> </field> - <field name="displayMimeTypeId" map-name="empty" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext"> + <field name="displayMimeTypeId" map-name="empty" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)"> <display description="Survey Response"/> </field> - <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext"> + <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(templateDataResourceTypeId)"> <display-entity entity-name="MimeType" description="${description}"/> </field> <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="smallSelect"> @@ -416,17 +416,17 @@ under the License. <form name="EditChildCompDoc" default-map-name="contentAssoc" type="single" target="${childCompDocTarget}" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" widget-style="tabletext"><display/></field> + <field name="contentId"><display/></field> <field name="contentName" map-name="itemContent"><text/></field> <field name="contentTypeId" map-name="itemContent"><hidden/></field> - <field name="instanceOfContentId" map-name="itemContent" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="contentIdTo" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field> - <field name="fromDate" widget-style="tabletext"><display/></field> + <field name="instanceOfContentId" map-name="itemContent" use-when=""DOCUMENT".equals(contentTypeId)"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="contentIdTo"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field> + <field name="fromDate"><display/></field> <field name="thruDate"><date-time/></field> <field name="sequenceNum"><text/></field> - <field name="mimeTypeId" map-name="dataResource" widget-style="tabletext" + <field name="mimeTypeId" map-name="dataResource" use-when=""TEMPLATE".equals(contentTypeId)"> <drop-down allow-empty="false"> <option key="application/msword" description="${uiLabelMap.ContentMSWord}"/> @@ -441,16 +441,16 @@ under the License. <option key="application/octet-stream" description="${uiLabelMap.ContentResourceOther}"/> </drop-down> </field> - <field name="mimeTypeId" map-name="dataResource" widget-style="tabletext" + <field name="mimeTypeId" map-name="dataResource" use-when=""DOCUMENT".equals(contentTypeId) && mimeTypeId!=null && !"application/vnd.ofbiz.survey".equals(mimeTypeId)"> <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/> </field> - <field name="mimeTypeId" map-name="dataResource" widget-style="tabletext" + <field name="mimeTypeId" map-name="dataResource" use-when=""DOCUMENT".equals(contentTypeId) && mimeTypeId!=null && "application/vnd.ofbiz.survey".equals(mimeTypeId)"> <display description="Survey Response"/> </field> - <!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type" widget-style="tabletext"><display/></field> --> - <!-- <field name="contentTypeId" map-name="content" title="Content Type" widget-style="tabletext"><display/></field> --> + <!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type" ><display/></field> --> + <!-- <field name="contentTypeId" map-name="content" title="Content Type" ><display/></field> --> <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null && "SURVEY".equals(dataResource.getString("dataResourceTypeId"))"> @@ -486,7 +486,7 @@ under the License. </hyperlink> </field> - <field name="objectInfo" map-name="dataResource" widget-style="tabletext" + <field name="objectInfo" map-name="dataResource" use-when=""DOCUMENT".equals(contentTypeId) && mimeTypeId!=null && !"application/vnd.ofbiz.survey".equals(mimeTypeId)"> <display also-hidden="false"/> </field> @@ -496,17 +496,17 @@ under the License. <form name="ViewChildCompDoc" default-map-name="contentAssoc" type="single" target="" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" widget-style="tabletext"><display/></field> + <field name="contentId"><display/></field> <field name="contentName" map-name="itemContent"><display/></field> <field name="contentTypeId" map-name="itemContent"><hidden/></field> - <field name="instanceOfContentId" map-name="itemContent" use-when="contentTypeId.equals("DOCUMENT")" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="contentIdTo" widget-style="tabletext" title="${uiLabelMap.ContentCompDocParentContentId}"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> - <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field> + <field name="instanceOfContentId" map-name="itemContent" use-when="contentTypeId.equals("DOCUMENT")"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="contentIdTo" title="${uiLabelMap.ContentCompDocParentContentId}"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field> + <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field> - <field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}" widget-style="tabletext"> + <field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}" > <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/> </field> <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&&"SURVEY".equals(dataResource.getString("dataResourceTypeId"))"> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml Tue Jul 3 19:42:32 2012 @@ -58,12 +58,15 @@ under the License. </field> <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field> <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <!--<field name="localeString"> <drop-down allow-empty="true"> <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> <entity-order-by field-name="countryName"/> </entity-options> </drop-down> - </field> + </field>--> <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -80,7 +83,7 @@ under the License. </actions> <field name="contentId"><hidden/></field> - <field name="contentName" widget-style="tabletext" sort-field="true"> + <field name="contentName" sort-field="true"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> <sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext"> <parameter param-name="contentId"/> @@ -122,7 +125,7 @@ under the License. <field name="contentId"> <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/> </field> - <field name="contentName" widget-style="tabletext"><display/></field> + <field name="contentName"><display/></field> <field name="createdByUserLogin"><ignored/></field> <on-event-update-area event-type="paginate" area-id="search-results" area-target=""/> </form> @@ -138,9 +141,9 @@ under the License. </actions> <alt-target use-when="currentValue==null" target="createContent"/> <auto-fields-entity entity-name="Content"/> - <field use-when="currentValue!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> + <field use-when="currentValue!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="currentValue==null&&contentId==null" name="contentId"><text/></field> - <field use-when="currentValue==null&&contentId!=null" name="contentId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field> + <field use-when="currentValue==null&&contentId!=null" name="contentId"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field> <field name="contentTypeId"> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"> @@ -187,11 +190,7 @@ under the License. </lookup> </field> <field name="localeString"> - <drop-down allow-empty="true"> - <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> - <entity-order-by field-name="countryName"/> - </entity-options> - </drop-down> + <lookup target-form-name="LookupLocale"></lookup> </field> <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> @@ -240,16 +239,16 @@ under the License. </entity-one> </actions> <auto-fields-entity entity-name="ContentAssoc"/> - <field name="contentId" widget-style="tabletext"><display/></field> - <field name="contentIdTo" widget-style="tabletext"><display/></field> - <field name="contentAssocTypeId" widget-style="tabletext"><display/></field> - <field name="fromDate" widget-style="tabletext"><display/></field> + <field name="contentId"><display/></field> + <field name="contentIdTo"><display/></field> + <field name="contentAssocTypeId"><display/></field> + <field name="fromDate"><display/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddContentAssoc" target="createContentAssoc" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ContentAssoc"/> - <field name="contentId" widget-style="tabletext"><display description="${contentId}"/></field> + <field name="contentId"><display description="${contentId}"/></field> <field name="contentIdTo" map-name="currentValue"> <lookup target-form-name="LookupContent"/> </field> @@ -284,7 +283,7 @@ under the License. <field name="contentId"><hidden/></field> <field name="contentIdTo"> <display-entity entity-name="Content" description="${contentName},${description}" key-field-name="contentId"> - <sub-hyperlink target="EditContentAssoc" description="${contentIdTo}" link-style="tabletext"> + <sub-hyperlink target="EditContentAssoc" description="${contentIdTo}"> <parameter param-name="contentId" from-field="contentIdTo"/> </sub-hyperlink> </display-entity> @@ -314,7 +313,7 @@ under the License. </actions> <field name="contentId"> <display-entity entity-name="Content" description="${contentName},${description}"> - <sub-hyperlink target="EditContentAssoc" description="${contentId}" link-style="tabletext"> + <sub-hyperlink target="EditContentAssoc" description="${contentId}"> <parameter param-name="contentId"/> </sub-hyperlink> </display-entity> @@ -531,16 +530,16 @@ under the License. </entity-and> </actions> <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit"/> - <field name="workEffortId" widget-style="tabletext"> + <field name="workEffortId"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true"> <sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app"> <parameter param-name="workEffortId"/> </sub-hyperlink> </display-entity> </field> - <field name="contentId" widget-style="tabletext"><hidden/></field> - <field name="workEffortContentTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field> - <field name="fromDate" widget-style="tabletext"><display/></field> + <field name="contentId"><hidden/></field> + <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field> + <field name="fromDate"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent"> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml Tue Jul 3 19:42:32 2012 @@ -49,12 +49,15 @@ under the License. </drop-down> </field> <field name="localeString" position="2"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <!--<field name="localeString" position="2"> <drop-down allow-empty="true"> <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> <entity-order-by field-name="countryName"/> </entity-options> </drop-down> - </field> + </field>--> <field name="createdByUserLogin" position="1"><lookup target-form-name="LookupPerson"/></field> <field name="dataCategoryId" position="2"> <drop-down allow-empty="true"> @@ -78,7 +81,7 @@ under the License. </service> </actions> <field name="dataResourceId"><hidden/></field> - <field name="dataResourceName" widget-style="tabletext" sort-field="true"> + <field name="dataResourceName" sort-field="true"> <display-entity entity-name="DataResource" description="${dataResourceName}" key-field-name="dataResourceId"> <sub-hyperlink target="EditDataResource" description="[${dataResourceId}]" link-style="buttontext"> <parameter param-name="dataResourceId"/> @@ -159,9 +162,9 @@ under the License. </actions> <alt-target use-when="currentValue==null" target="createDataResource"/> <auto-fields-entity entity-name="DataResource" default-field-type="edit"/> - <field use-when="currentValue!=null" name="dataResourceId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> + <field use-when="currentValue!=null" name="dataResourceId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="currentValue==null&&dataResourceId==null" name="dataResourceId"><text/></field> - <field use-when="currentValue==null&&dataResourceId!=null" name="dataResourceId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${dataResourceId}]" also-hidden="false"/></field> + <field use-when="currentValue==null&&dataResourceId!=null" name="dataResourceId"><display description="${uiLabelMap.CommonCannotBeFound}: [${dataResourceId}]" also-hidden="false"/></field> <field name="dataResourceTypeId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"> @@ -190,12 +193,8 @@ under the License. <list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/> </drop-down> </field> - <field name="localeString" position="2"> - <drop-down allow-empty="true"> - <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> - <entity-order-by field-name="countryName"/> - </entity-options> - </drop-down> + <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> </field> <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> @@ -263,12 +262,8 @@ under the License. <list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/> </drop-down> </field> - <field name="localeString" position="2"> - <drop-down allow-empty="true"> - <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> - <entity-order-by field-name="countryName"/> - </entity-options> - </drop-down> + <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> </field> <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> @@ -353,9 +348,9 @@ under the License. </form> <form name="ImageUpload" target="uploadImage" title="" type="upload" default-map-name="currentValue" header-row-style="header-row" default-table-style="basic-table"> - <field name="dataResourceId" widget-style="tabletext"><display/></field> + <field name="dataResourceId"><display/></field> <field name="dataResourceTypeId" ><hidden/></field> - <field name="objectInfo" widget-style="tabletext"><display /></field> + <field name="objectInfo"><display /></field> <field name="imageData" entity-name="ImageDataResource"><file/></field> <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -377,7 +372,7 @@ under the License. </service> </actions> <auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/> - <field name="attrValue" widget-style="tabletext"><text/></field> + <field name="attrValue"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute"> @@ -427,7 +422,7 @@ under the License. <form name="AddDataResourceProductFeature" target="createDataResourceProductFeature" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductFeatureDataResource"/> - <field name="dataResourceId" widget-style="tabletext" map-name="currentValue"><display/></field> + <field name="dataResourceId" map-name="currentValue"><display/></field> <field name="productFeatureId" widget-style="buttontext"><lookup target-form-name="LookupProductFeature"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/contentsetup/ContentSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/contentsetup/ContentSetupForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/contentsetup/ContentSetupForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/contentsetup/ContentSetupForms.xml Tue Jul 3 19:42:32 2012 @@ -34,7 +34,7 @@ under the License. <entity-condition entity-name="ContentType" use-cache="false"/> </actions> <auto-fields-service service-name="updateContentType"/> - <field name="contentTypeId" widget-style="tabletext"> + <field name="contentTypeId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -95,7 +95,7 @@ under the License. <entity-condition entity-name="ContentAssocType" use-cache="false"/> </actions> <auto-fields-service service-name="updateContentAssocType"/> - <field name="contentAssocTypeId" widget-style="tabletext"> + <field name="contentAssocTypeId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -122,7 +122,7 @@ under the License. <entity-condition entity-name="ContentPurposeType" use-cache="false"/> </actions> <auto-fields-service service-name="updateContentPurposeType"/> - <field name="contentPurposeTypeId" widget-style="tabletext"> + <field name="contentPurposeTypeId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -149,7 +149,7 @@ under the License. <entity-condition entity-name="ContentAssocPredicate" use-cache="false"/> </actions> <auto-fields-service service-name="updateContentAssocPredicate"/> - <field name="contentAssocPredicateId" widget-style="tabletext"> + <field name="contentAssocPredicateId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -176,7 +176,7 @@ under the License. <entity-condition entity-name="ContentOperation" use-cache="false"/> </actions> <auto-fields-service service-name="updateContentOperation"/> - <field name="contentOperationId" widget-style="tabletext"> + <field name="contentOperationId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml Tue Jul 3 19:42:32 2012 @@ -34,7 +34,7 @@ under the License. <entity-condition entity-name="DataResourceType" use-cache="false"/> </actions> <auto-fields-service service-name="updateDataResourceType"/> - <field name="dataResourceTypeId" widget-style="tabletext"> + <field name="dataResourceTypeId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -95,7 +95,7 @@ under the License. <entity-condition entity-name="CharacterSet" use-cache="false"/> </actions> <auto-fields-service service-name="updateCharacterSet"/> - <field name="characterSetId" widget-style="tabletext"> + <field name="characterSetId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -127,7 +127,7 @@ under the License. <entity-condition entity-name="DataCategory" use-cache="false"/> </actions> <auto-fields-service service-name="updateDataCategory"/> - <field name="dataCategoryId" widget-style="tabletext"> + <field name="dataCategoryId"> <display/> </field> <field name="parentCategoryId"> @@ -167,7 +167,7 @@ under the License. <entity-condition entity-name="FileExtension" use-cache="false"/> </actions> <auto-fields-service service-name="updateFileExtension"/> - <field name="fileExtensionId" widget-style="tabletext"> + <field name="fileExtensionId"> <display/> </field> <field name="mimeTypeId" title=" "> @@ -200,7 +200,7 @@ under the License. <entity-condition entity-name="MetaDataPredicate" use-cache="false"/> </actions> <auto-fields-service service-name="updateMetaDataPredicate"/> - <field name="metaDataPredicateId" widget-style="tabletext"> + <field name="metaDataPredicateId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -227,7 +227,7 @@ under the License. <entity-condition entity-name="MimeType" use-cache="false"/> </actions> <auto-fields-service service-name="updateMimeType"/> - <field name="mimeTypeId" widget-style="tabletext"> + <field name="mimeTypeId"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -244,7 +244,7 @@ under the License. <form name="CreateMimeTypeHtmlTemplate" target="createMimeTypeHtmlTemplate" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createMimeTypeHtmlTemplate"/> - <field name="mimeTypeId" widget-style="tabletext"> + <field name="mimeTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/> </drop-down> @@ -260,7 +260,7 @@ under the License. <entity-condition entity-name="MimeTypeHtmlTemplate" use-cache="false"/> </actions> <auto-fields-service service-name="updateMimeTypeHtmlTemplate"/> - <field name="mimeTypeId" widget-style="tabletext"> + <field name="mimeTypeId"> <hyperlink target-type="intra-app" target="editMimeType" description="${mimeTypeId}"> <parameter param-name="mimeTypeId"/> </hyperlink> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/forum/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/forum/BlogForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/forum/BlogForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/forum/BlogForms.xml Tue Jul 3 19:42:32 2012 @@ -23,7 +23,7 @@ under the License. <form name="ListBlogs" type="list" list-name="blogs" separate-columns="true" paginate-target="blogMain" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="contentId"><hidden/></field> - <field name="contentName" widget-style="tabletext"> + <field name="contentName"> <hyperlink target="editBlog" description="${contentName} [${contentId}]"> <parameter param-name="blogContentId" from-field="contentId"/> </hyperlink> @@ -39,7 +39,7 @@ under the License. <form name="BlogContent" type="list" list-name="blogContent" separate-columns="true" paginate-target="blogContent" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="contentId"><hidden/></field> - <field name="contentName" widget-style="tabletext"> + <field name="contentName"> <hyperlink target="ViewBlogArticle" description="${contentName} [${contentId}]"> <parameter param-name="articleContentId" from-field="contentId"/> <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> @@ -64,7 +64,7 @@ under the License. </form> <form name="EditArticle" target="createBlogArticle" title="" type="upload" skip-end="true" default-map-name="blogEntry" - default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox"> + default-title-style="treeHeader" default-widget-style="inputBox"> <alt-target use-when="contentId!=void&&contentId!=null" target="updateBlogArticle"/> <field name="blogContentId"><hidden value="${parameters.blogContentId}"/></field> <field name="contentId" title="${uiLabelMap.ContentBlogEntryId}" use-when="contentId!=void&&contentId!=null"><display/></field> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/survey/SurveyForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/survey/SurveyForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/survey/SurveyForms.xml Tue Jul 3 19:42:32 2012 @@ -60,8 +60,8 @@ under the License. <auto-fields-service service-name="updateSurvey"/> - <field use-when="survey!=null" name="surveyId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> - <field use-when="survey==null&&surveyId!=null" name="surveyId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${surveyId}]" widget-style="tabletext"><display description="" also-hidden="false"/></field> + <field use-when="survey!=null" name="surveyId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="survey==null&&surveyId!=null" name="surveyId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${surveyId}]"><display description="" also-hidden="false"/></field> <field use-when="survey==null&&surveyId==null" name="surveyId"><ignored/></field> <field name="isAnonymous"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> @@ -103,7 +103,7 @@ under the License. <auto-fields-service service-name="updateSurveyMultiResp" default-field-type="edit"/> <field name="surveyId"><hidden/></field> - <field name="surveyMultiRespId" widget-style="tabletext"><display/></field> + <field name="surveyMultiRespId"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -122,8 +122,8 @@ under the License. <auto-fields-service service-name="updateSurveyMultiRespColumn" default-field-type="edit"/> <field name="surveyId"><hidden/></field> - <field name="surveyMultiRespId" widget-style="tabletext"><display/></field> - <field name="surveyMultiRespColId" widget-style="tabletext"><display/></field> + <field name="surveyMultiRespId"><display/></field> + <field name="surveyMultiRespColId"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -156,7 +156,7 @@ under the License. <auto-fields-service service-name="updateSurveyPage" default-field-type="edit"/> <field name="surveyId"><hidden/></field> - <field name="surveyPageSeqId" widget-style="tabletext"><display/></field> + <field name="surveyPageSeqId"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/website/WebSiteForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/website/WebSiteForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/website/WebSiteForms.xml Tue Jul 3 19:42:32 2012 @@ -196,7 +196,7 @@ under the License. <field name="roleTypeId"> <display description="${roleType.description}"/> </field> - <field name="fromDate" widget-style="tabletext"><display/></field> + <field name="fromDate"><display/></field> <field name="thruDate"></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml Tue Jul 3 19:42:32 2012 @@ -28,7 +28,8 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml Tue Jul 3 19:42:32 2012 @@ -34,7 +34,8 @@ under the License. <!-- entity resources: model(s), eca(s) and group definitions --> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/> <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>--> Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml Tue Jul 3 19:42:32 2012 @@ -27,11 +27,11 @@ under the License. <classpath type="dir" location="config"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_opportunity.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |