diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 200bb84..c58755f 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -40,7 +41,8 @@ - + + @@ -81,7 +83,8 @@ - + + @@ -122,7 +125,8 @@ - + + @@ -163,7 +167,8 @@ - + + @@ -204,13 +209,11 @@ - + uses - - uses - - + + @@ -251,7 +254,8 @@ - + + @@ -292,7 +296,8 @@ - + + @@ -333,7 +338,8 @@ - + + diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java index c7d39a7..fb9523e 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java @@ -19,6 +19,7 @@ import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.event.ShowTypesE import com.github.gwtbootstrap.client.ui.Alert; import com.github.gwtbootstrap.client.ui.AlertBlock; import com.github.gwtbootstrap.client.ui.Button; +import com.github.gwtbootstrap.client.ui.Label; import com.github.gwtbootstrap.client.ui.constants.AlertType; import com.github.gwtbootstrap.client.ui.constants.ButtonType; import com.github.gwtbootstrap.client.ui.constants.IconType; @@ -41,7 +42,7 @@ import com.google.gwt.user.client.ui.InlineHTML; */ public class CkanMetadataManagementPanel extends FlowPanel { - private static final String MESSAGE_MODERATED_CATALOGUE = "Controlled Catalogue"; + private static final String MESSAGE_MODERATED_CATALOGUE = "Moderation Enabled"; public static final String CATALOGUE_ITEMS_WERE_APPROVED_BY_CATALOGUE_MODERATOR_S = "Catalogue items were approved by Catalogue Moderator(s)."; @@ -83,7 +84,7 @@ public class CkanMetadataManagementPanel extends FlowPanel { private Button manageGRSFProduct = new Button("Manage GRSF Item"); // GRSF Manage private Button manageCModS = new Button("Manage Items"); // Moderation - private Alert messageModerationEnanbled = new Alert(MESSAGE_MODERATED_CATALOGUE); // Moderation message + private Label messageModerationEnanbled = new Label(); // Moderation message private HandlerManager eventBus; @@ -120,11 +121,12 @@ public class CkanMetadataManagementPanel extends FlowPanel { manageCModS.setType(ButtonType.PRIMARY); manageCModS.getElement().getStyle().setFloat(Float.RIGHT); manageCModS.getElement().getStyle().setMarginRight(20, Unit.PX); - messageModerationEnanbled.setType(AlertType.INFO); - messageModerationEnanbled.setClose(false); - //messageModerationEnanbled.addStyleName("moderation-message"); - messageModerationEnanbled.getElement().getStyle().setTextAlign(TextAlign.CENTER); - messageModerationEnanbled.setTitle(CATALOGUE_ITEMS_WERE_APPROVED_BY_CATALOGUE_MODERATOR_S); +// messageModerationEnanbled.setType(AlertType.INFO); +// messageModerationEnanbled.setClose(false); + // messageModerationEnanbled.addStyleName("moderation-message"); + messageModerationEnanbled.setTitle(MESSAGE_MODERATED_CATALOGUE); + messageModerationEnanbled.getElement().setInnerHTML(" " + MESSAGE_MODERATED_CATALOGUE); + messageModerationEnanbled.addStyleName("moderation-enabled-flag"); // set icons home.setIcon(IconType.HOME); @@ -399,7 +401,6 @@ public class CkanMetadataManagementPanel extends FlowPanel { manageCModS.setVisible(value); } - /** * Show message catalogue is moderated. * diff --git a/src/main/webapp/GCubeCkanDataCatalog.css b/src/main/webapp/GCubeCkanDataCatalog.css index e8cb87e..f425097 100644 --- a/src/main/webapp/GCubeCkanDataCatalog.css +++ b/src/main/webapp/GCubeCkanDataCatalog.css @@ -157,4 +157,10 @@ h1 { .modal-content-moderator .modal-body { min-height: 720px; +} + +.moderation-enabled-flag { + float: right; + margin-right: 10px; + padding: 8px 4px !important; } \ No newline at end of file