[gatein-commits] gatein SVN: r2032 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/application and 3 other directories.

Author: julien_viet Date: 2010-03-08 05:10:57 -0500 (Mon, 08 Mar 2010) New Revision: 2032 Modified: portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java Log: GTNPORTAL-806 : Links on Home page for login user Modified: portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2010-03-08 09:05:11 UTC (rev 2031) +++ portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2010-03-08 10:10:57 UTC (rev 2032) @@ -28,7 +28,7 @@ <div class="AccountsContainerDeco"> <div class="AccountBlock AdministratorUser"> <div class="AccountInfos"> - <div class="AccountTitle"><%=_ctx.appRes("UIHomePagePortlet.Label.Administrator")%></div> + <div class="AccountTitle"><a href="${_ctx.getPortalContextPath()}/login?username=root&amp;password=gtn"><%=_ctx.appRes("UIHomePagePortlet.Label.Administrator")%></a></div> <div class="Username"> <div class="Lable"><%=_ctx.appRes("UIHomePagePortlet.Label.Username")%></div><span>root</span> <div class="ClearBoth"><span></span></div> @@ -42,7 +42,7 @@ <div class="SeparatorLine"><span></span></div> <div class="AccountBlock ManagerUser"> <div class="AccountInfos"> - <div class="AccountTitle"><%=_ctx.appRes("UIHomePagePortlet.Label.Manager")%></div> + <div class="AccountTitle"><a href="${_ctx.getPortalContextPath()}/login?username=john&amp;password=gtn"><%=_ctx.appRes("UIHomePagePortlet.Label.Manager")%></a></div> <div class="Username"> <div class="Lable"><%=_ctx.appRes("UIHomePagePortlet.Label.Username")%></div><span>john</span> <div class="ClearBoth"><span></span></div> @@ -56,7 +56,7 @@ <div class="SeparatorLine"><span></span></div> <div class="AccountBlock NormalUser"> <div class="AccountInfos"> - <div class="AccountTitle"><%=_ctx.appRes("UIHomePagePortlet.Label.User")%></div> + <div class="AccountTitle"><a href="${_ctx.getPortalContextPath()}/login?username=mary&amp;password=gtn"><%=_ctx.appRes("UIHomePagePortlet.Label.User")%></a></div> <div class="Username"> <div class="Lable"><%=_ctx.appRes("UIHomePagePortlet.Label.Username")%></div><span>mary</span> <div class="ClearBoth"><span></span></div> @@ -70,7 +70,7 @@ <div class="SeparatorLine"><span></span></div> <div class="AccountBlock DemoUser" style="margin-right: 0px;"> <div class="AccountInfos"> - <div class="AccountTitle"><%=_ctx.appRes("UIHomePagePortlet.Label.Demo")%></div> + <div class="AccountTitle"><a href="${_ctx.getPortalContextPath()}/login?username=demo&amp;password=gtn"><%=_ctx.appRes("UIHomePagePortlet.Label.Demo")%></a></div> <div class="Username"> <div class="Lable"><%=_ctx.appRes("UIHomePagePortlet.Label.Username")%></div><span>demo</span> <div class="ClearBoth"><span></span></div> Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java 2010-03-08 09:05:11 UTC (rev 2031) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/WebuiRequestContext.java 2010-03-08 10:10:57 UTC (rev 2032) @@ -122,8 +122,16 @@ @Override public abstract URLBuilder<UIComponent> getURLBuilder(); - abstract public String getRequestContextPath(); + public abstract String getRequestContextPath(); + /** + * Returns the context path of the portal or null if it does not execute in the context + * of an aggregated portal request. + * + * @return the portal context path + */ + public abstract String getPortalContextPath(); + abstract public <T> T getRequest() throws Exception; abstract public <T> T getResponse() throws Exception; Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java 2010-03-08 09:05:11 UTC (rev 2031) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/application/portlet/PortletRequestContext.java 2010-03-08 10:10:57 UTC (rev 2032) @@ -107,6 +107,19 @@ return request_.getContextPath(); } + @Override + public String getPortalContextPath() + { + if (parentAppRequestContext_ instanceof WebuiRequestContext) + { + return ((WebuiRequestContext)parentAppRequestContext_).getPortalContextPath(); + } + else + { + return null; + } + } + @SuppressWarnings("unchecked") public PortletRequest getRequest() { Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java 2010-03-08 09:05:11 UTC (rev 2031) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/lifecycle/WebuiBindingContext.java 2010-03-08 10:10:57 UTC (rev 2032) @@ -69,6 +69,16 @@ return rcontext_; } + public String getContextPath() + { + return rcontext_.getRequestContextPath(); + } + + public String getPortalContextPath() + { + return rcontext_.getPortalContextPath(); + } + public BindingContext clone() { BindingContext newContext = new WebuiBindingContext(resolver_, writer_, uicomponent_, rcontext_); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-08 09:05:11 UTC (rev 2031) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-08 10:10:57 UTC (rev 2032) @@ -267,6 +267,12 @@ return request_.getContextPath(); } + @Override + public String getPortalContextPath() + { + return getRequestContextPath(); + } + public String getActionParameterName() { return PortalRequestContext.UI_COMPONENT_ACTION;