From portal-commits at lists.jboss.org Mon Mar  3 22:22:09 2008
Content-Type: multipart/mixed; boundary="===============3135912194054067523=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10188 - in
 modules/portlet/trunk/portal/src/main: resources/simple-portal-war and 3
 other directories.
Date: Mon, 03 Mar 2008 22:18:08 -0500
Message-ID: <E1JWNfM-0003UH-SE@committer01.frg.pub.inap.atl.jboss.com>

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

Author: wesleyhales
Date: 2008-03-03 22:18:08 -0500 (Mon, 03 Mar 2008)
New Revision: 10188

Added:
   modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/
   modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/=
admin.jsp
Removed:
   modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/a=
dmin.jsp
Modified:
   modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/port=
al/admin/ui/AdminPortlet.java
   modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/ma=
ster.css
Log:
gave the admin portlet some love - still more to give

Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portl=
et/portal/admin/ui/AdminPortlet.java
=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
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/AdminPortlet.java	2008-03-04 01:21:56 UTC (rev 10187)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/AdminPortlet.java	2008-03-04 03:18:08 UTC (rev 10188)
@@ -35,6 +35,7 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletURL;
+import javax.portlet.PortletRequestDispatcher;
 import java.io.IOException;
 import java.io.PrintWriter;
 =

@@ -106,10 +107,15 @@
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
 =

+      //PortletRequestDispatcher rd =3D getPortletContext().getRequestDisp=
atcher("admin/admin.jsp");
+      //rd.include(request, response);
+
       // Use an alias
       PortletApplicationRegistry registry =3D (PortletApplicationRegistry)=
getPortletContext().getAttribute("PortletApplicationDeployer");
 =

       //
+
+      =

       for (ManagedPortletApplication application : registry.getManagedPort=
letApplications())
       {
          PortletURL url =3D resp.createActionURL();
@@ -124,8 +130,23 @@
          String startURL =3D url.toString();
 =

          //
-         writer.print("<ul><li>Application " + application.getId() + " " +=
 application.getStatus() +
-            " <a href=3D\"" +  startURL + "\">Start</a> <a href=3D\"" + st=
opURL + "\">Stop</a></li><ul>");
+         //writer.print("<ul><li>Application " + application.getId() + " "=
 + application.getStatus() +
+           // " <a href=3D\"" +  startURL + "\">Start</a> <a href=3D\"" + =
stopURL + "\">Stop</a></li><ul>");
+         writer.print("<table class=3D\"admin-table\">");
+         writer.print("" +
+            "       <tr>\n" +
+            "          <td class=3D\"admin-app-header\" colspan=3D\"3\"><h=
3>Application</h3></td>\n" +
+            "       </tr>\n" +
+            "       <tr class=3D\"admin-cat-header\">\n" +
+            "          <td>ID</td>\n" +
+            "          <td>Status</td>\n" +
+            "          <td></td>\n" +
+            "       </tr>" +
+            "       <tr>\n" +
+            "          <td>" + application.getId() + "</td>\n" +
+            "          <td>" + application.getStatus() + "</td>\n" +
+            "          <td><a href=3D\"" +  startURL + "\">Start</a> | <a =
href=3D\"" + stopURL + "\">Stop</a></td>\n" +
+            "       </tr>");
 =

          //
          for (ManagedPortletFilter filter : application.getManagedPortletF=
ilters())
@@ -141,8 +162,24 @@
             startURL =3D url.toString();
 =

             //
-            writer.print("<li>Filter " + filter.getId() + " " + filter.get=
Status() + " <a href=3D\"" +
-               startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">Stop=
</a></li>");
+            //writer.print("<li>Filter " + filter.getId() + " " + filter.g=
etStatus() + " <a href=3D\"" +
+              // startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">St=
op</a></li>");
+
+            writer.print("" +
+            "       <tr>\n" +
+            "          <td class=3D\"admin-filter-header\" colspan=3D\"3\"=
><h3>Filter</h3></td>\n" +
+            "       </tr>\n" +
+            //"       <tr class=3D\"admin-cat-header\">\n" +
+            //"          <td>ID</td>\n" +
+            //"          <td>Status</td>\n" +
+            //"          <td></td>\n" +
+            //"       </tr>" +
+            "       <tr>\n" +
+            "          <td>" + filter.getId() + "</td>\n" +
+            "          <td>" + filter.getStatus() + "</td>\n" +
+            "          <td><a href=3D\"" +  startURL + "\">Start</a> | <a =
href=3D\"" + stopURL + "\">Stop</a></td>\n" +
+            "       </tr>");
+
          }
 =

          //
