[portal-commits] JBoss Portal SVN: r10193 - in modules/portlet/trunk/portal/src/main: resources/simple-portal-war/css and 1 other directory.

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/portal/admin/ui/AdminPortlet.java modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css Log: admin portlet markup/changes Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java 2008-03-04 19:58:45 UTC (rev 10192) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/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="mailto:julien@jboss.org">Julien Viet</a> @@ -129,22 +134,23 @@ url.setParameter("lifecycle", "start"); String startURL = url.toString(); - // - //writer.print("<ul><li>Application " + application.getId() + " " + application.getStatus() + - // " <a href=\"" + startURL + "\">Start</a> <a href=\"" + stopURL + "\">Stop</a></li><ul>"); + + writer.print("<table class=\"admin-table\">"); writer.print("" + " <tr>\n" + - " <td class=\"admin-app-header\" colspan=\"3\"><h3>Application</h3></td>\n" + + " <td class=\"admin-app-header\" colspan=\"4\"><h3>Application</h3></td>\n" + " </tr>\n" + " <tr class=\"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=\"" + startURL + "\">Start</a> | <a href=\"" + stopURL + "\">Stop</a></td>\n" + " </tr>"); @@ -167,7 +173,7 @@ writer.print("" + " <tr>\n" + - " <td class=\"admin-filter-header\" colspan=\"3\"><h3>Filter</h3></td>\n" + + " <td class=\"admin-filter-header\" colspan=\"4\"><h3>Filter</h3></td>\n" + " </tr>\n" + //" <tr class=\"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=\"" + startURL + "\">Start</a> | <a href=\"" + stopURL + "\">Stop</a></td>\n" + " </tr>"); @@ -195,22 +202,32 @@ url.setParameter("lifecycle", "start"); startURL = url.toString(); - // - //writer.print("<li>Container " + container.getId() + " " + container.getStatus() + " <a href=\"" + - // startURL + "\">Start</a> <a href=\"" + stopURL + "\">Stop</a></li>"); + + LocalizedString description = null; + String descString = ""; + try{ + MetaInfo metaInfo = container.getInfo().getMeta(); + description = metaInfo.getMetaValue("description"); + }catch(Exception e){ + //e.printStackTrace(); + } + if (description != null){ + descString = description.getDefaultValue().getString(); + } writer.print("" + " <tr>\n" + - " <td class=\"admin-container-header\" colspan=\"3\"><h3>Container</h3></td>\n" + + " <td class=\"admin-container-header\" colspan=\"4\"><h3>Container</h3></td>\n" + " </tr>\n" + //" <tr class=\"admin-cat-header\">\n" + //" <td>ID</td>\n" + //" <td>Status</td>\n" + //" <td></td>\n" + //" </tr>" + - " <tr>\n" + + " <tr class=\"" + (container.getStatus().toString().equals("FAILED") ? "admin-failed" : "" ) + "\">\n" + " <td>" + container.getId() + "</td>\n" + " <td>" + container.getStatus() + "</td>\n" + + " <td>" + descString + "</td>\n" + " <td><a href=\"" + startURL + "\">Start</a> | <a href=\"" + stopURL + "\">Stop</a></td>\n" + " </tr>"); } Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css =================================================================== --- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css 2008-03-04 19:58:45 UTC (rev 10192) +++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.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