diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/ApplicationView.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/ApplicationView.java index 62f878b..3c7f504 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/ApplicationView.java +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/ApplicationView.java @@ -28,7 +28,9 @@ public class ApplicationView extends ViewImpl implements ApplicationPresenter.Pr initWidget(uiBinder.createAndBindUi(this)); bindSlot(ApplicationPresenter.SLOT_MENU, menu); bindSlot(ApplicationPresenter.SLOT_MAIN, main); + } + } diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.java index ccb7bf2..1865158 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.java +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.java @@ -40,7 +40,8 @@ public class MainAreaView extends ViewWithUiHandlers implemen initWidget(uiBinder.createAndBindUi(this)); bindSlot(MainAreaPresenter.SLOT_FILTER, filterPanel); bindSlot(MainAreaPresenter.SLOT_REPORT, reportPanel); - + + } private void init() { diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.ui.xml b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.ui.xml index 7aa7e45..1367672 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/MainAreaView.ui.xml @@ -4,10 +4,17 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:c="urn:import:com.google.gwt.user.cellview.client" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui" xmlns:b2="urn:import:com.github.gwtbootstrap.datetimepicker.client.ui"> + - - - + + + + + + + + - + diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml index ae56d43..11652a7 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/filter/FilterAreaView.ui.xml @@ -11,11 +11,10 @@ - - Filters - - + + From: @@ -40,11 +39,10 @@ - + - - diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/AppResources.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/AppResources.java index 653cacf..70b4233 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/AppResources.java +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/AppResources.java @@ -15,6 +15,7 @@ public interface AppResources extends ClientBundle { interface uiDataCss extends CssResource { String uiDataBody(); + String uiDataMainPanel(); String uiDataLabel(); String uiDataLabelKeyTag(); String uiDataLabelGeoAreaTag(); diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css index 60bf25a..2c96c13 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/resources/uiData.css @@ -3,6 +3,10 @@ padding-top: 0px; } +.uiDataMainPanel { + background-color: white; +} + .uiDataLabel { word-wrap: break-word; } @@ -58,8 +62,6 @@ margin-right: 10px; } - - .uiDataFiltersPeriodPanel { border-color: #eeeeee !important; border-style: solid !important; @@ -93,9 +95,9 @@ .uiDataExploreTree { /*float: left; margin-right: 10px;*/ + } - .uiDataMainDataPanel { float: left; max-width: 800px;