diff --git a/.classpath b/.classpath
index 09a96fa..925e0d5 100644
--- a/.classpath
+++ b/.classpath
@@ -33,5 +33,7 @@
+
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index c8667c7..1483216 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francesco-mangiacrapa/wseclipseluna/workspace-TRUNK/target/workspace-6.17.4-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/workspace/target/workspace-6.19.1-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 602d398..ac32b80 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,14 +1,17 @@
-
+
-
+
uses
-
+
+ uses
+
+
uses
diff --git a/.tern-project b/.tern-project
index a185ba0..61348cc 100644
--- a/.tern-project
+++ b/.tern-project
@@ -1 +1,17 @@
-{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}
\ No newline at end of file
+{
+ "plugins": {
+ "aui": {
+
+ },
+ "liferay": {
+
+ },
+ "yui": {
+
+ }
+ },
+ "libs": [
+ "ecma5",
+ "browser"
+ ]
+}
\ No newline at end of file
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 a37f0bd..86295cc 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
@@ -605,8 +605,6 @@ public class AppController implements SubscriberInterface {
if(wsPortlet.getGxtCardLayoutResultPanel().getActivePanel() instanceof GxtItemsPanel){ //If active panel is panel with file items
- wsPortlet.getSearchAndFilterContainer().setVisibleButtonSave(true); //ADDED 24/04/2012
-
wsPortlet.getGridGroupContainer().setBorderAsOnSearch(true);
wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.LOADING,ConstantsExplorer.LOADINGSTYLE);
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 674c884..9d6623f 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
@@ -45,7 +45,7 @@ public class ConstantsPortlet {
public static final String SEARCH = "Search";
public static final String SAVE = "Save";
public static final String CANCEL = "Cancel";
- public static final String SEARCHBYNAME = "Search by name";
+ public static final String SEARCHBYNAME = "Search Workspace";
public static final String SEARCHINMESSAGE = "Search in messages";
public static final String VIEWSPACE = "";//"Filter by Space";
public static final String PREVIEW = "Preview";
@@ -60,7 +60,7 @@ public class ConstantsPortlet {
public static final long MILLISECS_PER_DAY = 1000L * 60L * 60L * 24L;
- public static final int NORTH_HEIGHT = 82;
+ public static final int NORTH_HEIGHT = 40;
//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/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
index 0b76d32..9dd3725 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
@@ -125,12 +125,10 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
@Override
public String render(FileGridModel model, String property, ColumnData config, int rowIndex, int colIndex, ListStore store, Grid grid) {
String val = model.get(property);
- String color = "black";
-
- if(val==null || val.isEmpty())
+ if(val==null || val.isEmpty())
return "";
- return "" + val + "";
+ return "" + val + "";
}
};
@@ -142,11 +140,10 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
long value = (Long) model.get(property);
if(value!=-1){
- String color = "black";
double kb = value/1024;
if(kb<1)
kb=1;
- return "" + number.format(kb) + "";
+ return "" + number.format(kb) + "";
}
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 90a4bd0..a063387 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
@@ -107,7 +107,7 @@ public class GxtBorderLayoutPanel extends ContentPanel {
setHeaderVisible(false);
// center.add(this.gridFilter);
- BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, ConstantsPortlet.NORTH_HEIGHT, ConstantsPortlet.NORTH_HEIGHT, ConstantsPortlet.NORTH_HEIGHT);
+ BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, ConstantsPortlet.NORTH_HEIGHT);
northData.setCollapsible(true);
northData.setSplit(true); //Split bar between regions
// northData.setFloatable(true);
@@ -194,9 +194,9 @@ public class GxtBorderLayoutPanel extends ContentPanel {
@Override
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.getAsycTreePanel().setSizeTreePanel(expPanel.getWidth()-13, expPanel.getHeight()-10);
+// if(expPanel.getSmartFolderPanel()!=null)
+// expPanel.getSmartFolderPanel().setSizeSmartPanel(expPanel.getWidth()-2, expPanel.getHeight()-29);
}
});
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 b8475f8..ef828ab 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
@@ -4,7 +4,6 @@ import java.util.List;
import org.gcube.portlets.user.workspace.client.AppController;
import org.gcube.portlets.user.workspace.client.ConstantsPortlet;
-import org.gcube.portlets.user.workspace.client.event.SaveSmartFolderEvent;
import org.gcube.portlets.user.workspace.client.event.ScopeChangeEvent;
import org.gcube.portlets.user.workspace.client.event.SearchTextEvent;
import org.gcube.portlets.user.workspace.client.model.ScopeModel;
@@ -12,26 +11,31 @@ import org.gcube.portlets.user.workspace.client.view.GxtComboBox;
import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBreadcrumbPathPanel;
import com.extjs.gxt.ui.client.Style.VerticalAlignment;
-import com.extjs.gxt.ui.client.event.ComponentEvent;
-import com.extjs.gxt.ui.client.event.KeyListener;
import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
import com.extjs.gxt.ui.client.event.SelectionChangedListener;
import com.extjs.gxt.ui.client.widget.HorizontalPanel;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
-import com.extjs.gxt.ui.client.widget.VerticalPanel;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
import com.extjs.gxt.ui.client.widget.form.DateField;
import com.extjs.gxt.ui.client.widget.form.SimpleComboBox;
import com.extjs.gxt.ui.client.widget.form.TextField;
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.github.gwtbootstrap.client.ui.Button;
-import com.google.gwt.dom.client.Style.Unit;
+import com.github.gwtbootstrap.client.ui.InputAddOn;
+import com.github.gwtbootstrap.client.ui.TextBox;
+import com.github.gwtbootstrap.client.ui.constants.ButtonType;
+import com.github.gwtbootstrap.client.ui.constants.IconType;
+import com.github.gwtbootstrap.client.ui.resources.ButtonSize;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.KeyPressEvent;
+import com.google.gwt.event.dom.client.KeyPressHandler;
import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
/**
@@ -44,19 +48,21 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
private GxtComboBox comboBoxGxt = null;
private ComboBox cbViewScope = null;
- private final TextField textSearch = new TextField();
+ //private final TextField textSearch = new TextField();
+
+ InputAddOn searchAddOn = new InputAddOn();
+ private TextBox textBox = new TextBox();
private Button bSearch = new Button(ConstantsPortlet.SEARCH);
- private Button bCancel = new Button(ConstantsPortlet.CANCEL);
- private Button bSave = new Button(ConstantsPortlet.SAVE);
+ private Button bHide = new Button("X");
private TextField textFull = new TextField();
private DateField fromDate = new DateField();
private DateField toDate = new DateField();
private SimpleComboBox cbNameFilter = null;
private boolean isSearchActive = false;
- private VerticalPanel verticalPanel = new VerticalPanel();
- private HorizontalPanel hp = new HorizontalPanel();
-
- private HorizontalPanel hpMain = new HorizontalPanel();
+ private VerticalPanel container = new VerticalPanel();
+ private HorizontalPanel mainPane = new HorizontalPanel();
+ private Button iconSearchButton = new Button("", IconType.SEARCH);
+ private SimplePanel hpMain = new SimplePanel();
private GxtBreadcrumbPathPanel toolbarPahtPanel;
/**
@@ -73,54 +79,34 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
this.comboBoxGxt = new GxtComboBox();
this.cbViewScope = this.comboBoxGxt.getComboViewScope();
this.cbNameFilter = this.comboBoxGxt.getComboStringFilter();
- this.textSearch.setId("text-search");
- this.cbViewScope.setWidth(360);
+ this.textBox.setId("text-search");
this.toolbarPahtPanel = toolBarPathPanel;
-
- hp.setStyleAttribute("margin-left", "2px");
- seVisibleButtonsCancelSave(false);
-
- textSearch.setAllowBlank(true);
- textSearch.setEmptyText(ConstantsPortlet.SEARCHBYNAME);
-
- /* COMMENTED TO FIX https://support.social.isti.cnr.it/ticket/87
- textSearch.setRegex("^[a-zA-Z0-9]+[ a-zA-Z0-9_().-]*"); //alphanumeric
- textSearch.getMessages().setRegexText(ConstantsExplorer.MESSAGE_SEARCH_FORCE_APHANUMERIC);
- textSearch.setAutoValidate(true);
- */
- hp.add(textSearch);
-
-// bSearch.setStyleName("wizardButton");
-// 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);
-
- hp.add(bSearch);
- hp.add(bSave);
- hp.setVerticalAlign(VerticalAlignment.MIDDLE);
- bSearch.addStyleName("button_toolbar");
- bSave.addStyleName("button_toolbar");
- cbViewScope.setStyleAttribute("margin-left", "132px");
- cbViewScope.setStyleAttribute("margin-top", "2px");
-
- hpMain.setId("hpSearchAndFilter");
-// hpMain.setStyleAttribute("background", "#D0DEF0");
- verticalPanel.setId("VerticalPanelSearchAndFilter");
- verticalPanel.setStyleAttribute("background", "#D0DEF0");
- hpMain.add(hp);
- hpMain.setVerticalAlign(VerticalAlignment.MIDDLE);
-
+
+ searchAddOn.add(textBox);
+ searchAddOn.add(bSearch);
+ searchAddOn.add(bHide);
+ textBox.setPlaceholder(ConstantsPortlet.SEARCHBYNAME);
+ hpMain.add(searchAddOn);
+ mainPane.setId("VerticalPanelSearchAndFilter");
+
+ iconSearchButton.setSize(ButtonSize.LARGE);
+ iconSearchButton.setType(ButtonType.LINK);
+ iconSearchButton.getElement().getStyle().setColor("#999");
+
//SOLUTION FOR SCOPE INVISIBLE
cbViewScope.setVisible(false);
- verticalPanel.add(this.toolbarPahtPanel.getToolBarPathPanel());
- verticalPanel.add(hpMain);
- verticalPanel.setVerticalAlign(VerticalAlignment.MIDDLE);
+
+
+ mainPane.add(hpMain);
+ mainPane.add(iconSearchButton);
+ mainPane.add(this.toolbarPahtPanel.getToolBarPathPanel());
+
+ mainPane.setVerticalAlign(VerticalAlignment.MIDDLE);
this.addListeners();
- add(verticalPanel);
+ container.add(mainPane);
+ add(container);
updateSize();
Window.addResizeHandler(new ResizeHandler() {
@@ -129,8 +115,22 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
updateSize();
}
});
-
+ hpMain.setVisible(false);
+ iconSearchButton.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ hpMain.setVisible(true);
+ iconSearchButton.setVisible(false);
+ }
+ });
layout();
+ bHide.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ hpMain.setVisible(false);
+ iconSearchButton.setVisible(true);
+ }
+ });
}
/**
@@ -140,12 +140,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
RootPanel workspace = RootPanel.get(ConstantsPortlet.WORKSPACEDIV);
int leftBorder = workspace.getAbsoluteLeft();
int rootWidth = Window.getClientWidth() - 2* leftBorder; //- rightScrollBar;
-
- //SOLUTION FOR SCOPE INVISIBLE
- hp.setWidth(rootWidth);
-
-// ORIGINAL CODE
-// hp.setWidth(rootWidth - 500);
+ mainPane.setWidth(rootWidth);
}
/**
@@ -154,8 +149,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
* @param value the value
*/
public void searchText(String value){
- textSearch.setValue(value);
- seVisibleButtonsCancelSave(true);
+ textBox.setValue(value);
String parentId = toolbarPahtPanel.getLastParent()!=null?toolbarPahtPanel.getLastParent().getIdentifier():null;
AppController.getEventBus().fireEvent(new SearchTextEvent(value, parentId));
}
@@ -171,39 +165,28 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
if(isValidSearch()){
// seVisibleButtonsCancelSave(true);
// AppController.getEventBus().fireEvent(new SearchTextEvent(textSearch.getValue()));
- searchText(textSearch.getValue());
- }else if(textSearch.getValue()==null || textSearch.getValue().isEmpty()){
+ searchText(textBox.getValue());
+ }else if(textBox.getValue()==null || textBox.getValue().isEmpty()){
searchCancel();
}
}
});
- KeyListener keyListener = new KeyListener() {
- public void componentKeyUp(ComponentEvent event) {
- if (event.getKeyCode() == 13) { // KEY_ENTER
+ textBox.addKeyPressHandler(new KeyPressHandler() {
+
+ @Override
+ public void onKeyPress(KeyPressEvent event) {
+ if (event.getNativeEvent().getKeyCode() == 13) { // KEY_ENTER
if(isValidSearch()){
- searchText(textSearch.getValue());
- }else if(textSearch.getValue()==null || textSearch.getValue().isEmpty()){
+ searchText(textBox.getValue());
+ }else if(textBox.getValue()==null || textBox.getValue().isEmpty()){
searchCancel();
}
}
- }
- };
-
- textSearch.addKeyListener(keyListener);
-//
-
- bSave.addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- if(textSearch.getValue()!=null && !textSearch.getValue().isEmpty() && textSearch.isValid()){
- if (textSearch.getValue() != null && textSearch.getValue().length()>0) {
- String parentId = toolbarPahtPanel.getLastParent()!=null?toolbarPahtPanel.getLastParent().getIdentifier():null;
- AppController.getEventBus().fireEvent(new SaveSmartFolderEvent(null, textSearch.getValue(), parentId));
- }
- }
+
}
});
+
this.cbViewScope.addSelectionChangedListener(new SelectionChangedListener() {
@@ -223,7 +206,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
* Reset fields.
*/
public void resetFields(){
- this.textSearch.reset();
+ this.textBox.setValue("");
this.textFull.reset();
this.fromDate.reset();
this.toDate.reset();
@@ -237,26 +220,15 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
* @return true, if is valid search
*/
private boolean isValidSearch(){
- return textSearch.getValue()!=null && !textSearch.getValue().isEmpty() && textSearch.isValid();
+ return textBox.getValue()!=null && !textBox.getValue().isEmpty();
}
- /**
- * Se visible buttons cancel save.
- *
- * @param flag the flag
- */
- public void seVisibleButtonsCancelSave(boolean flag){
-
- this.bCancel.setVisible(flag);
- this.bSave.setVisible(flag);
- }
/**
* Search cancel.
*/
public void searchCancel(){
resetFields();
- seVisibleButtonsCancelSave(false);
}
/**
@@ -297,14 +269,6 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
this.isSearchActive = isSearchActive;
}
- /**
- * Sets the visible button save.
- *
- * @param bool the new visible button save
- */
- public void setVisibleButtonSave(boolean bool){
- this.bSave.setVisible(bool);
- }
/**
* Sets the empty text.
@@ -312,7 +276,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer {
* @param emptyText the new empty text
*/
public void setEmptyText(String emptyText){
- textSearch.setEmptyText(emptyText);
+ textBox.setText(emptyText);
}
/**
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
index 4233e8d..9e3dd9a 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
@@ -103,7 +103,7 @@ public class GxtToolBarItemFunctionality {
btnGridView = new ToggleButton(ConstantsPortlet.CATEGORIZE, Resources.getIconGridView());
btnGridView.setToolTip("Categorize");
- btnGridView.setScale(ButtonScale.SMALL);
+ btnGridView.setScale(ButtonScale.MEDIUM);
btnGridView.setIconAlign(IconAlign.TOP);
btnGridView.toggle(true);
btnGridView.setArrowAlign(ButtonArrowAlign.BOTTOM);
@@ -142,14 +142,6 @@ public class GxtToolBarItemFunctionality {
toolBar.add(btnRefreshFolder);
toolBar.add(new SeparatorToolItem());
- // btnGetInfo = new Button("Info", Resources.getIconInfo());
- // btnGetInfo.setScale(ButtonScale.SMALL);
- // btnGetInfo.setIconAlign(IconAlign.TOP);
- // btnGetInfo.setArrowAlign(ButtonArrowAlign.BOTTOM);
- //
- // toolBar.add(btnGetInfo);
- // toolBar.add(new SeparatorToolItem());
-
btnRemoveItem = new Button(ConstantsPortlet.DELETEITEM,
Resources.getIconDeleteItem());
btnRemoveItem.setScale(ButtonScale.SMALL);
@@ -157,8 +149,6 @@ public class GxtToolBarItemFunctionality {
btnRemoveItem.setArrowAlign(ButtonArrowAlign.BOTTOM);
toolBar.add(btnRemoveItem);
- // toolBar.add(new SeparatorToolItem());
- // toolBar.add(new SeparatorToolItem());
btnRenameItem = new Button(ConstantsPortlet.RENAMEITEM, Resources.getIconRenameItem());
btnRenameItem.setScale(ButtonScale.SMALL);
@@ -167,27 +157,6 @@ public class GxtToolBarItemFunctionality {
toolBar.add(btnRenameItem);
- //COPY
- btnCopyItem = new Button("Copy", Resources.getIconCopy());
- btnCopyItem.setScale(ButtonScale.SMALL);
- btnCopyItem.setIconAlign(IconAlign.TOP);
- toolBar.add(btnCopyItem);
-
-
- //CUT
- btnCutItem = new Button("Cut", Resources.getIconCut());
- btnCutItem.setScale(ButtonScale.SMALL);
- btnCutItem.setIconAlign(IconAlign.TOP);
- // toolBar.add(btnCutItem);
-
- //PASTE
- btnPasteItem = new Button("Paste", Resources.getIconPaste());
- btnPasteItem.setScale(ButtonScale.SMALL);
- btnPasteItem.setIconAlign(IconAlign.TOP);
- btnPasteItem.setEnabled(false); //BY DEFAULT IS DISABLED
-
- toolBar.add(btnPasteItem);
-
btnPreview = new Button(ConstantsPortlet.PREVIEW ,Resources.getIconPreview());
btnPreview.setScale(ButtonScale.SMALL);
btnPreview.setIconAlign(IconAlign.TOP);
@@ -226,6 +195,28 @@ public class GxtToolBarItemFunctionality {
btnFolderLink.setArrowAlign(ButtonArrowAlign.BOTTOM);
toolBar.add(btnFolderLink);
+
+ //COPY
+ btnCopyItem = new Button("Copy", Resources.getIconCopy());
+ btnCopyItem.setScale(ButtonScale.SMALL);
+ btnCopyItem.setIconAlign(IconAlign.TOP);
+ toolBar.add(btnCopyItem);
+
+
+ //CUT
+ btnCutItem = new Button("Cut", Resources.getIconCut());
+ btnCutItem.setScale(ButtonScale.SMALL);
+ btnCutItem.setIconAlign(IconAlign.TOP);
+ // toolBar.add(btnCutItem);
+
+ //PASTE
+ btnPasteItem = new Button("Paste", Resources.getIconPaste());
+ btnPasteItem.setScale(ButtonScale.SMALL);
+ btnPasteItem.setIconAlign(IconAlign.TOP);
+ btnPasteItem.setEnabled(false); //BY DEFAULT IS DISABLED
+
+ toolBar.add(btnPasteItem);
+
toolBar.add(new SeparatorToolItem());
btnAccessFromDesktop = new Button(ConstantsPortlet.TITLEACCESSWEBDAV, Resources.getIconWebDav());
@@ -233,11 +224,6 @@ public class GxtToolBarItemFunctionality {
btnAccessFromDesktop.setIconAlign(IconAlign.TOP);
btnAccessFromDesktop.setArrowAlign(ButtonArrowAlign.BOTTOM);
- // toolBar.add(btnAccessFromDesktop);
- // toolBar.add(new SeparatorToolItem());
-
- // toolBar.add(new SeparatorToolItem());
- // toolBar.add(new SeparatorToolItem());
btnUploadArchive = new Button(ConstantsPortlet.UPLOADARCHIVE, Resources.getIconArchiveUpload());
btnUploadArchive.setScale(ButtonScale.SMALL);
diff --git a/src/main/webapp/newtheme.css b/src/main/webapp/newtheme.css
index 8fbd705..22c2017 100644
--- a/src/main/webapp/newtheme.css
+++ b/src/main/webapp/newtheme.css
@@ -1,12 +1,51 @@
+.x-toolbar {
+ border-color: #fff;
+ background-color: #fff !important;
+ background-image: none !important;
+}
+
+.x-btn-text-icon .x-btn-icon-small-top .x-btn-text {
+ padding-top: 25px !important;
+ font-family: 'Roboto', sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ color: #666;
+}
+
+.x-tree3-el {
+ height: 25px !important;
+}
+
+.x-tree3-node-text {
+ padding: 3px 0 5px 3px;
+ top: 0 !important;
+}
+
+.x-grid3-row td.x-grid3-cell, .x-grid3-summary-row td.x-grid3-cell {
+ line-height: 30px !important;
+}
+
+.x-grid3-cell-inner, .x-grid3-hd-inner, x-grid3-cell-inner x-grid3-col-Type {
+ font-family: 'Roboto', sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+ color: #666;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
.x-menubar {
- background-color: #d0def0;
+ background-color: #fff;
background-image: none !important;
}
+.x-panel-body {
+ border: none !important;
+ border-bottom: 1px solid #d0def0 !important;
+}
+
.x-panel-body-noheader {
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ border: none;
}
.x-border-layout-ct {
@@ -15,12 +54,12 @@
}
.x-toolbar {
- border-color: #226599;
- background-color: #d0def0;
+ border-color: #fff;
+ background-color: #fff;
}
.x-panel-header {
- background-color: #d0def0;
+ background-color: #fff;
background-image: none !important;
}
diff --git a/src/main/webapp/workspaceportlet.css b/src/main/webapp/workspaceportlet.css
index 7c10afd..aa4ecb0 100644
--- a/src/main/webapp/workspaceportlet.css
+++ b/src/main/webapp/workspaceportlet.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Architects+Daughter);
+@import url(https://fonts.googleapis.com/css?family=Roboto);
@import url(newtheme.css);
@@ -7,11 +7,11 @@
@import url(workspacebootstrap.min.css);
#SearchAndFilter {
- background-color: #d0def0;
+ background-color: #fff;
}
#VerticalPanelSearchAndFilter table {
- background: none repeat scroll 0 0 #D0DEF0;
+ background-color: none repeat scroll 0 0 #FFF;
}
.nofeed-message {
@@ -312,12 +312,12 @@
font-size: 12px;
}
.Breadcrumbs-Personal {
- font-size: 13px;
+ font-size: 16px;
+ font-weight: normal;
+ font-family: 'Roboto', sans-serif;
list-style: outside none none;
- margin-bottom: 3px !important;
- margin-left: 2px !important;
- margin-top: 3px !important;
- padding: 5px !important;
+ margin-bottom: 3px 2px;
+ padding: 5px;
}
.Breadcrumbs-Personal li {
@@ -335,7 +335,7 @@
}
.Breadcrumbs-Personal a {
- color: #226599;
+ color: #08c !important;
text-decoration: none;
}
@@ -404,7 +404,7 @@
}
#hpSearchAndFilter {
- background-color: #D0DEF0;
+ background-color: #FFF;
}
#hpSearchAndFilter td {
@@ -414,14 +414,8 @@
}
#text-search {
+ margin-top: 10px;
margin-right: 3px;
- width: 325px !important;
-}
-
-#text-search-input {
- height: 20px !important;
- width: 312px !important;
- /* padding: 1px 2px; */
}
.button_toolbar {