@@ -159,14 +196,37 @@
             startURL =3D url.toString();
 =

             //
-            writer.print("<li>Container " + container.getId() + " " + cont=
ainer.getStatus() + " <a href=3D\"" +
-               startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">Stop=
</a></li>");
+            //writer.print("<li>Container " + container.getId() + " " + co=
ntainer.getStatus() + " <a href=3D\"" +
+              // startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">St=
op</a></li>");
+
+            writer.print("" +
+            "       <tr>\n" +
+            "          <td class=3D\"admin-container-header\" colspan=3D\"=
3\"><h3>Container</h3></td>\n" +
+            "       </tr>\n" +
+            //"       <tr class=3D\"admin-cat-header\">\n" +
+            //"          <td>ID</td>\n" +
+            //"          <td>Status</td>\n" +
+            //"          <td></td>\n" +
+            //"       </tr>" +
+            "       <tr>\n" +
+            "          <td>" + container.getId() + "</td>\n" +
+            "          <td>" + container.getStatus() + "</td>\n" +
+            "          <td><a href=3D\"" +  startURL + "\">Start</a> | <a =
href=3D\"" + stopURL + "\">Stop</a></td>\n" +
+            "       </tr>");
          }
-         writer.print("</ul></ul>");
+        writer.print("</table>");
       }
 =

       //
       writer.close();
 =

    }
+
 }
+
+   /*protected void doView(RenderRequest request, RenderResponse response)=
 throws PortletException, IOException
+   {
+      PortletRequestDispatcher rd =3D getPortletContext().getRequestDispat=
cher("admin/admin.jsp");
+      rd.include(request, response);
+   }*/
+//}

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/a=
dmin/admin.jsp (from rev 10183, modules/portlet/trunk/portal/src/main/resou=
rces/simple-portal-war/demo/admin.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
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin=
/admin.jsp	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin=
/admin.jsp	2008-03-04 03:18:08 UTC (rev 10188)
@@ -0,0 +1,14 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+<%@ include file=3D"/layouts/header.jsp" %>
+               =

+<portal:page>
+
+   <jbp:portlet name=3D"AdminPortlet" applicationName=3D"simple-portal"/>
+
+</portal:page>
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war=
/css/master.css
=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
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/m=
aster.css	2008-03-04 01:21:56 UTC (rev 10187)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/m=
aster.css	2008-03-04 03:18:08 UTC (rev 10188)
@@ -373,4 +373,36 @@
 =

 div#container div#content div.wiki-content p {
    padding: 5px;
+}
+
+/*-------------------------------------Admin*/
+
+.admin-table {
+   width: 100%;
+   margin: 15px 0 0 0;
+}
+
+.admin-table td.admin-app-header {
+   background-color: #999999;
+}
+
+.admin-table td.admin-filter-header {
+   background-color: #cccccc;
+}
+
+.admin-table td.admin-container-header {
+   background-color: #dddddd;
+}
+
+.admin-table td.admin-container-header h3{
+   color: #999;
+}
+
+.admin-table tr.admin-cat-header td{
+   border-bottom: 1px solid #cccccc;
+   width: 33%;
+}
+
+.admin-table tr.admin-cat-header td{
+   font-weight: bold
 }
\ No newline at end of file

Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/=
demo/admin.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
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/=
admin.jsp	2008-03-04 01:21:56 UTC (rev 10187)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/=
admin.jsp	2008-03-04 03:18:08 UTC (rev 10188)
@@ -1,14 +0,0 @@
-<%@ page contentType=3D"text/html" %>
-<%@ page language=3D"java" %>
-<%@ taglib prefix=3D"xportal" tagdir=3D"/WEB-INF/tags/portal" %>
-<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
-<%@ page isELIgnored=3D"false" %>
-
-<%@ include file=3D"/layouts/header.jsp" %>
-               =

-<portal:page>
-
-   <xportal:portlet name=3D"AdminPortlet" applicationName=3D"simple-portal=
"/>
-
-</portal:page>
-<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file


--===============3135912194054067523==--