From 9ce69638cf74d799b601ad80e9f966f2d8c7d0ae Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 4 Jul 2018 14:34:11 +0000 Subject: [PATCH] removed breadcrumb sync git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@169663 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/workspace/client/AppController.java | 6 ++++-- .../user/workspace/client/ConstantsPortlet.java | 4 ++-- .../client/view/panels/GxtBorderLayoutPanel.java | 11 +++-------- .../client/view/panels/GxtSeachAndFilterPanel.java | 9 +++++---- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index df7241a..61c5655 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -742,7 +742,9 @@ public class AppController implements SubscriberInterface { private void doPathElementSelected(PathElementSelectedEvent event) { // appContrExplorer.selectItemInTree(event.getSourceFile().getIdentifier()); - appContrExplorer.expandFolder(event.getSourceFile().getIdentifier()); + //appContrExplorer.expandFolder(event.getSourceFile().getIdentifier()); //removed tree sync + updatGridViewForSelectedItem(event.getSourceFile()); + loadBreadcrumbByFileModel(event.getSourceFile(), true); } }); @@ -1650,7 +1652,7 @@ public class AppController implements SubscriberInterface { else{ String currentIdentifier = currentFolder.getIdentifier(); //Actual id parent - if(!currentIdentifier.equals(item.getParentFileModel().getIdentifier())) {//Update store only if folder parent is differently + if(!currentIdentifier.equals(item.getParentFileModel().getIdentifier())) {//Update store only if folder parent is different updateStoreByRpc(item.getParentFileModel()); //View contents of parent folder } } 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 9d6623f..d9c1bf0 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 @@ -17,7 +17,7 @@ public class ConstantsPortlet { public static final String UPLOADFILE = "Upload"; public static final String DOWNLOADITEM = "Download"; public static final String UPLOADARCHIVE = "Upload Archive"; - public static final String CHANGEPERMISSION = "Change Permissions"; + public static final String CHANGEPERMISSION = "Permissions"; //USED IN HTTP GET AS PARAMETERS public static final String GET_SEARCH_PARAMETER ="search"; @@ -60,7 +60,7 @@ public class ConstantsPortlet { public static final long MILLISECS_PER_DAY = 1000L * 60L * 60L * 24L; - public static final int NORTH_HEIGHT = 40; + public static final int NORTH_HEIGHT = 45; //Tree Panel public static final int HIDE_TREE_PANEL_WHEN_WIDTH_LESS_THAN = 650; 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 a063387..b0d843a 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 @@ -17,6 +17,7 @@ import com.extjs.gxt.ui.client.widget.ContentPanel; import com.extjs.gxt.ui.client.widget.layout.BorderLayout; import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData; import com.extjs.gxt.ui.client.widget.layout.FitLayout; +import com.google.gwt.dom.client.Style.Overflow; import com.google.gwt.user.client.Random; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.RootPanel; @@ -76,6 +77,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { north.setId("NorthPanel"); north.setLayout(new FitLayout()); + north.getElement().getStyle().setOverflowY(Overflow.HIDDEN); west.setId("WestPanel"); west.setLayout(new FitLayout()); center.setId("CenterPanel"); @@ -107,14 +109,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { setHeaderVisible(false); // center.add(this.gridFilter); - BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, 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 northData = new BorderLayoutData(LayoutRegion.NORTH, ConstantsPortlet.NORTH_HEIGHT, ConstantsPortlet.NORTH_HEIGHT, ConstantsPortlet.NORTH_HEIGHT); int treePanelWidth = 330; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java index ef828ab..d53f52f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java @@ -71,9 +71,9 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { * @param toolBarPathPanel the tool bar path panel */ public GxtSeachAndFilterPanel(GxtBreadcrumbPathPanel toolBarPathPanel) { - + setLayout(new FitLayout()); - setBorders(true); + setBorders(false); this.setId("SearchAndFilter"); this.setBorders(false); this.comboBoxGxt = new GxtComboBox(); @@ -131,6 +131,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { iconSearchButton.setVisible(true); } }); + } /** @@ -141,6 +142,8 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { int leftBorder = workspace.getAbsoluteLeft(); int rootWidth = Window.getClientWidth() - 2* leftBorder; //- rightScrollBar; mainPane.setWidth(rootWidth); + mainPane.setHeight(35); + setHeight(35); } /** @@ -163,8 +166,6 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { @Override public void onClick(ClickEvent event) { if(isValidSearch()){ -// seVisibleButtonsCancelSave(true); -// AppController.getEventBus().fireEvent(new SearchTextEvent(textSearch.getValue())); searchText(textBox.getValue()); }else if(textBox.getValue()==null || textBox.getValue().isEmpty()){ searchCancel();