Author: kien_nguyen Date: 2010-04-15 08:14:27 -0400 (Thu, 15 Apr 2010) New Revision: 2654 Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java Log: GTNPORTAL-1014 Returned currentView does not match enum view (revert code to revision 2549 to use code that is compatable with google gadgets) Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js =================================================================== --- portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-15 10:44:10 UTC (rev 2653) +++ portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-15 12:14:27 UTC (rev 2654) @@ -177,4 +177,4 @@ // for a container. "library": "" } -}} \ No newline at end of file +}} Modified: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js =================================================================== --- portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-15 10:44:10 UTC (rev 2653) +++ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-15 12:14:27 UTC (rev 2654) @@ -177,4 +177,4 @@ // for a container. "library": "" } -}} \ No newline at end of file +}} Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl =================================================================== --- portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2010-04-15 10:44:10 UTC (rev 2653) +++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2010-04-15 12:14:27 UTC (rev 2654) @@ -20,4 +20,4 @@ height = (Integer.parseInt(metadataMap.get("height")) + 10) + "px" ; %> -<div class="UIGadgetViewMode" id="$id" style="height: <%=height%>;"></div> \ No newline at end of file +<div class="UIGadgetViewMode" id="$id" style="height: <%=height%>;"></div> Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-15 10:44:10 UTC (rev 2653) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-15 12:14:27 UTC (rev 2654) @@ -947,4 +947,4 @@ /** * Default container. */ -gadgets.container = new gadgets.IfrContainer(); \ No newline at end of file +gadgets.container = new gadgets.IfrContainer(); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-04-15 10:44:10 UTC (rev 2653) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-04-15 12:14:27 UTC (rev 2654) @@ -86,9 +86,9 @@ public static final String PREF_DEBUG = "_pref_debug_"; - public static final String HOME_VIEW = "HOME"; + public static final String HOME_VIEW = "home"; - public static final String CANVAS_VIEW = "CANVAS"; + public static final String CANVAS_VIEW = "canvas"; public String view = HOME_VIEW;