From a77ee547785ea090603159b6a4cfd8ba5c23e943 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 1 Jun 2016 12:54:58 +0000 Subject: [PATCH] Minor glitch fixed to Liferay 6.2 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@128956 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 6 ++ .../workspace/client/ConstantsPortlet.java | 17 ++-- .../client/view/WorkspaceFeaturesView.java | 73 ++++++++------- .../client/view/WorkspaceFeaturesView.ui.xml | 20 +++- .../view/panels/GxtBorderLayoutPanel.java | 91 ++++++++++--------- 5 files changed, 117 insertions(+), 90 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index cdb9db4..8052032 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -8,6 +8,12 @@ uses + + uses + + + uses + diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java index 362637f..8b70e5f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java @@ -1,15 +1,15 @@ package org.gcube.portlets.user.workspace.client; /** - * + * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * + * */ public class ConstantsPortlet { // ToolBar button public static final String CATEGORIZE = ""; - + public static final String REFRESH = "Refresh"; public static final String ADDFOLDER = "New Folder"; public static final String DELETEITEM = "Delete"; @@ -24,7 +24,7 @@ public class ConstantsPortlet { public static final String GET_ITEMID_PARAMETER ="itemid"; public static final String GET_OPERATION_PARAMETER ="operation"; public static final String GET_VALIDATE_SESSION="validatesession"; - + // Div Gwt public static final String WORKSPACEDIV = "workspaceDiv"; @@ -50,13 +50,16 @@ public class ConstantsPortlet { public static final String VIEWSPACE = "";//"Filter by Space"; public static final String PREVIEW = "Preview"; public static final String OPEN = "Open"; - + public static final String TITLEACCESSWEBDAV = "Desktop Access"; - + //COOKIE SETTINGS public static final String GCUBE_COOKIE_WORKSPACE_GRID_VIEW_SETTING = "GCUBE-Cookie-WorkspaceGridViewSetting"; public static final String GCUBE_COOKIE_WORKSPACE_AVAILABLE_FEATURES = "GCUBE-Cookie-WorkspaceAvailableFeatures"; public static final int COOKIE_EXPIRE_DAYS = 30; public static final long MILLISECS_PER_DAY = 1000L * 60L * 60L * 24L; - + + + public static final int NORTH_HEIGHT = 70; + } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java index 56a5b45..676d9cf 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java @@ -1,5 +1,5 @@ /** - * + * */ package org.gcube.portlets.user.workspace.client.view; @@ -18,7 +18,6 @@ import com.github.gwtbootstrap.client.ui.constants.Trigger; import com.github.gwtbootstrap.client.ui.event.ClosedEvent; import com.github.gwtbootstrap.client.ui.event.ClosedHandler; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Style.VerticalAlign; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; @@ -39,56 +38,56 @@ import com.google.gwt.user.client.ui.Widget; * Nov 6, 2015 */ public class WorkspaceFeaturesView extends Composite { - + @UiField Alert alert_ws_features; - + @UiField HorizontalPanel ws_features; - + @UiField HorizontalPanel hp_feautures; - + @UiField HorizontalPanel info_features; - + @UiField com.google.gwt.user.client.ui.Label how_to; - + @UiField Label shf; //Share Folders & Files - + private Popover overShF= new Popover(); - + @UiField Label upl; //UPLOAD - + private Popover overUpload = new Popover(); - + @UiField Label plk; //PUBLIC LINK private Popover overPlk = new Popover(); - - + + @UiField FlowPanel fp1; - + @UiField FlowPanel fp2; - + @UiField FlowPanel fp3; - + @UiField CheckBox ck_features_show_again; - + @UiField Button btn_hide_ws_feautures_panel; private static WorkspaceFeaturesUiBinder uiBinder = GWT.create(WorkspaceFeaturesUiBinder.class); - + /** * The Interface WorkspaceFeaturesUiBinder. * @@ -98,7 +97,7 @@ public class WorkspaceFeaturesView extends Composite { interface WorkspaceFeaturesUiBinder extends UiBinder { } - + /** * Instantiates a new workspace features view. */ @@ -109,24 +108,24 @@ public class WorkspaceFeaturesView extends Composite { hp_feautures.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); ws_features.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); hp_feautures.setCellWidth(fp1, "33%"); - + Image info = Resources.getIconInformation().createImage(); info.setTitle("Workspace available features"); info_features.insert(info, 0); info_features.setCellVerticalAlignment(how_to, HasVerticalAlignment.ALIGN_MIDDLE); how_to.addStyleName("margin-left-5"); hp_feautures.setCellVerticalAlignment(fp1, HasVerticalAlignment.ALIGN_MIDDLE); - + hp_feautures.setCellWidth(fp2, "33%"); hp_feautures.setCellHorizontalAlignment(fp2, HasHorizontalAlignment.ALIGN_CENTER); hp_feautures.setCellVerticalAlignment(fp2, HasVerticalAlignment.ALIGN_MIDDLE); hp_feautures.setCellWidth(fp3, "33%"); hp_feautures.setCellHorizontalAlignment(fp3, HasHorizontalAlignment.ALIGN_RIGHT); hp_feautures.setCellVerticalAlignment(fp3, HasVerticalAlignment.ALIGN_MIDDLE); - - ck_features_show_again.getElement().getStyle().setVerticalAlign(VerticalAlign.MIDDLE); - ck_features_show_again.getElement().getFirstChildElement().setId("check_features_donotshowagain"); - + +// ck_features_show_again.getElement().getStyle().setVerticalAlign(VerticalAlign.MIDDLE); +// ck_features_show_again.getElement().getFirstChildElement().setId("check_features_donotshowagain"); + ck_features_show_again.addStyleName("margin-right-10"); shf.addStyleName("margin-right-10"); upl.addStyleName("margin-right-10"); @@ -134,21 +133,21 @@ public class WorkspaceFeaturesView extends Composite { initPopupShareFeature(); initPopupUploadFeature(); initPopupPlkFeature(); - + alert_ws_features.addClosedHandler(new ClosedHandler() { - + @Override public void onClosed(ClosedEvent event) { Boolean isChecked = ck_features_show_again.getValue(); Boolean showAgain = !isChecked; GWT.log("Close alert_ws_features, show again? "+showAgain.toString().toLowerCase()); AppController.setCookie(ConstantsPortlet.GCUBE_COOKIE_WORKSPACE_AVAILABLE_FEATURES, showAgain.toString().toLowerCase(), ConstantsPortlet.COOKIE_EXPIRE_DAYS); - + } }); - + btn_hide_ws_feautures_panel.addClickHandler(new ClickHandler() { - + @Override public void onClick(ClickEvent event) { Boolean isChecked = ck_features_show_again.getValue(); @@ -159,7 +158,7 @@ public class WorkspaceFeaturesView extends Composite { } }); } - + /** * Inits the popup share feature. */ @@ -189,13 +188,13 @@ public class WorkspaceFeaturesView extends Composite { +iconUploadDND+ "1 - Drop your files from Desktop;
" +iconUploadFile+ "2 - Click 'Upload' and Browse Files;
" +iconUploadArchive+ "3 - Upload a zip file to unzip directly its content in the Workspace.
"); - + overUpload.setHtml(true); overUpload.setPlacement(Placement.BOTTOM); overUpload.setTrigger(Trigger.HOVER); overUpload.reconfigure(); } - + /** * Inits the popup plk feature. */ @@ -210,14 +209,14 @@ public class WorkspaceFeaturesView extends Composite { overPlk.setTrigger(Trigger.HOVER); overPlk.reconfigure(); } - + /* (non-Javadoc) * @see com.google.gwt.user.client.ui.UIObject#setVisible(boolean) */ public void setVisible(boolean bool){ this.setVisible(bool); } - - + + } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml index dd319fa..085e36f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml @@ -1,6 +1,21 @@ + + + .label-check { + display: inline !important; + vertical-align: middle !important; + } + + .label-check input { + margin-right: 2px !important; + margin-top: 0px !important; + vertical-align: middle !important; + } + + + @@ -10,7 +25,8 @@ - + @@ -20,7 +36,7 @@ + ui:field="ck_features_show_again" styleName="{style.label-check}"> diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java index 5db5b5c..822bf81 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java @@ -26,6 +26,9 @@ import com.google.gwt.user.client.Random; * Nov 10, 2015 */ public class GxtBorderLayoutPanel extends ContentPanel { + /** + * + */ private ContentPanel north = new ContentPanel(); private ContentPanel west = new ContentPanel(); private ContentPanel center = new ContentPanel(); @@ -37,7 +40,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { private GxtCardLayoutResultPanel gxtCardLayoutResultPanel; private MultipleDNDUpload dnd; - + /** * Instantiates a new gxt border layout panel. * @@ -52,13 +55,13 @@ public class GxtBorderLayoutPanel extends ContentPanel { ExplorerPanel explorerPanel, GxtCardLayoutResultPanel gxtCardLayoutResultPanel, GxtBottomToolBarItem detailsContainer2, MultipleDNDUpload dnd) { - + this.searchAndFilterContainer = searchAndFilterContainer2; this.expPanel = explorerPanel; this.gxtCardLayoutResultPanel = gxtCardLayoutResultPanel; this.toolBarItemDetails = detailsContainer2; this.dnd = dnd; - + this.initLayout(); this.createLayouts(); } @@ -67,9 +70,9 @@ public class GxtBorderLayoutPanel extends ContentPanel { * Inits the layout. */ private void initLayout(){ - + north.setId("NorthPanel"); - + north.setLayout(new FitLayout()); west.setId("WestPanel"); west.setLayout(new FitLayout()); @@ -79,56 +82,56 @@ public class GxtBorderLayoutPanel extends ContentPanel { east.setId("EastPanel"); center.setScrollMode(Scroll.AUTOX); center.setBorders(false); - + north.setHeaderVisible(false); west.setHeaderVisible(false); - + south.setHeading(ConstantsPortlet.DETAILS); south.setHeaderVisible(false); south.setLayout(new FitLayout()); - + east.setVisible(false); // south.setVisible(false); } - + /** * Creates the layouts. */ private void createLayouts(){ - + final BorderLayout borderLayout = new BorderLayout(); setLayout(borderLayout); //setStyleAttribute("padding", "10px"); setHeaderVisible(false); // center.add(this.gridFilter); - BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, 60, 60, 60); + BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, ConstantsPortlet.NORTH_HEIGHT, ConstantsPortlet.NORTH_HEIGHT, ConstantsPortlet.NORTH_HEIGHT); northData.setCollapsible(true); northData.setSplit(true); //Split bar between regions -// northData.setFloatable(true); - northData.setCollapsible(true); -// northData.setHideCollapseTool(false); -// northData.setSplit(true); - northData.setMargins(new Margins(0, 0, 1, 0)); - - BorderLayoutData westData = new BorderLayoutData(LayoutRegion.WEST, 330,330,400); - westData.setSplit(true); - westData.setCollapsible(true); +// northData.setFloatable(true); + northData.setCollapsible(true); +// northData.setHideCollapseTool(false); +// northData.setSplit(true); + northData.setMargins(new Margins(0, 0, 1, 0)); + + BorderLayoutData westData = new BorderLayoutData(LayoutRegion.WEST, 330,330,400); + westData.setSplit(true); + westData.setCollapsible(true); westData.setMargins(new Margins(0,1,0,0)); - - BorderLayoutData centerData = new BorderLayoutData(LayoutRegion.CENTER); + + BorderLayoutData centerData = new BorderLayoutData(LayoutRegion.CENTER); centerData.setMargins(new Margins(0)); - - BorderLayoutData eastData = new BorderLayoutData(LayoutRegion.EAST, 150,50,150); - eastData.setSplit(true); - eastData.setCollapsible(true); - eastData.setMargins(new Margins(0,0,0,1)); - - BorderLayoutData southData = new BorderLayoutData(LayoutRegion.SOUTH, 30,30,30); - southData.setSplit(true); - southData.setCollapsible(false); - southData.setMargins(new Margins(1, 0, 0, 0)); - + + BorderLayoutData eastData = new BorderLayoutData(LayoutRegion.EAST, 150,50,150); + eastData.setSplit(true); + eastData.setCollapsible(true); + eastData.setMargins(new Margins(0,0,0,1)); + + BorderLayoutData southData = new BorderLayoutData(LayoutRegion.SOUTH, 30,30,30); + southData.setSplit(true); + southData.setCollapsible(false); + southData.setMargins(new Margins(1, 0, 0, 0)); + north.add(this.searchAndFilterContainer); north.setScrollMode(Scroll.AUTOY); west.add(this.expPanel); @@ -140,9 +143,9 @@ public class GxtBorderLayoutPanel extends ContentPanel { searchAndFilterContainer.getToolbarPathPanel().refreshSize(); } - + }); - + center.addListener(Events.Resize,new Listener(){ @Override @@ -152,7 +155,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { updateSizeGrid(); } }); - + gxtCardLayoutResultPanel.addListener(Events.Render, new Listener() { @Override @@ -160,7 +163,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { updateSizeCard(); } }); - + gxtCardLayoutResultPanel.getGridGroupViewContainer().addListener(Events.Render, new Listener() { @Override @@ -179,28 +182,28 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void handleEvent(BoxComponentEvent be) { expPanel.getAsycTreePanel().setSizeTreePanel(expPanel.getWidth()-13, expPanel.getHeight()-39); if(expPanel.getSmartFolderPanel()!=null) - expPanel.getSmartFolderPanel().setSizeSmartPanel(expPanel.getWidth()-2, expPanel.getHeight()-29); + expPanel.getSmartFolderPanel().setSizeSmartPanel(expPanel.getWidth()-2, expPanel.getHeight()-29); } }); - add(north, northData); - add(west, westData); - add(center, centerData); + add(north, northData); + add(west, westData); + add(center, centerData); add(east, eastData); } - + /** * Update size card. */ private void updateSizeCard(){ gxtCardLayoutResultPanel.setSize(center.getWidth()-2, center.getHeight()); } - + /** * Update size grid. */ private void updateSizeGrid(){ - gxtCardLayoutResultPanel.getGridGroupViewContainer().refreshSize((center.getWidth()-5)+"px", (center.getHeight()-75)+"px"); + gxtCardLayoutResultPanel.getGridGroupViewContainer().refreshSize(center.getWidth()-5+"px", center.getHeight()-75+"px"); } /**