#635 Only wrap content when needed

openequella · Dec 21, 2018 · 08beeb4 · 08beeb4
1 parent 7b90cc8
commit 08beeb4
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/LegacyContentApi.scala b/Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/LegacyContentApi.scala
@@ -412,12 +412,15 @@ class LegacyContentApi {
 
   def wrapBody(context: RenderContext, body: SectionRenderable): SectionRenderable = {
     val decs = Decorations.getDecorations(context)
-    val cbTag = context.getBody
-    cbTag.setId("content-body")
-    val citag = new TagState("content-inner").addClass[TagState](decs.getPageLayoutDisplayClass)
-    val cbtag = cbTag.addClasses[TagState](decs.getContentBodyClasses)
 
-    new DivRenderer(citag, new DivRenderer(cbtag, body))
+    if (decs.isBanner || !decs.isMenuHidden || decs.isContent) {
+      val cbTag = context.getBody
+      cbTag.setId("content-body")
+      val citag = new TagState("content-inner").addClass[TagState](decs.getPageLayoutDisplayClass)
+      val cbtag = cbTag.addClasses[TagState](decs.getContentBodyClasses)
+
+      new DivRenderer(citag, new DivRenderer(cbtag, body))
+    } else body
   }