svn commit: r1356450 [10/10] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1356450 [10/10] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -25,7 +25,7 @@ under the License. <classpath type="jar" location="build/lib/*"/> <classpath type="dir" location="config"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/EcommerceSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalShipping.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Jul 2 20:11:49 2012 @@ -43,11 +43,11 @@ under the License. <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> @@ -262,7 +262,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -36,8 +36,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/> <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/ExampleSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl Mon Jul 2 20:11:49 2012 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -27,8 +27,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/GoogleBaseSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleBaseData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -28,8 +28,7 @@ <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/GoogleCheckoutSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleCheckoutData.xml"/> <service-resource type="model" loader="main" location="servicedef/services_request.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -24,8 +24,7 @@ under the License. <resource-loader name="main" type="component"/> <classpath type="jar" location="build/lib/*"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/HhFacilitySecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityData.xml"/> <service-resource type="model" loader="main" location="servicedef/services_hhfacility.xml"/> Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:r1347755-1351865 Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:r1347755-1351865 Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:r1347755-1351865 Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Mon Jul 2 20:11:49 2012 @@ -24,7 +24,7 @@ under the License. <meta charset="utf-8" /> <title>${applicationTitle?if_exists}</title> <link rel="stylesheet" href="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css" /> - <script src="/images/jquery/jquery-1.7.min.js" type="text/javascript"></script> + <script src="/images/jquery/jquery-1.7.2.min.js" type="text/javascript"></script> <script src="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js" type="text/javascript"></script> <meta name="viewport" content="width=device-width, initial-scale=1"> </head> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -24,9 +24,8 @@ <resource-loader name="main" type="component"/> <classpath type="dir" location="config"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalSecurityGroupDemoData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalPageDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalTypeData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -28,8 +28,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/OagisSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <!-- Uncomment To activate automatic messaging to the partner Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Mon Jul 2 20:11:49 2012 @@ -28,7 +28,7 @@ under the License. <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/> <title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title> <link rel="shortcut icon" href="/ofbiz/images/favicon.ico"> - <script language="javascript" src="/images/jquery/jquery-1.7.min.js" type="text/javascript"></script> + <script language="javascript" src="/images/jquery/jquery-1.7.2.min.js" type="text/javascript"></script> <script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script> <script language="javascript" src="/images/selectall.js" type="text/javascript"></script> <script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -29,7 +29,7 @@ under the License. <classpath type="jar" location="build/lib/*"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/PosSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/PosSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/PosTypeData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRetail.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/PosSyncSettings.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -29,8 +29,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrHelpData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoPasswordData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -35,8 +35,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumDemoData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml Mon Jul 2 20:11:49 2012 @@ -28,8 +28,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkFlowSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowTypeData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderProcessWorkflow.xml"/> Modified: ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css (original) +++ ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css Mon Jul 2 20:11:49 2012 @@ -2160,14 +2160,12 @@ height:22px; } /* css for timepicker */ -.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -.ui-timepicker-div dl{ text-align: left; } -.ui-timepicker-div dl dt{ height: 25px; } -.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } -.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; } -.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; } -.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; } +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } /* From http://jqueryui.com/demos/autocomplete/maxheight.html */ /* When displaying a long list of options, you can simply set the max-height for the autocomplete menu to prevent the menu from growing too large */ Modified: ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css Mon Jul 2 20:11:49 2012 @@ -2664,14 +2664,12 @@ height:22px; } /* css for timepicker */ -.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -.ui-timepicker-div dl{ text-align: left; } -.ui-timepicker-div dl dt{ height: 25px; } -.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } -.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; } -.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; } -.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; } +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } /*=================== For the quickadd page =================================*/ .quickaddall{ Modified: ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original) +++ ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Mon Jul 2 20:11:49 2012 @@ -2663,14 +2663,12 @@ height:22px; } /* css for timepicker */ -.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -.ui-timepicker-div dl{ text-align: left; } -.ui-timepicker-div dl dt{ height: 25px; } -.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } -.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; } -.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; } -.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; } +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } /*=================== For the quickadd page =================================*/ .quickaddall{ Modified: ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/javascript.css URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/javascript.css (original) +++ ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/javascript.css Mon Jul 2 20:11:49 2012 @@ -685,11 +685,9 @@ width: 18px; } /* css for timepicker */ -.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -.ui-timepicker-div dl{ text-align: left; } -.ui-timepicker-div dl dt{ height: 25px; } -.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } -.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; } -.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; } -.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; } +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } Modified: ofbiz/branches/20120329_portletWidget/themes/multiflex/webapp/multiflex/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/multiflex/webapp/multiflex/style.css?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/themes/multiflex/webapp/multiflex/style.css (original) +++ ofbiz/branches/20120329_portletWidget/themes/multiflex/webapp/multiflex/style.css Mon Jul 2 20:11:49 2012 @@ -2742,14 +2742,12 @@ height:22px; } /* css for timepicker */ -.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -.ui-timepicker-div dl{ text-align: left; } -.ui-timepicker-div dl dt{ height: 25px; } -.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } -.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; } -.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; } -.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; } +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } /* RTL support */ .ui-datepicker-rtl { direction: rtl; } Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1356450&r1=1356449&r2=1356450&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css Mon Jul 2 20:11:49 2012 @@ -3051,14 +3051,12 @@ height:22px; } /* css for timepicker */ -.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -.ui-timepicker-div dl{ text-align: left; } -.ui-timepicker-div dl dt{ height: 25px; } -.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } -.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; } -.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; } -.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; } +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } /*=================== For the quickadd page =================================*/ .quickaddall{ Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.bat:r1347755-1351865 Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.sh:r1347755-1351865 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |