[gatein-commits] gatein SVN: r7553 - epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component.
Author: mwringe
Date: 2011-09-28 18:02:49 -0400 (Wed, 28 Sep 2011)
New Revision: 7553
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
Log:
JBEPP-1175: Make gadgets use a dynamic height. From GateIn commit r6862 (no attached
jira)
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-09-28
20:25:47 UTC (rev 7552)
+++
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-09-28
22:02:49 UTC (rev 7553)
@@ -9,7 +9,6 @@
def windowId = rcontext.getWindowId();
def id = uicomponent.getId() + "-" + windowId ;
def url = uicomponent.getParent().getUrl();
- def height = "auto" ;
if(url != null) {
def metadata = uicomponent.getParent().getMetadata(url);
@@ -17,11 +16,7 @@
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript("eXo.gadget.UIGadget") ;
jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','$id',
$metadata, $userPref, 'canvas', '$hostName');") ;
- java.util.Map<String, String> metadataMap = GadgetUtil.getMapMetadata(url) ;
-
- if(metadataMap.containsKey("height") &&
Integer.parseInt(metadataMap.get("height")) > 0)
- height = (Integer.parseInt(metadataMap.get("height")) + 10) +
"px" ;
}
%>
-<div class="UIGadgetViewMode" id="$id" style="height:
<%=height%>;"></div>
+<div class="UIGadgetViewMode" id="$id" style="height:
auto;"></div>