From portal-commits at lists.jboss.org Tue Mar 18 16:36:00 2008
Content-Type: multipart/mixed; boundary="===============2676983077826404136=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10313 - in
 modules/portlet/trunk/portal/src/main: resources/simple-portal-war/css and 1
 other directory.
Date: Tue, 18 Mar 2008 16:35:58 -0400
Message-ID: <E1JbiXO-0000cR-US@committer01.frg.pub.inap.atl.jboss.com>

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

Author: wesleyhales
Date: 2008-03-18 16:35:58 -0400 (Tue, 18 Mar 2008)
New Revision: 10313

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/ad=
min.css
Log:
admin portlet - small fixes

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-18 20:15:05 UTC (rev 10312)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/AdminPortlet.java	2008-03-18 20:35:58 UTC (rev 10313)
@@ -22,27 +22,23 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.portal.admin.ui;
 =

-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.portlet.container.managed.ManagedObject;
 import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
 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.container.managed.PortletApplicationRegist=
ry;
 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.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletURL;
-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>
@@ -120,19 +116,19 @@
 =

       //
       writer.print("" +
-            "" +
-            "" +
-            "<div class=3D\"admin-container full-width\">\n" +
-            "                  <div class=3D\"admin-header\">\n" +
-            "                     <div class=3D\"expand\">\n" +
-            "                        <img src=3D\"/simple-portal/images/ad=
min/expand.gif\" alt=3D\"\"/><a href=3D\"javascript:expandAll();\">Expand A=
ll</a>\n" +
-            "                     </div>\n" +
-            "                     <div class=3D\"collapse\">\n" +
-            "                        <img src=3D\"/simple-portal/images/ad=
min/contract.gif\" alt=3D\"\"/><a href=3D\"javascript:collapseAll();\">Coll=
apse All</a>\n" +
-            "                     </div>\n" +
-            "                  </div>\n");
+         "" +
+         "" +
+         "<div class=3D\"admin-container full-width\">\n" +
+         "                  <div class=3D\"admin-header\">\n" +
+         "                     <div class=3D\"expand\">\n" +
+         "                        <img src=3D\"/simple-portal/images/admin=
/expand.gif\" alt=3D\"\"/><a href=3D\"javascript:expandAll();\">Expand All<=
/a>\n" +
+         "                     </div>\n" +
+         "                     <div class=3D\"collapse\">\n" +
+         "                        <img src=3D\"/simple-portal/images/admin=
/contract.gif\" alt=3D\"\"/><a href=3D\"javascript:collapseAll();\">Collaps=
e All</a>\n" +
+         "                     </div>\n" +
+         "                  </div>\n");
 =

-      =

