From portal-commits at lists.jboss.org Thu Jan 18 17:18:51 2007
Content-Type: multipart/mixed; boundary="===============3099407565852248433=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r6039 - in
 trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard: plugin and 1
 other directories.
Date: Thu, 18 Jan 2007 17:18:50 -0500
Message-ID: <E1H7fas-00052m-R5@committer01.frg.pub.inap.atl.jboss.com>

--===============3099407565852248433==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2007-01-18 17:18:50 -0500 (Thu, 18 Jan 2007)
New Revision: 6039

Added:
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/plugin/
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/plugin/po=
rtlet/
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/plugin/po=
rtlet/show.jsp
Modified:
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.=
jsp
Log:
move instance presentation in the dashboard to a separate jsp

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/ed=
itpage.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage=
.jsp	2007-01-18 22:03:00 UTC (rev 6038)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage=
.jsp	2007-01-18 22:18:50 UTC (rev 6039)
@@ -1,4 +1,3 @@
-<%@ page import=3D"org.jboss.portal.core.model.instance.Instance" %>
 <%@ page import=3D"org.jboss.portal.core.model.portal.Page" %>
 <%@ page import=3D"org.jboss.portal.core.model.portal.Window" %>
 <%@ page import=3D"org.jboss.portal.theme.PortalLayout" %>
@@ -18,7 +17,6 @@
 <portlet:defineObjects/>
 =

 <%
-   List available_instances =3D (List)request.getAttribute("available_inst=
ances");
    List pages =3D (List)request.getAttribute("pages");
 =

    Map windowMap =3D (Map)request.getAttribute("windowMap");
@@ -221,18 +219,7 @@
    </table>
 </td>
 <td class=3D"portlet-section-body" valign=3D"top" align=3D"right"><b>Avail=
able Content</b><br/>
-   <select name=3D"available_instances" multiple=3D"true" size=3D"20">
-      <%
-         for (int i =3D 0; i < available_instances.size(); i++)
-         {
-            Instance instance =3D (Instance)available_instances.get(i);
-      %>
-      <option value=3D"<%=3D instance.getId() %>"><%=3D instance.getId()%>
-      </option>
-      <%
-         }
-      %>
-   </select>
+   <jsp:include page=3D"plugin/portlet/show.jsp"/>
 </td>
 <td>
 <table>

Added: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/plugi=
n/portlet/show.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/plugin/p=
ortlet/show.jsp	                        (rev 0)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/plugin/p=
ortlet/show.jsp	2007-01-18 22:18:50 UTC (rev 6039)
@@ -0,0 +1,18 @@
+<%@ page language=3D"java" extends=3D"org.jboss.portal.core.servlet.jsp.Po=
rtalJsp" %>
+<%@ page import=3D"org.jboss.portal.core.model.instance.Instance" %>
+<%@ page import=3D"java.util.List" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
+<%@ taglib uri=3D"/WEB-INF/portal-lib.tld" prefix=3D"n" %>
+<select name=3D"available_instances" multiple=3D"true" size=3D"20">
+   <%
+      List available_instances =3D (List)request.getAttribute("available_i=
nstances");
+      for (int i =3D 0; i < available_instances.size(); i++)
+      {
+         Instance instance =3D (Instance)available_instances.get(i);
+   %>
+   <option value=3D"<%=3D instance.getId() %>"><%=3D instance.getId()%>
+   </option>
+   <%
+      }
+   %>
+</select>


--===============3099407565852248433==--