From fdff1725595d58ec02ab16c77bee6a5a2096679c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 24 Nov 2015 15:26:01 +0000 Subject: [PATCH] #1260 Updated CSS to fix the issue git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@120383 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 5 +- .../workspace/client/view/GxtComboBox.java | 2 +- .../view/grids/GxtGridFilterGroupPanel.java | 6 +- .../view/panels/GxtBorderLayoutPanel.java | 2 +- .../view/panels/GxtSeachAndFilterPanel.java | 57 ++----------------- src/main/webapp/workspaceportlet.css | 37 +++++++----- 6 files changed, 35 insertions(+), 74 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 390de71..a1b4e42 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,10 +5,7 @@ - - uses - - + uses diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/GxtComboBox.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/GxtComboBox.java index 5ea8240..1bf2e43 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/GxtComboBox.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/GxtComboBox.java @@ -39,7 +39,7 @@ public class GxtComboBox { comboViewScope.setTriggerAction(TriggerAction.ALL); comboStringFilter = new ComboBox(); - comboStringFilter.setWidth(150); +// comboStringFilter.setWidth(150); comboStringFilter.setStore(stringNameFilterModel); comboStringFilter.setDisplayField("name"); comboStringFilter.setTypeAhead(true); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java index acd05e3..eaeed8f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java @@ -133,10 +133,8 @@ public class GxtGridFilterGroupPanel extends LayoutContainer { } }; - GridCellRenderer kbRender = new GridCellRenderer() { - - - @Override + GridCellRenderer kbRender = new GridCellRenderer() { + @Override public String render(FileGridModel model, String property, ColumnData config, int rowIndex, int colIndex, ListStore store, Grid grid) { 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 cd969fa..6f69823 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 @@ -103,7 +103,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { // center.add(this.gridFilter); - BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, 63, 63, 70); + BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, 60, 60, 60); northData.setCollapsible(true); northData.setSplit(true); //Split bar between regions 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 144f81c..c007cf2 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 @@ -75,7 +75,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { this.comboBoxGxt = new GxtComboBox(); this.cbViewScope = this.comboBoxGxt.getComboViewScope(); this.cbNameFilter = this.comboBoxGxt.getComboStringFilter(); - this.textSearch.setId("TextSearch"); + this.textSearch.setId("text-search"); // this.textSearch.setStyleAttribute("margin-bottom", "0px"); this.cbViewScope.setWidth(360); // this.cbViewScope.setAutoWidth(true); @@ -86,7 +86,8 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { textSearch.setAllowBlank(true); textSearch.setEmptyText(ConstantsPortlet.SEARCHBYNAME); - textSearch.setWidth(325); +// textSearch.setWidth(325); +// textSearch.setHeight(12); /* COMMENTED TO FIX https://support.social.isti.cnr.it/ticket/87 textSearch.setRegex("^[a-zA-Z0-9]+[ a-zA-Z0-9_().-]*"); //alphanumeric @@ -96,64 +97,18 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { hp.add(textSearch); bSearch.setStyleName("wizardButton"); - bSearch.getElement().getStyle().setMarginLeft(3, Unit.PX); +// bSearch.getElement().getStyle().setMarginLeft(3, Unit.PX); bCancel.setStyleName("wizardButton"); bCancel.getElement().getStyle().setMarginLeft(3, Unit.PX); bSave.setStyleName("wizardButton"); bSave.getElement().getStyle().setMarginLeft(3, Unit.PX); - /*bSearchIn.addStyleName("bSearchIn"); -// hpSearchIn.setVerticalAlign(VerticalAlignment.BOTTOM); - bSearchIn.addClickHandler(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - final WorkspaceExplorerSelectDialog navigator = new WorkspaceExplorerSelectDialog("Select a Folder", true); - - WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { - - @Override - public void onSelectedItem(Item item) { - GWT.log("onSelectedItem: "+item); - selectedFolderToSearch(item); - navigator.hide(); - } - - @Override - public void onFailed(Throwable throwable) { - GWT.log("onFailed.."); - - } - - @Override - public void onAborted() { - GWT.log("onAborted.."); - - } - - @Override - public void onNotValidSelection() { - GWT.log("onNotValidSelection.."); - - } - }; - - navigator.addWorkspaceExplorerSelectNotificationListener(listener); - navigator.show(); - } - });*/ - /* - initSearchIn(); - hpSearchIn.setVerticalAlign(VerticalAlignment.MIDDLE); - labelSearchIn.setStyleAttribute("margin-right", "2px"); - hp.add(hpSearchIn); - */ hp.add(bSearch); hp.add(bSave); hp.setVerticalAlign(VerticalAlignment.MIDDLE); - hp.setHeight(20); - hpMain.setHeight(20); +// hp.setHeight(20); +// hpMain.setHeight(20); bSearch.setWidth("70px"); bSave.setWidth("70px"); diff --git a/src/main/webapp/workspaceportlet.css b/src/main/webapp/workspaceportlet.css index 9948d2b..21c341c 100644 --- a/src/main/webapp/workspaceportlet.css +++ b/src/main/webapp/workspaceportlet.css @@ -391,31 +391,42 @@ width: 33%; } -.margin-right-10{ +.margin-right-10 { margin-right: 10px; } -.margin-left-5{ +.margin-left-5 { margin-left: 5px; } -.alert_ws_features{ +.alert_ws_features { background: #FFF !important; - border: 1px solid #99BBE8 !important; - color: #226599 !important; - margin-bottom: 5px !important; - margin-left: auto; - margin-right: auto; - margin-top: auto; - width: 95%; -/* height: 27px !important; */ + border: 1px solid #99BBE8 !important; + color: #226599 !important; + margin-bottom: 5px !important; + margin-left: auto; + margin-right: auto; + margin-top: auto; + width: 95%; + /* height: 27px !important; */ } -.alert_ws_features .close{ +.alert_ws_features .close { top: 6px !important; } -#check_features_donotshowagain{ +#check_features_donotshowagain { margin-right: 2px; vertical-align: middle; +} + +#text-search { + margin-right: 3px; + width: 325px !important; +} + +#text-search>input:first-child { + height: 18px !important; + width: 319px !important; + padding: 1px 2px; } \ No newline at end of file