From portal-commits at lists.jboss.org Tue Mar  4 15:08:29 2008
Content-Type: multipart/mixed; boundary="===============7295626669612679481=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10193 - in
 modules/portlet/trunk/portal/src/main: resources/simple-portal-war/css and 1
 other directory.
Date: Tue, 04 Mar 2008 15:04:28 -0500
Message-ID: <E1JWdNE-0007DC-WA@committer01.frg.pub.inap.atl.jboss.com>

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

Author: wesleyhales
Date: 2008-03-04 15:04:28 -0500 (Tue, 04 Mar 2008)
New Revision: 10193

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:
admin portlet markup/changes

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 19:58:45 UTC (rev 10192)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/AdminPortlet.java	2008-03-04 20:04:28 UTC (rev 10193)
@@ -27,6 +27,10 @@
 import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.container.managed.ManagedPortletFilter;
 import org.jboss.portal.portlet.container.managed.ManagedObject;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.MetaInfo;
+import org.jboss.portal.common.i18n.LocalizedString;
+import static org.jboss.unit.api.Assert.assertNotNull;
 =

 import javax.portlet.GenericPortlet;
 import javax.portlet.RenderRequest;
@@ -38,6 +42,7 @@
 import javax.portlet.PortletRequestDispatcher;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Locale;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -129,22 +134,23 @@
          url.setParameter("lifecycle", "start");
          String startURL =3D url.toString();
 =

-         //
-         //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" +
+            "          <td class=3D\"admin-app-header\" colspan=3D\"4\"><h=
3>Application</h3></td>\n" +
             "       </tr>\n" +
             "       <tr class=3D\"admin-cat-header\">\n" +
             "          <td>ID</td>\n" +
             "          <td>Status</td>\n" +
+            "          <td>Description</td>\n" +
             "          <td></td>\n" +
             "       </tr>" +
             "       <tr>\n" +
             "          <td>" + application.getId() + "</td>\n" +
             "          <td>" + application.getStatus() + "</td>\n" +
+            "          <td></td>\n" +
             "          <td><a href=3D\"" +  startURL + "\">Start</a> | <a =
href=3D\"" + stopURL + "\">Stop</a></td>\n" +
             "       </tr>");
 =

@@ -167,7 +173,7 @@
 =

             writer.print("" +
             "       <tr>\n" +
-            "          <td class=3D\"admin-filter-header\" colspan=3D\"3\"=
><h3>Filter</h3></td>\n" +
+            "          <td class=3D\"admin-filter-header\" colspan=3D\"4\"=
><h3>Filter</h3></td>\n" +
             "       </tr>\n" +
             //"       <tr class=3D\"admin-cat-header\">\n" +
             //"          <td>ID</td>\n" +
@@ -177,6 +183,7 @@
             "       <tr>\n" +
             "          <td>" + filter.getId() + "</td>\n" +
             "          <td>" + filter.getStatus() + "</td>\n" +
+            "          <td></td>\n" +
             "          <td><a href=3D\"" +  startURL + "\">Start</a> | <a =
href=3D\"" + stopURL + "\">Stop</a></td>\n" +
             "       </tr>");
 =

@@ -195,22 +202,32 @@
             url.setParameter("lifecycle", "start");
             startURL =3D url.toString();
 =

-            //
-            //writer.print("<li>Container " + container.getId() + " " + co=
ntainer.getStatus() + " <a href=3D\"" +
-              // startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">St=
op</a></li>");
+            =

+            LocalizedString description =3D null;
+            String descString =3D "";
+            try{
+               MetaInfo metaInfo =3D container.getInfo().getMeta();
+               description =3D metaInfo.getMetaValue("description");
+            }catch(Exception e){
+               //e.printStackTrace();
+            }
+            if (description !=3D null){
+               descString =3D description.getDefaultValue().getString();
+            }
 =

             writer.print("" +
             "       <tr>\n" +
-            "          <td class=3D\"admin-container-header\" colspan=3D\"=
3\"><h3>Container</h3></td>\n" +
+            "          <td class=3D\"admin-container-header\" colspan=3D\"=
4\"><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" +
+            "       <tr class=3D\"" + (container.getStatus().toString().eq=
uals("FAILED") ? "admin-failed" : "" ) + "\">\n" +
             "          <td>" + container.getId() + "</td>\n" +
             "          <td>" + container.getStatus() + "</td>\n" +
+            "          <td>" + descString + "</td>\n" +
             "          <td><a href=3D\"" +  startURL + "\">Start</a> | <a =
href=3D\"" + stopURL + "\">Stop</a></td>\n" +
             "       </tr>");
          }

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 19:58:45 UTC (rev 10192)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/m=
aster.css	2008-03-04 20:04:28 UTC (rev 10193)
@@ -405,9 +405,13 @@
 =

 .admin-table tr.admin-cat-header td{
    border-bottom: 1px solid #cccccc;
-   width: 33%;
+   width: 25%;
 }
 =

 .admin-table tr.admin-cat-header td{
    font-weight: bold
+}
+
+.admin-table tr.admin-failed{
+   background-color: #f78181
 }
\ No newline at end of file


--===============7295626669612679481==--