+
       for (ManagedPortletApplication application : registry.getManagedPort=
letApplications())
       {
          PortletURL url =3D resp.createActionURL();
@@ -146,47 +142,51 @@
          url.setParameter("lifecycle", "start");
          String startURL =3D url.toString();
 =

-         String htmlId =3D application.getId().substring(1,application.get=
Id().length());
+         String htmlId =3D application.getId().substring(1, application.ge=
tId().length());
 =

 =

-
-         =

          writer.print("" +
 =

             "\n" +
             "                  <div class=3D\"par-container\">\n" +
             "                     <div class=3D\"par-header\">\n" +
             "                        <div class=3D\"par-header-left\">\n" +
-            "                           <a id=3D\"contract-"+ htmlId +"\" =
href=3D\"#\" onclick=3D\"collapse(this,'"+ htmlId +"');\">\n" +
+            "                           <a id=3D\"contract-" + htmlId + "\=
" href=3D\"javascript:return false;\" onclick=3D\"collapse(this,'" + htmlId=
 + "');\">\n" +
             "                           <img src=3D\"/simple-portal/images=
/admin/contract.gif\" alt=3D\"\"  />\n" +
-            "                           <h3 class=3D\"par\">"+ application=
.getId() +"</h3>\n" +
+            "                           <h3 class=3D\"par\">" + applicatio=
n.getId() + "</h3>\n" +
             "                           </a>\n" +
-            "                           <a id=3D\"expand-"+ htmlId +"\" hr=
ef=3D\"#\" onclick=3D\"expand(this,'"+ htmlId +"');\">\n" +
+            "                           <a id=3D\"expand-" + htmlId + "\" =
href=3D\"#\" onclick=3D\"expand(this,'" + htmlId + "');return false;\">\n" +
             "                           <img src=3D\"/simple-portal/images=
/admin/expand.gif\" alt=3D\"\" />\n" +
-            "                           <h3 class=3D\"par\">"+ application=
.getId() +"</h3>\n" +
+            "                           <h3 class=3D\"par\">" + applicatio=
n.getId() + "</h3>\n" +
             "                           </a>\n" +
             "                        </div>\n" +
             "\n" +
             "                        <div class=3D\"par-header-right\">\n"=
 +
             "                        <span class=3D\"par-status\">");
 =

-            if (application.getStatus().toString().equals("STARTED")){
-               writer.print("<img src=3D\"/simple-portal/images/admin/star=
ted-icon.gif\" alt=3D\"\"/>");
-            }else{
-               writer.print("<img src=3D\"/simple-portal/images/admin/stop=
ped-icon.gif\" alt=3D\"\"/>");
-            }
-            writer.print("" +
+         if (application.getStatus().toString().equals("STARTED"))
+         {
+            writer.print("<img src=3D\"/simple-portal/images/admin/started=
-icon.gif\" alt=3D\"\"/>");
+         }
+         else
+         {
+            writer.print("<img src=3D\"/simple-portal/images/admin/stopped=
-icon.gif\" alt=3D\"\"/>");
+         }
+         writer.print("" +
             "" + application.getStatus() + "</span>\n" +
             "\n" +
             "                        <div class=3D\"par-control\">\n" +
             "                           <img src=3D\"/simple-portal/images=
/admin/start-stop-edge.gif\" alt=3D\"\"/>\n");
-            if (application.getStatus().toString().equals("STARTED")){
-               writer.print("<a class=3D\"stop\" href=3D\"" + stopURL + "\=
">Stop</a></td>\n");
-            }else{
-               writer.print("<a class=3D\"start\" href=3D\"" + startURL + =
"\">Start</a></td>\n");
-            }
+         if (application.getStatus().toString().equals("STARTED"))
+         {
+            writer.print("<a class=3D\"stop\" href=3D\"" + stopURL + "\">S=
top</a></td>\n");
+         }
+         else
+         {
+            writer.print("<a class=3D\"start\" href=3D\"" + startURL + "\"=
>Start</a></td>\n");
+         }
 =

-            writer.print("" +
+         writer.print("" +
             "" +
             "" +
             "                        </div>\n" +
@@ -219,7 +219,7 @@
 =

             //
             //writer.print("<li>Filter " + filter.getId() + " " + filter.g=
etStatus() + " <a href=3D\"" +
-              // startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">St=
op</a></li>");
+            // startURL + "\">Start</a> <a href=3D\"" + stopURL + "\">Stop=
</a></li>");
 =

             writer.print("" +
                "" +
@@ -227,11 +227,14 @@
                "                              <td class=3D\"par-row-left\"=
><img class=3D\"icon\" src=3D\"/simple-portal/images/admin/filter-icon.gif\=
" alt=3D\"\"/>" + filter.getId() + "</td>\n" +
                "                              <td>" + filter.getStatus() +=
 "</td>\n" +
                "                              <td></td>\n");
-               if (filter.getStatus().toString().equals("STARTED")){
-                   writer.print("                   <td class=3D\"par-row-=
right\">Start | <a class=3D\"stop\" href=3D\"" + stopURL + "\">Stop</a></td=
>\n");
-               }else{
-                   writer.print("                   <td class=3D\"par-row-=
right\"><a class=3D\"start\" href=3D\"" +  startURL + "\">Start</a> | Stop<=
/td>\n");
-               }
+            if (filter.getStatus().toString().equals("STARTED"))
+            {
+               writer.print("                   <td class=3D\"par-row-righ=
t\">Start | <a class=3D\"stop\" href=3D\"" + stopURL + "\">Stop</a></td>\n"=
);
+            }
+            else
+            {
+               writer.print("                   <td class=3D\"par-row-righ=
t\"><a class=3D\"start\" href=3D\"" + startURL + "\">Start</a> | Stop</td>\=
n");
+            }
 =

 =

             writer.print("                 </tr>");
@@ -252,48 +255,62 @@
             url.setParameter("lifecycle", "start");
             startURL =3D url.toString();
 =

-            =

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

             writer.print("" +
                "" +
                "                          <tr class=3D\"par-container-row\=
">\n" +
                "                              <td class=3D\"par-row-left\"=
><img class=3D\"icon\" src=3D\"/simple-portal/images/admin/portlet-icon.gif=
\" alt=3D\"\"/>" + container.getId() + "</td>\n" +
-               "                              <td>" + container.getStatus(=
) + "</td>\n" +
+               "                              <td>" + container.getStatus(=
));
+            if (container.getStatus().toString().equals("FAILED"))
+            {
+               writer.print("<img class=3D\"failed\" src=3D\"/simple-porta=
l/images/admin/warning-icon.gif\" alt=3D\"\"/>");
+            }
+
+
+            writer.print("</td>\n" +
                "                              <td>" + descString + "</td>\=
n");
-               if (container.getStatus().toString().equals("STARTED")){
-                   writer.print("                   <td class=3D\"par-row-=
right\">Start | <a class=3D\"stop\" href=3D\"" + stopURL + "\">Stop</a></td=
>\n");
-               }else{
-                   writer.print("                   <td class=3D\"par-row-=
right\"><a class=3D\"start\" href=3D\"" +  startURL + "\">Start</a> | Stop<=
/td>\n");
-               }
+            if (container.getStatus().toString().equals("STARTED"))
+            {
+               writer.print("                   <td class=3D\"par-row-righ=
t\">Start | <a class=3D\"stop\" href=3D\"" + stopURL + "\">Stop</a></td>\n"=
);
+            }
+            else
+            {
+               writer.print("                   <td class=3D\"par-row-righ=
t\"><a class=3D\"start\" href=3D\"" + startURL + "\">Start</a> | Stop</td>\=
n");
+            }
 =

 =

             writer.print("                 </tr>");
 =

          }
-        writer.print("</table>" +
-           "  </div>\n" +
-           "");
+         writer.print("</table>" +
+            "  </div>\n" +
+            "");
       }
 =

       writer.print("</div>" +
          "           </div>\n" +
-           "         </div>\n" +
-           "      </div>\n" +
-           "\n" +
-           "   </div>\n" +
-           "   <br class=3D\"clear\"/>\n" +
-           "</div>");
+         "         </div>\n" +
+         "      </div>\n" +
+         "\n" +
+         "   </div>\n" +
+         "   <br class=3D\"clear\"/>\n" +
+         "</div>");
 =

       //
       writer.close();

Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war=
/css/admin.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/a=
dmin.css	2008-03-18 20:15:05 UTC (rev 10312)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/a=
dmin.css	2008-03-18 20:35:58 UTC (rev 10313)
@@ -95,12 +95,14 @@
 table.par-table {
    margin: 0;
    padding: 0;
-   border-collapse: collapse;
+   /*border-collapse: collapse;*/
    border-spacing: 0;
+   border: 1px solid #999;
 }
 =

 table.par-table td {
    padding: 0 0 0 3px;
+   width: 25%;
 }
 =

 table.par-table tr.par-subhead {
@@ -120,6 +122,10 @@
    margin: 0 3px 0 0;
 }
 =

+table.par-table td img.failed {
+   margin: 0 0 0 3px;
+}
+
 table.par-table td.par-header-left {
    padding: 0 0 0 15px;
 }


--===============2676983077826404136==--