From 3d9e8b4307a2b22158966eab788b6ed82ec26f64 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Tue, 24 Jun 2014 05:48:08 +0000
Subject: [PATCH] SSDM-396 : ScopeM welcome page does not show scroll bars
SVN: 31761
---
.../client/application/framework/WelcomePanelHelper.java | 1 +
.../java/ch/systemsx/cisd/openbis/public/css/openbis.css | 8 ++++++++
.../systemsx/cisd/openbis/public/welcomePageSimple.html | 2 +-
.../screening/client/web/public/welcomePageSimple.html | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java
index df30d3cad10..5dcc30935c2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java
@@ -43,6 +43,7 @@ public class WelcomePanelHelper
final LayoutContainer layoutContainer = new LayoutContainer(new BorderLayout());
layoutContainer.setStyleAttribute("background-color", "white");
layoutContainer.setId(idPrefix + "welcome");
+ layoutContainer.addStyleName("welcomePageContainer");
DisplaySettingsManager displaySettingsManager = viewContext.getDisplaySettingsManager();
if (displaySettingsManager.getPortletConfigurations().containsKey(HISTORY)
&& displaySettingsManager.getVisits().isEmpty() == false)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css b/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css
index 7670f619762..a390a5e367d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css
@@ -397,4 +397,12 @@ td.properties-sub-section {
.entityWithTemplateField {
margin-left: 10px;
+}
+
+/*************************
+ * Welcome Page
+ *************************/
+
+.welcomePageContainer .gwt-HTML {
+ overflow: scroll;
}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/welcomePageSimple.html b/openbis/source/java/ch/systemsx/cisd/openbis/public/welcomePageSimple.html
index 6b49f46c92d..53eaf189ac7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/welcomePageSimple.html
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/welcomePageSimple.html
@@ -1,4 +1,4 @@
-<div style="margin-top:150px; font-size: large; text-align: center;">
+<div style="margin-top:150px; margin-bottom: 10px; font-size: large; text-align: center;">
Welcome to <b>openBIS</b><br/><br/>
Try using one of these pages to find data of interest:<br>
<ul><a href="#action=BROWSE&entity=EXPERIMENT" target="blank">Experiment Browser</a>
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/welcomePageSimple.html b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/welcomePageSimple.html
index 05098c32c92..ae37b3cdb21 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/welcomePageSimple.html
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/welcomePageSimple.html
@@ -3,7 +3,7 @@ Welcome to <b>openBIS for High Content Screening</b><br/><br/><br/><br/>
<a href="#action=BROWSE&entity=EXPERIMENT">Browse images and their analysis results</a><br/><br/>
<a href="#action=GLOBAL_WELL_SEARCH">Wells Search</a>
</div>
-<div style="margin-top:150px; text-align: center;">
+<div style="margin-top:150px; margin-bottom: 10px; text-align: center;">
<br><br>
If you are the administrator or advanced user, switch to the <a href="?viewMode=normal">advanced mode</a>
</div>
\ No newline at end of file
--
GitLab