GTNPORTAL-3225 Height and width of Portlets are not affected after se…

…tting
gatein · Sep 18, 2013 · 850cc24 · 850cc24
1 parent e6ef136
commit 850cc24
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl b/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
@@ -60,9 +60,7 @@
 			String appDisplay = "block";
 			String appZIndex = "";
 			String windowWidth = uicomponent.getWidth();
-			if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px")) windowWidth += "px";
 			String windowHeight = uicomponent.getHeight();
-			if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px")) windowHeight += "px";
 			String cssStyle = "style=\"";
 			cssStyle += "visibility: "+ visibility +";";
 			cssStyle += "display: "+ appDisplay +";";
@@ -167,14 +165,14 @@
 		if(windowState != WindowState.MINIMIZED) {
 			String cssStyle = "";
  			String windowWidth = uicomponent.getWidth();
-			if(windowWidth!= null && !windowWidth.contains("%") && !windowWidth.contains("px"))
-      {
-			   cssStyle += "width: "+ windowWidth +"px;";
-      }
+			if(windowWidth != null)
+            {
+			    cssStyle += "width: "+ windowWidth +";";
+            }
  			String windowHeight = uicomponent.getHeight();
-			if(windowHeight != null && !windowHeight.contains("%") && !windowHeight.contains("px"))
+			if(windowHeight != null)
 			{
-         cssStyle += "height: "+ windowHeight +"px;";
+                cssStyle += "height: "+ windowHeight +";";
 			}
  %>
  				<div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>">