Author: chris.laprun(a)jboss.com Date: 2008-03-03 20:21:56 -0500 (Mon, 03 Mar 2008) New Revision: 10187 Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo3.jsp Log: - Minor improvements and error fixes. Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp 2008-03-04 01:21:10 UTC (rev 10186) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jsp/error.jsp 2008-03-04 01:21:56 UTC (rev 10187) @@ -1,6 +1,5 @@ <%@ page import="org.jboss.portal.common.util.Exceptions" %> -<%@ page import="java.io.PrintWriter" %> -<%@ page language="java" %> +<%@ page language="java" %> <div class="portlet"> <div class="portlet-frame"> @@ -8,38 +7,45 @@ <div class="header-layer full-width"> <div class="title two-third-width float-left"> <h2> - ${requestScope['org.jboss.portal.portlet.portal.error.portlet_name']} ${requestScope['org.jboss.portal.portlet.portal.error.status'] == 'not_found' ? ' not found' : ''} + ${requestScope['org.jboss.portal.portlet.portal.error.portlet_name']} ${requestScope['org.jboss.portal.portlet.portal.error.status'] == 'not_found' ? ' not found' : ''} </h2> </div> </div> </div> <h3 class="error-header">Portlet was not rendered</h3> + <div class="error-container"> - <ul> - <li> - <span>Error status:</span> ${requestScope['org.jboss.portal.portlet.portal.error.status']} - </li> - <li> - <span>Portlet name:</span> ${requestScope['org.jboss.portal.portlet.portal.error.portlet_name']} - </li> - <li> - <span>Portlet application name:</span> ${requestScope['org.jboss.portal.portlet.portal.error.application_name']} - </li> - <li> - <span>Exception:</span> ${!empty requestScope['org.jboss.portal.portlet.portal.error.cause'] ? requestScope['org.jboss.portal.portlet.portal.error.cause'] : 'Error cause unavailable'} - <%if (request.getAttribute("org.jboss.portal.portlet.portal.error.cause") != null){%> - <a class="option" href="#exception-stack-trace" title="${requestScope['org.jboss.portal.portlet.portal.error.cause']}" rel="shadowbox;width=900;height=400">${!empty requestScope['org.jboss.portal.portlet.portal.error.cause'] ? 'View Stack Trace' : ''}</a> + <ul> + <li> + <span>Error status:</span> ${requestScope['org.jboss.portal.portlet.portal.error.status']} + </li> + <li> + <span>Portlet name:</span> ${requestScope['org.jboss.portal.portlet.portal.error.portlet_name']} + </li> + <li> + <span>Portlet application name:</span> ${requestScope['org.jboss.portal.portlet.portal.error.application_name']} + </li> + <li> + <span>Exception:</span> ${!empty requestScope['org.jboss.portal.portlet.portal.error.cause'] ? requestScope['org.jboss.portal.portlet.portal.error.cause'] : 'Error cause unavailable'} + <% + if (request.getAttribute("org.jboss.portal.portlet.portal.error.cause") != null) + { + %> + <a class="option" href="#exception-stack-trace" + title="${requestScope['org.jboss.portal.portlet.portal.error.cause']}" + rel="shadowbox;width=900;height=400">${!empty requestScope['org.jboss.portal.portlet.portal.error.cause'] ? 'View Stack Trace' : ''}</a> + <div id="exception-stack-trace" class="hidden"> <div class="exception"> - <%=Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.portlet.portal.error.cause"))%> + <%=Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.portlet.portal.error.cause"))%> </div> </div> - <%}%> - </li> - <li> - <span>Window id:</span> ${requestScope['org.jboss.portal.portlet.portal.error.window_id']} - </li> - </ul> - </div> + <%}%> + </li> + <li> + <span>Window id:</span> ${requestScope['org.jboss.portal.portlet.portal.error.window_id']} + </li> + </ul> + </div> </div> </div> Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-03-04 01:21:10 UTC (rev 10186) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/tags/portal/portlet.tag 2008-03-04 01:21:56 UTC (rev 10187) @@ -12,7 +12,7 @@ <div class="header full-width"> <div class="header-layer full-width"> <div class="title two-third-width float-left"><h2><portal:portlettitle/></h2></div> - <div class="controls third-width float-right"> < + <div class="controls third-width float-right"> <span class="mode-button"> <a href="<portal:portleturl windowState='maximized'/>"><img src="${pageContext.request.contextPath}/images/icon-maximize.gif" alt=""/></a> Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo3.jsp =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo3.jsp 2008-03-04 01:21:10 UTC (rev 10186) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo3.jsp 2008-03-04 01:21:56 UTC (rev 10187) @@ -5,10 +5,10 @@ <%@ page isELIgnored="false" %> <%@ include file="/layouts/header.jsp" %> - + <portal:page> <portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/> - + <xportal:2columns> <jsp:attribute name="leftcol"> <xportal:portlet name="Foo" applicationName="bar"/> @@ -17,8 +17,8 @@ <xportal:portlet name="ExceptionPortlet" applicationName="samples-basic-portlet"/> <xportal:portlet name="HeaderPortlet" applicationName="samples-basic-portlet" id="header-portlet"/> - <xportal:portlet name="FailDuringInitPortlet" applicationName="samples-basic-portlet" id="header-portlet"/> - + <xportal:portlet name="FailDuringInitPortlet" applicationName="samples-basic-portlet"/> + <xportal:portlet name="ExceptionPortlet" applicationName="samples-basic-portlet"/> </jsp:attribute> </xportal:2columns>