diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java index b3df790..6b5e94a 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java @@ -542,7 +542,7 @@ public class CreateDatasetForm extends Composite{ receivedBean.setCustomFields(customFieldsMap); // alert - alertOnCreate("Trying to create dataset, please wait", AlertType.INFO); + alertOnCreate("Trying to create product, please wait", AlertType.INFO); // invoke the create method createButton.setEnabled(false); @@ -555,7 +555,7 @@ public class CreateDatasetForm extends Composite{ if(createdDatasetBean != null){ - alertOnCreate("Dataset correctly created!", AlertType.SUCCESS); + alertOnCreate("Product correctly created!", AlertType.SUCCESS); // disable dataset fields disableDatasetFields(); @@ -643,7 +643,7 @@ public class CreateDatasetForm extends Composite{ }else{ - alertOnCreate("Unable to create this dataset, maybe it already exists?", AlertType.ERROR); + alertOnCreate("Unable to create this product, maybe it already exists?", AlertType.ERROR); } } @@ -651,7 +651,7 @@ public class CreateDatasetForm extends Composite{ @Override public void onFailure(Throwable caught) { - alertOnCreate("Unable to create this dataset, maybe it already exists?", AlertType.ERROR); + alertOnCreate("Unable to create this product, maybe it already exists?", AlertType.ERROR); } }); diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.java index 0ad833f..2bd2f61 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.java @@ -5,6 +5,8 @@ import java.util.List; import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.MetadataFieldWrapper; import com.github.gwtbootstrap.client.ui.CheckBox; +import com.github.gwtbootstrap.client.ui.ControlLabel; +import com.github.gwtbootstrap.client.ui.Controls; import com.github.gwtbootstrap.client.ui.ListBox; import com.github.gwtbootstrap.client.ui.TextBox; import com.google.gwt.core.client.GWT; @@ -33,6 +35,8 @@ public class MetaDataFieldSkeleton extends Composite{ @UiField SimplePanel elementPanel; @UiField FlowPanel noteFieldContainer; @UiField InlineLabel noteField; + @UiField ControlLabel controlLabel; + @UiField Controls controls; // the element that holds the value (it could be a checkbox, textbox or listbox) private Widget holder; @@ -45,6 +49,10 @@ public class MetaDataFieldSkeleton extends Composite{ // prepare information this.field = field; + + // add custom css properties + controls.addStyleName("form-controls-custom"); + controlLabel.addStyleName("form-control-label-custom"); // save the name name.setInnerText(field.getFieldName() + ":"); diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.ui.xml index 58ad535..91f27ce 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/MetaDataFieldSkeleton.ui.xml @@ -14,6 +14,7 @@ display: inline; text-align: justify; margin-left: 5px; + word-wrap: break-word; } .element-panel { @@ -22,13 +23,14 @@ - + * - + - + diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css index c7d9e35..61d6217 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css @@ -21,4 +21,13 @@ margin-left: 5px !important; font-weight: bold !important; cursor: pointer !important; +} + +/** override some bootstrap css **/ +.form-controls-custom { + margin-left: 12% !important; +} + +.form-control-label-custom { + width: 10% !important; } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java index a1c98c7..050b3a8 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java @@ -60,7 +60,6 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C // ckan keys for ASL private static final String CKAN_TOKEN_KEY = "ckanToken"; - private static final String CKAN_OBJ_KEY = "ckanObj"; private static final String CKAN_LICENSES_KEY = "ckanLicenses"; // licenses private static final String CKAN_ORGANIZATIONS_PUBLISH_KEY = "ckanOrganizationsPublish"; // here he can publish private static final String CKAN_PROFILES_KEY = "ckanProfiles"; // product profiles @@ -71,11 +70,10 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C */ private CKanUtils getCkanUtilsObj(){ - String currentScope = getASLSession().getScope(); CKanUtils instance = null; try{ - logger.debug("The ckan util object was null"); + String currentScope = getASLSession().getScope(); instance = new CKanUtilsImpl(currentScope); }catch(Exception e){ logger.error("Unable to retrieve ckan utils", e); @@ -105,7 +103,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C */ public String getDevelopmentUser() { String user = TEST_USER; - // user = "costantino.perciante"; + //user = "costantino.perciante"; return user; } diff --git a/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/Tests.java b/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/Tests.java deleted file mode 100644 index 1b70882..0000000 --- a/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/Tests.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.gcube.portlets.widgets.ckandatapublisherwidget.client; - - -/** - * - * @author Costantino Perciante at ISTI-CNR - * (costantino.perciante@isti.cnr.it) - * - */ -public class Tests { - -}