gCubeSystem
/
data-miner-manager
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated to Liferay 6.2 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@129448 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2016-06-27 08:07:43 +00:00
parent 47ed720aff
commit 8bade152e3
16 changed files with 50 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java
View File

@ -22,6 +22,8 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig;
*/
public class OperatorPanel extends SimpleContainer {
private static final int TOOLTIP_DESCRIPTION_LENGHT = 435;
private static final int OPERATOR_BRIEF_DESCRIPTION_LENGHT = 160;
private static final int TOOLTIP_WIDTH = 500;
private VerticalLayoutContainer vert;
@ -60,7 +62,7 @@ public class OperatorPanel extends SimpleContainer {
titleHtml = new HTML(operator.getName());
titleHtml.addStyleName("operatorPanel-title");
HTML descriptionHtml = new HTML(Format.ellipse(operator.getBriefDescription(),178));
HTML descriptionHtml = new HTML(Format.ellipse(operator.getBriefDescription(),OPERATOR_BRIEF_DESCRIPTION_LENGHT));
descriptionHtml.addStyleName("operatorPanel-briefDescription");
vert=new VerticalLayoutContainer();
@ -111,7 +113,7 @@ public class OperatorPanel extends SimpleContainer {
String description) {
String template = "<div class='categoryItemTooltip'>" + "<img src='"
+ base + "../images/operators/"
+ (hasImage ? id : "DEFAULT_IMAGE") + ".png' >" + Format.ellipse(description, 435)
+ (hasImage ? id : "DEFAULT_IMAGE") + ".png' >" + Format.ellipse(description, TOOLTIP_DESCRIPTION_LENGHT)
+ "</div>";
return template;

28
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java
View File

@ -263,33 +263,7 @@ public class OperatorsPanel extends FramedPanel {
return;
}
/**
* private ToolTipConfig createToolTip(OperatorCategory cat) { ToolTipConfig
* tooltipConfig = new ToolTipConfig(); tooltipConfig.setTitleHtml("<br>
* &nbsp;&nbsp;" + cat.getName()); tooltipConfig.setMouseOffsetX(0);
* toolTipConfig.setMouseOffsetY(0); tooltipConfig.setAnchor(Side.LEFT);
* tooltipConfig.setDismissDelay(0);
* tooltipConfig.setBodyHtml(getTooltipTemplate( GWT.getModuleBaseURL(),
* cat.getId(), cat.hasImage(), cat.getDescription())); //
* config.setCloseable(true); tooltipConfig.setMaxWidth(300); return
* tooltipConfig; }
*
* private String getTooltipTemplate(String base, String id, boolean
* hasImage, String description) { String html=
* "<div class='categoryItemTooltip'>"+ "<img src='" + base +
* "../images/categories/"+ (hasImage ? id : "DEFAULT_IMAGE") + ".png' >"+
* description+"</div>"; // '<div>
* <ul style="list-style: disc; margin: 0px 0px 5px 15px">
* ', // '
* <li>5 bedrooms</li>', // '
* <li>2 baths</li>', // '
* <li>Large backyard</li>', // '
* <li>Close to metro</li>', // '
* </ul>
* ', // '</div>'
*
* return html; };
*/
private void waitMessage(boolean show) {
if (show)
this.mask(LOADING_MESSAGE);

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/BooleanFld.java
View File

@ -49,12 +49,12 @@ public class BooleanFld extends AbstractFld {
HtmlLayoutContainer descr;
if (p.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//checkBox.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java
View File

@ -77,12 +77,12 @@ public class ColumnFld extends AbstractFld implements
HtmlLayoutContainer descr;
if (columnParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//comboBox.setToolTip(columnParameter.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ columnParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnListFld.java
View File

@ -79,12 +79,12 @@ public class ColumnListFld extends AbstractFld implements
HtmlLayoutContainer descr;
if (columnListParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//grid.setToolTip(columnListParameter.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ columnListParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DoubleFld.java
View File

@ -46,12 +46,12 @@ public class DoubleFld extends AbstractFld {
HtmlLayoutContainer descr;
if (p.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//numberField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/EnumFld.java
View File

@ -53,12 +53,12 @@ public class EnumFld extends AbstractFld {
HtmlLayoutContainer descr;
if (p.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//listBox.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
View File

@ -81,11 +81,11 @@ public class FileFld extends AbstractFld {
HtmlLayoutContainer descr;
if (fileParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ fileParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FloatFld.java
View File

@ -46,12 +46,12 @@ public class FloatFld extends AbstractFld {
HtmlLayoutContainer descr;
if (p.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//numberField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/IntFld.java
View File

@ -46,12 +46,12 @@ public class IntFld extends AbstractFld {
HtmlLayoutContainer descr;
if (p.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//numberField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
View File

@ -62,12 +62,12 @@ public class ListIntFld extends AbstractFld {
HtmlLayoutContainer descr;
if (listParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//listContainer.setToolTip(listParameter.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ listParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListStringFld.java
View File

@ -57,12 +57,12 @@ public class ListStringFld extends AbstractFld {
HtmlLayoutContainer descr;
if (listParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
/*listContainer.setToolTip(listParameter.getDescription());*/
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ listParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringFld.java
View File

@ -45,12 +45,12 @@ public class StringFld extends AbstractFld {
HtmlLayoutContainer descr;
if (p.getDescription() == null) {
descr=new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr=new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
//textField.setToolTip(p.getDescription());
descr=new HtmlLayoutContainer("<p style='margin-left:5px;'>"+p.getDescription()+"</p>");
descr=new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"+p.getDescription()+"</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
View File

@ -119,11 +119,11 @@ public class TabularFld extends AbstractFld implements
HtmlLayoutContainer descr;
if (tabularParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ tabularParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularListFld.java
View File

@ -77,11 +77,11 @@ public class TabularListFld extends AbstractFld {
HtmlLayoutContainer descr;
if (tabularListParameter.getDescription() == null) {
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'></p>");
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription");
} else {
/* listContainer.setToolTip(listParameter.getDescription()); */
descr = new HtmlLayoutContainer("<p style='margin-left:5px;'>"
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>"
+ tabularListParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription");
}

38
src/main/webapp/DataMinerManager.css
View File

@ -1,38 +1,40 @@
/* FIX FOR Portal Theme */
.aui input[type="text"], .aui select, .aui textarea, .aui .uneditable-input {
.aui body {
color: #000;
font-weight: normal !important;
}
.aui input[type="text"], .aui select, .aui textarea, .aui .uneditable-input
{
margin-bottom: 1px !important;
padding: 0px !important;
}
.aui input, .aui textarea, .aui .uneditable-input {
width: 100% !important;
width: 100% !important;
}
.aui p {
margin: 0px !important;
margin: 0px !important;
}
.aui img {
vertical-align: baseline !important;
vertical-align: baseline !important;
}
.aui fieldset {
padding: 9px !important;
/* margin: 0; */
border: 1px solid rgb(181, 184, 200) !important;
padding: 9px !important;
/* margin: 0; */
border: 1px solid rgb(181, 184, 200) !important;
}
.aui legend {
margin-bottom: 0px !important;
width: auto !important;
width: auto !important;
border-bottom: none !important;
}
/* Data Miner */
.smLayoutContainer {
/* Blue
box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.11), 0 0 0
@ -66,11 +68,11 @@
}
.smMenu {
/*width: 720px !important;*/
/*height: 570px !important;*/
/*width: 720px !important;*/ /*height: 570px !important;*/
/*overflow: auto;
margin: auto;
margin-bottom: 20px;*/
}
.layoutContainerArea {
@ -408,7 +410,6 @@
}
/**
* Computation Output
*/
@ -440,8 +441,7 @@
*/
}
.computation-output-fileName{
margin-top:2px;
margin-bottom:2px;
.computation-output-fileName {
margin-top: 2px;
margin-bottom: 2px;
}