svn commit: r1034192 [3/3] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r1034192 [3/3] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 11 23:07:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1030401 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1034179 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 11 23:07:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1030401 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1034179 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 11 23:07:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1030401 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1034179 Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Nov 11 23:07:40 2010 @@ -890,6 +890,7 @@ <value xml:lang="de">Liste der Kundenanfragen des Projektes</value> <value xml:lang="en">Project Customer Request list</value> <value xml:lang="fr">Liste des demandes client</value> + <value xml:lang="it">Lista richieste cliente</value> <value xml:lang="nl">Overzicht verzoeken</value> </property> <property key="ProjectMgrDependencies"> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml Thu Nov 11 23:07:40 2010 @@ -90,7 +90,7 @@ under the License. </not> </condition> <widgets> - <include-menu name="ProjectSubTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/> + <include-menu name="ProjectButtonBar" location="component://projectmgr/widget/ProjectMenus.xml"/> <container style="clear"/> <label style="h1" text="${uiLabelMap.ProjectMgrProjectCurrent}: ${project.workEffortName}[${project.workEffortId}]"/> </widgets> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CustRequestScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CustRequestScreens.xml Thu Nov 11 23:07:40 2010 @@ -33,10 +33,10 @@ under the License. </entity-and> </actions> <widgets> - <screenlet title="${uiLabelMap.ProjectMgrCustomerRequestList}"> - <label style="h2" text="${uiLabelMap.ProjectMgrAcceptedCustomerRequestList}"/> + <screenlet title="${uiLabelMap.ProjectMgrAcceptedCustomerRequestList}"> <include-form name="ListRequests" location="component://projectmgr/widget/forms/CustRequestForms.xml"/> - <label style="h2" text="${uiLabelMap.ProjectMgrReviewedCustomerRequestTaskList}"/> + </screenlet> + <screenlet title="${uiLabelMap.ProjectMgrReviewedCustomerRequestTaskList}"> <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/CustRequestForms.xml"/> </screenlet> </widgets> @@ -129,7 +129,7 @@ under the License. <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="lefthalf"> - <screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}"> + <screenlet title="${uiLabelMap.OrderRequestInformation}"> <include-form name="requestInfo" location="component://order/widget/ordermgr/CustRequestForms.xml"/> </screenlet> </container> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectMenus.xml?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectMenus.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectMenus.xml Thu Nov 11 23:07:40 2010 @@ -218,8 +218,7 @@ </link> </menu-item> </menu> - <menu name="ProjectSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - menu-container-style="button-bar button-style-2"> + <menu name="ProjectButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <actions> <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> <set field="hasUpdatePermission" value="${bsh: @@ -230,7 +229,7 @@ "projectId", projectId)); return result.get("hasPermission"); }" type="Boolean"/> </actions> - <menu-item name="newProject" title="${uiLabelMap.ProjectMgrNewProject}"> + <menu-item name="newProject" title="${uiLabelMap.ProjectMgrNewProject}" widget-style="buttontext create"> <condition> <and> <if-compare field="hasUpdatePermission" operator="equals" value="true"/> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Nov 11 23:07:40 2010 @@ -65,7 +65,7 @@ under the License. </section> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="ProjectSubTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/> + <include-menu name="ProjectButtonBar" location="component://projectmgr/widget/ProjectMenus.xml"/> <container style="clear"/> <screenlet name="findProject" collapsible="true" title="${uiLabelMap.PageTitleFindProject}"> <include-form name="FindProject" location="component://projectmgr/widget/forms/ProjectForms.xml"/> Modified: ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css (original) +++ ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css Thu Nov 11 23:07:40 2010 @@ -1486,6 +1486,53 @@ margin-right: 20px; color:#1C334D; } +/*=================== For the quickadd page =================================*/ +.quickaddall{ +float:right; +padding-bottom:1em; +padding-top:1em; +} + +.quickaddtable{ +display:inline-block; +clear:both; +} + +.quickaddtable span { +display:inline; +float:left; +border-right:1px solid #999999; +border-top:1px solid #999999; +margin:0px; +padding:3px; +} + +.quickaddtable p { +clear:left; +height:100% !important; height:1em; +} + +.quickaddtable span.pid { +width:10%; +} + +.quickaddtable span.name { +width:50%; +text-align:left; +} + +.quickaddtable span.listPrice { +width:10% +} + +.quickaddtable span.totalPrice { +width:10% +} + +.quickaddtable span.qty { +width:10% +} + /* ========================================================= */ /* ===== JavaScript jQuery widgets ===== */ /* ========================================================== */ Modified: ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css Thu Nov 11 23:07:40 2010 @@ -2648,3 +2648,50 @@ height:22px; .ui-progressbar { height:2em; text-align: left; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + +/*=================== For the quickadd page =================================*/ +.quickaddall{ +float:right; +padding-bottom:1em; +padding-top:1em; +} + +.quickaddtable{ +display:inline-block; +clear:both; +} + +.quickaddtable span { +display:inline; +float:left; +border-right:1px solid #999999; +border-top:1px solid #999999; +margin:0px; +padding:3px; +} + +.quickaddtable p { +clear:left; +height:100% !important; height:1em; +} + +.quickaddtable span.pid { +width:10%; +} + +.quickaddtable span.name { +width:50%; +text-align:left; +} + +.quickaddtable span.listPrice { +width:10% +} + +.quickaddtable span.totalPrice { +width:10% +} + +.quickaddtable span.qty { +width:10% +} Modified: ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original) +++ ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Thu Nov 11 23:07:40 2010 @@ -2627,3 +2627,50 @@ height:22px; */ .ui-progressbar { height:2em; text-align: left; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + +/*=================== For the quickadd page =================================*/ +.quickaddall{ +float:right; +padding-bottom:1em; +padding-top:1em; +} + +.quickaddtable{ +display:inline-block; +clear:both; +} + +.quickaddtable span { +display:inline; +float:left; +border-right:1px solid #999999; +border-top:1px solid #999999; +margin:0px; +padding:3px; +} + +.quickaddtable p { +clear:left; +height:100% !important; height:1em; +} + +.quickaddtable span.pid { +width:10%; +} + +.quickaddtable span.name { +width:50%; +text-align:left; +} + +.quickaddtable span.listPrice { +width:10% +} + +.quickaddtable span.totalPrice { +width:10% +} + +.quickaddtable span.qty { +width:10% +} Modified: ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css (original) +++ ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css Thu Nov 11 23:07:40 2010 @@ -2685,4 +2685,51 @@ height:22px; * http://docs.jquery.com/UI/Progressbar#theming */ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + +/*=================== For the quickadd page =================================*/ +.quickaddall{ +float:right; +padding-bottom:1em; +padding-top:1em; +} + +.quickaddtable{ +display:inline-block; +clear:both; +} + +.quickaddtable span { +display:inline; +float:left; +border-right:1px solid #999999; +border-top:1px solid #999999; +margin:0px; +padding:3px; +} + +.quickaddtable p { +clear:left; +height:100% !important; height:1em; +} + +.quickaddtable span.pid { +width:10%; +} + +.quickaddtable span.name { +width:50%; +text-align:left; +} + +.quickaddtable span.listPrice { +width:10% +} + +.quickaddtable span.totalPrice { +width:10% +} + +.quickaddtable span.qty { +width:10% +} Modified: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css (original) +++ ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css Thu Nov 11 23:07:40 2010 @@ -1745,6 +1745,7 @@ background: white; border: #999999 solid 1px; margin: 2px 1px 2px 1px; padding: 1px 4px 1px 4px; +line-height: 2em; } A.buttontext { @@ -2738,6 +2739,63 @@ height:22px; .ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +#wait-spinner { +z-index:50000; +position:absolute; +} +#wait-spinner-image { +height:21px; +width:56px; +background-image:url(/images/spinner.gif); +} + +/*=================== For the quickadd page =================================*/ +.quickaddall{ +float:right; +padding-bottom:1em; +padding-top:1em; +} + +.quickaddtable{ +clear:both; +} + +.quickaddtable span { +display:inline; +float:left; +border-right:1px solid #BBBBBB; +border-top:1px solid #BBBBBB; +margin:0px; +padding:3px; +} + +.quickaddtable p { +clear:left; +margin:0px; +padding:0px; +height:100% !important; height:1em; +} + +.quickaddtable span.pid { +width:10%; +} + +.quickaddtable span.name { +width:50%; +text-align:left; +} + +.quickaddtable span.listPrice { +width:10% +} + +.quickaddtable span.totalPrice { +width:10% +} + +.quickaddtable span.qty { +width:10% +} /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ .ui-datepicker-cover { display: none; /*sorry for IE5*/ Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1034192&r1=1034191&r2=1034192&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Thu Nov 11 23:07:40 2010 @@ -2906,4 +2906,51 @@ height:22px; .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 td { font-size: 90%; } \ No newline at end of file +.ui-timepicker-div td { font-size: 90%; } + +/*=================== For the quickadd page =================================*/ +.quickaddall{ +float:right; +padding-bottom:1em; +padding-top:1em; +} + +.quickaddtable{ +display:inline-block; +clear:both; +} + +.quickaddtable span { +display:inline; +float:left; +border-right:1px solid #999999; +border-top:1px solid #999999; +margin:0px; +padding:3px; +} + +.quickaddtable p { +clear:left; +height:100% !important; height:1em; +} + +.quickaddtable span.pid { +width:10%; +} + +.quickaddtable span.name { +width:50%; +text-align:left; +} + +.quickaddtable span.listPrice { +width:10% +} + +.quickaddtable span.totalPrice { +width:10% +} + +.quickaddtable span.qty { +width:10% +} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |