gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#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
This commit is contained in:
Francesco Mangiacrapa 2015-11-24 15:26:01 +00:00
parent 8f115cb47b
commit fdff172559
6 changed files with 35 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.settings/org.eclipse.wst.common.component
View File

@ -5,10 +5,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="workspace-tree-widget-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-BRANCH-6.10.0-SNAPSHOT/workspace-tree-widget-BRANCH-6.10.0-SNAPSHOT">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="workspace-uploader-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-1.0.0-SNAPSHOT-TRUNK/workspace-uploader-1.0.0-SNAPSHOT-TRUNK">
<dependent-module archiveName="workspace-tree-widget-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>

2
src/main/java/org/gcube/portlets/user/workspace/client/view/GxtComboBox.java
View File

@ -39,7 +39,7 @@ public class GxtComboBox {
comboViewScope.setTriggerAction(TriggerAction.ALL);
comboStringFilter = new ComboBox<StringNameFilterModel>();
comboStringFilter.setWidth(150);
// comboStringFilter.setWidth(150);
comboStringFilter.setStore(stringNameFilterModel);
comboStringFilter.setDisplayField("name");
comboStringFilter.setTypeAhead(true);

2
src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
View File

@ -134,8 +134,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
};
GridCellRenderer<FileGridModel> kbRender = new GridCellRenderer<FileGridModel>() {
@Override
public String render(FileGridModel model, String property, ColumnData config,
int rowIndex, int colIndex, ListStore<FileGridModel> store, Grid<FileGridModel> grid) {

2
src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java
View File

@ -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

57
src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java
View File

@ -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");

23
src/main/webapp/workspaceportlet.css
View File

@ -391,15 +391,15 @@
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;
@ -408,14 +408,25 @@
margin-right: auto;
margin-top: auto;
width: 95%;
/* height: 27px !important; */
/* 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;
}