SAK-31129 : Home tool (site info display) does not respect frame heig…

…ht selection for RTE content (sakaiproject#4630)
OTEMA · Aug 1, 2017 · 5f97779 · 5f97779
1 parent 8bdbccd
commit 5f97779
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/library/src/morpheus-master/sass/modules/tool/synoptic/_synoptic.scss b/library/src/morpheus-master/sass/modules/tool/synoptic/_synoptic.scss
@@ -13,7 +13,7 @@ body > .portletBody {
 }
 .#{$namespace}sakai-iframe-site{
 	.siteDescription{
-		margin: 2em 0 0 0;
+		overflow: auto;
 	}
 }
 

diff --git a/web/web-portlet/src/bundle/vm/info.vm b/web/web-portlet/src/bundle/vm/info.vm
@@ -1,3 +1,3 @@
-<div class="portletBody siteDescription">
+<div class="portletBody siteDescription" style="height:$height">
 $!siteInfo
 </div>
diff --git a/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java b/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java
@@ -325,6 +325,7 @@ public void doView(RenderRequest request, RenderResponse response)
 						StringBuilder alertMsg = new StringBuilder();
 						if ( siteInfo != null ) siteInfo = validator.processFormattedText(siteInfo, alertMsg);
 						context.put("siteInfo", siteInfo);
+						context.put("height",height);
 						vHelper.doTemplate(vengine, "/vm/info.vm", context, out);
 						return;
 					}