From portal-commits at lists.jboss.org Tue Mar 18 10:11:57 2008
Content-Type: multipart/mixed; boundary="===============5709167770824541837=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10305 - in
 modules/portlet/trunk/portal/src/main: resources/simple-portal-war/css and 1
 other directories.
Date: Tue, 18 Mar 2008 10:11:56 -0400
Message-ID: <E1JbcXk-0000kn-T4@committer01.frg.pub.inap.atl.jboss.com>

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

Author: wesleyhales
Date: 2008-03-18 10:11:56 -0400 (Tue, 18 Mar 2008)
New Revision: 10305

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
   modules/portlet/trunk/portal/src/main/resources/simple-portal-war/js/adm=
in.js
Log:
admin portlet final cleanup

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 12:43:53 UTC (rev 10304)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/admin/ui/AdminPortlet.java	2008-03-18 14:11:56 UTC (rev 10305)
@@ -168,11 +168,27 @@
             "                        </div>\n" +
             "\n" +
             "                        <div class=3D\"par-header-right\">\n"=
 +
-            "                        <span class=3D\"par-status\"><img src=
=3D\"/simple-portal/images/admin/started-icon.gif\" alt=3D\"\"/>" + applica=
tion.getStatus() + "</span>\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("" +
+            "" + 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" +
-            "                           <a href=3D\"" + stopURL + "\">Stop=
</a></td>\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");
+            }
+
+            writer.print("" +
+            "" +
+            "" +
             "                        </div>\n" +
             "                        </div>\n" +
             "                       \n" +
@@ -210,12 +226,17 @@
                "                          <tr class=3D\"par-filter-row\">\=
n" +
                "                              <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" +
-               "                              <td class=3D\"par-row-right\=
"><a class=3D\"start\" href=3D\"" +  startURL + "\">Start</a> | <a class=3D=
\"stop\" href=3D\"" + stopURL + "\">Stop</a></td>\n" +
-               "                           </tr>" +
-               "");
+               "                              <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");
+               }
 =

 =

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

          //
@@ -249,13 +270,16 @@
                "                          <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>" + descString + "</td>\=
n" +
-               "                              <td class=3D\"par-row-right\=
"><a class=3D\"start\" href=3D\"" +  startURL + "\">Start</a> | <a class=3D=
\"stop\" href=3D\"" + stopURL + "\">Stop</a></td>\n" +
-               "                           </tr>" +
+               "                              <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");
+               }
 =

 =

-//            "       <tr class=3D\"" + (container.getStatus().toString().=
equals("FAILED") ? "admin-failed" : "" ) + "\">\n" +
-         "");
+            writer.print("                 </tr>");
+
          }
         writer.print("</table>" +
            "  </div>\n" +

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 12:43:53 UTC (rev 10304)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/a=
dmin.css	2008-03-18 14:11:56 UTC (rev 10305)
@@ -80,7 +80,6 @@
    top: 1px;
    left: 18px;
    position: absolute;
-   color: #7a0f0f;
    font-weight: bold;
 }
 =

@@ -134,11 +133,11 @@
    padding: 0 5px 0 0;
 }
 =

-table.par-table td a.start {
+a.start {
    color: #17600e
 }
 =

-table.par-table td a.stop {
+a.stop {
    color: #9e0606;
 }
 =


Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war=
/js/admin.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/ad=
min.js	2008-03-18 12:43:53 UTC (rev 10304)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/js/ad=
min.js	2008-03-18 14:11:56 UTC (rev 10305)
@@ -39,21 +39,8 @@
          }
       }
 =

-      window.onload =3D function(){
-         var targets =3D document.getElementsByClassName('target');
-         =

-         for (var i=3D0; i < targets.length; i++){
-            try{
-               //alert(targets[i].id.substring(0,targets[i].id.lastIndexOf=
('-target')));
-               var atarget =3D targets[i].id.substring(0,targets[i].id.las=
tIndexOf('-target'));
-               var cid =3D 'contract-'.concat(atarget);
-               var eid =3D 'expand-'.concat(atarget);
-               $(cid).style.display =3D 'none';
 =

-               new Effect.BlindUp(targets[i].id);
-               $(eid).style.display =3D 'block';
-            }catch(e){
-              //alert(e);
-            }
-         }
+      //collapse all on page load
+      window.onload =3D function(){
+         collapseAll()
       };
\ No newline at end of file


--===============5709167770824541837==--