diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java index b1b62954dddb55562d3cab0b15931af16c6b771c..58d3e4accf0d7bffd120952f95f0e266ea9fbf3c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java @@ -1291,4 +1291,8 @@ public interface ICommonClientService extends IClientService */ public List<String> listPredeployedPlugins(ScriptType scriptType); + /** + * Gets text for front page if the AS is disabled, null otherwise. + */ + public String getDisabledText(); } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java index 577af9a17191c64aec0ff8ba316383ad9b259eef..59dac0eb1acc61975b7922aab28811c4d90b30c5 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java @@ -1182,4 +1182,9 @@ public interface ICommonClientServiceAsync extends IClientServiceAsync * @see ICommonClientService#listPredeployedPlugins(ScriptType) */ public void listPredeployedPlugins(ScriptType scriptType, AsyncCallback<List<String>> callback); + + /** + * @see ICommonClientService#getDisabledText() + */ + public void getDisabledText(AsyncCallback<String> callback); } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java index 15a9d76f5e09a8e565f4ea720a53e32a5900ef04..52a1e7fdf71af8e5b4dad40942c0ec2900fabbf4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java @@ -20,6 +20,7 @@ import java.util.Date; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.CellPanel; import com.google.gwt.user.client.ui.DockPanel; @@ -70,6 +71,27 @@ final class LoginPage extends com.google.gwt.user.client.ui.VerticalPanel } welcomePanel.setStyleName("login-welcome-text"); final CellPanel northPanel = createNorthPanel(); + + final HorizontalPanel topPanel = new HorizontalPanel(); + northPanel.add(topPanel); + + viewContext.getCommonService().getDisabledText(new AsyncCallback<String>() { + + @Override + public void onFailure(Throwable caught) + { + // TODO Auto-generated method stub + } + + @Override + public void onSuccess(String result) + { + topPanel.add(new HTML(result +"<br>")); + } + + }); + + northPanel.add(logo); northPanel.add(welcomePanel); add(getBannersPage()); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java index 2609af98340b4cd0090a68c2a0f16ad9d5b8d847..4505790890b24adfd98e25817d270a08bbe8a4ac 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java @@ -2907,4 +2907,10 @@ public final class CommonClientService extends AbstractClientService implements { return commonServer.listPredeployedPlugins(getSessionToken(), scriptType); } + + @Override + public String getDisabledText() + { + return commonServer.getDisabledText(); + } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java index 38d278e49f5c0491e0d121f46d50c62d7c029956..ae8373e1a5270f733b7d90d0f1f6c58187fbc29e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java @@ -49,6 +49,7 @@ import ch.systemsx.cisd.common.properties.PropertyParametersUtil; import ch.systemsx.cisd.common.properties.PropertyParametersUtil.SectionProperties; import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext; import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationBean; import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationServiceUtils; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.Capability; @@ -4569,4 +4570,9 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt return null; } + + @Override + public String getDisabledText() { + return AuthorizationBean.getInstance().getDisabledText(); + } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java index 567f064028976b6747630563063ce852bd3ea090..2be5b86c2fba40ac7ae1a279e8d2985bd31fce23 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java @@ -1832,4 +1832,11 @@ final class CommonServerLogger extends AbstractServerLogger implements ICommonSe { logAccess(sessionToken, "invalidate_predeployed_plugin", "NAME(%s)", name); } + + @Override + public String getDisabledText() + { + logAccess(null, "getDisabledText"); + return null; + } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java index f7da8946ccd86b78dbef92d56e6f29f870728ed9..d391dc59d4588ab13bd21c2e66d75ee4283c6cd6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java @@ -1600,4 +1600,9 @@ public interface ICommonServer extends IServer */ @Transactional(readOnly = true) public List<String> listPredeployedPlugins(String sessionToken, ScriptType scriptType); + + /** + * Gets text for front page if the AS is disabled, null otherwise. + */ + public String getDisabledText(); }