geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1152478 [2/2] - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/ console/console-base-portlets/src/main/i18n-resources/ console/console-base-portlets/src/main/webapp/WEB-INF/view...
Date Sat, 30 Jul 2011 14:49:49 GMT
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
Sat Jul 30 14:49:45 2011
@@ -30,130 +30,87 @@
 <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
 </head>
 
+<%-- Avoid the login page displayed in the iframe --%>
+<script type="text/javascript">
+    if(window.parent!=window.self){
+        window.parent.location.reload();
+    }
+</script>
+
 <body onload="document.login.j_username.focus()" leftmargin="0" topmargin="0" rightmargin="0">
 
-<form name="login" action="j_security_check" method="POST">
-  <%--  Top table is the banner --%>
-      <TABLE width="100%" HEIGHT="86" BORDER="0" CELLSPACING="0" CELLPADDING="0">
-        <TR>
-          <td height="86" class="LoginLogo" border="0"></td>
-          <td height="86" class="Top" border="0">&nbsp; </TD>
-          <td height="86" class="Top" border="0" width="40">
-          </td>
-        </TR>
-        <TR>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </TR>
-        <TR>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </TR>
-      </TABLE>
-
-  <%--  Main body --%>
-  <table WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
-    <TR CLASS="Content">
-      <td width="30%" >&nbsp;</td>
-
-      <td class="Body" align="CENTER" height="300" valign="top">
-      <TABLE border>
-      <TR>
-      <TD>
-      <table width="550" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="ReallyDarkBackground"><strong>&nbsp;<fmt:message
key="console.common.loginToConsole"/></STRONG></td>
-        </tr>
-        <tr>
-          <td class="MediumBackground">&nbsp;</td>
-        </tr>
-        <tr>
-          <td>
-          <table width="100%"  border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="25%" class="MediumBackground">&nbsp;</td> 
-                <td align="right" class="MediumBackground">&nbsp;</td>
-                <td width="6" class="MediumBackground">&nbsp;</td>
-                <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td width="25%" class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0"
align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif" alt=""/></td>

-                <td align="right" class="MediumBackground"><strong><label
for="<portlet:namespace/>j_username"><fmt:message key="console.common.username"/></label></strong></td>
-                <td class="MediumBackground"><strong>:</strong></td>
-                <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_username" id="<portlet:namespace/>j_username"
type="text" class="InputField" value="" size="20px"/></td>
-                <td width="17" class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td align="right" class="MediumBackground"><strong><label
for="<portlet:namespace/>j_password"><fmt:message key="console.common.password"/></label></strong></td>
-                <td class="MediumBackground"><strong>:</strong></td>
-                <td width="1" class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground"><input name="j_password" id="<portlet:namespace/>j_password"
type="password" class="InputField" value="" size="20px"/></td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground">&nbsp;</td>
-                <td colspan="4" align="center" class="MediumBackground">
-                   <input name="submit" type="submit" value="<fmt:message key="console.common.login"/>"/>
-                </td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-                <td class="MediumBackground">&nbsp;</td>
-              </tr>
-          </table>
-          </td>
-        </tr>
-
-        <tr>
-          <td><font size="1"><STRONG>&nbsp;<fmt:message key="console.login.welcome"/></STRONG></FONT></td>
-        </TR>
-        <tr>
-          <TD>
-          <table width="100%"  border="0" cellspacing="1" cellpadding="5">
-            <tr>
-              <td width="5">&nbsp;</td>
-              <td><fmt:message key="console.login.introduction"/></td>
-              <td width="5">&nbsp;</td>
-            </tr>
-
-            <tr>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-            </tr>
-
-            <tr>
-              <td>&nbsp;</td>
-              <td><fmt:message key="console.login.components"/></td>
-              <td>&nbsp;</td>
-            </tr>
-          </table>
-          </TD>
-        </TR>
-      </table>
-      </TD>
-      </TR>
-      </TABLE>
-      </td>
+<%--  Top table is the banner --%>
+<table width="100%" height="86" cellpadding="0" cellspacing="0" border="0">
+    <tr>
+        <td height="86" class="LoginLogo" border="0"></td>
+        <td height="86" class="Top" border="0">&nbsp;</td>
+    </tr>
+</table>
+
+<%--  Main body --%>
 
-      <td width="30%" >&nbsp;</td>
+<form name="login" action="j_security_check" method="POST">
+<p align="center">
+<table width="550" cellpadding="0" cellspacing="0" border="0">
+    <tr>
+        <td class="ReallyDarkBackground">
+            &nbsp;<fmt:message key="console.common.loginToConsole"/>
+        </td>
+    </tr>
+    <tr>
+        <td class="MediumBackground" align="center">
+            <br/>
+            <table border="0" cellspacing="0" cellpadding="5">
+                <tr>
+                    <td>
+                        <img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"
alt=""/>
+                    </td>
+                    <td>
+                        <table width="100%" border="0" cellspacing="2" cellpadding="0">
+                            <tr>
+                                <td align="right"><strong><label for="<portlet:namespace/>j_username"><fmt:message
key="console.common.username"/></label>:</strong></td>
+                                <td><input name="j_username" id="<portlet:namespace/>j_username"
type="text" class="InputField" value="" size="20px"/></td>
+                            </tr>
+                            <tr>
+                                <td align="right"><strong><label for="<portlet:namespace/>j_password"><fmt:message
key="console.common.password"/></label>:</strong></td>
+                                <td><input name="j_password" id="<portlet:namespace/>j_password"
type="password" class="InputField" value="" size="20px"/></td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td><input name="submit" type="submit" value="<fmt:message
key="console.common.login"/>"/></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+            <br/>
+        </td>
     </tr>
-  </table>
+    <tr>
+        <td class="MediumBackground" align="center">
+            <br/>
+            <table style="TableLine" width="90%" border="0">
+                <tr>
+                    <td class="DarkBackground">
+                        <strong>&nbsp;<fmt:message key="console.login.welcome"/></strong>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <div style="padding:10px;">
+                            <fmt:message key="console.login.introduction"/>
+                            <br/><br/>    
+                            <fmt:message key="console.login.components"/>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+            <br/>
+        </td>
+    </tr>
+</table>
+</p>
 </form>
+
 </body>
 </html>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css Sat
Jul 30 14:49:45 2011
@@ -14,32 +14,29 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 ======================================================================*/
-body 
-{
-    /*background-color: #FFFFFF;*/
+
+/** override the dojo's claro style **/
+.claro .dijitLeaf {
+    display: none;
 }
 
-.BrightTitle
-{
-    color: #FFFFFF;
-    background-color: #5FA3D6;
-    font-size: 11px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+.claro .dijitTreeNodeSelected {
+    font-size: 12px;
 }
 
-.BrightTitle a:hover
-{
-    color: #5FA3D6;
+.claro .dijitTreeLabel {
+    font-size: 12px;
 }
 
-.BrightBox
+body
 {
-    border: thin solid #5FA3D6;
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 td
 {
-    font-size: 11px;
+    font-size: 12px;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
@@ -124,125 +121,8 @@ a:hover 
 
 .Selection
 {
-    background-color: #F2F2F2;
-    font-size: 12px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-}
-
-
-.Gutter
-{
-    width: 5px;
-}
-
-
-.claro .dijitLeaf {
-    display: none;
-}
-
-
-.claro .dijitTreeNodeSelected {
-    font-size: 1.2em;
-}
-
-.claro .dijitTreeLabel {
-    font-size: 1.5em !important;
-}
-
-.padding4 {
-    padding: 4px;
-}
-
-#navigationTreeAdvanced {
-    padding: 4px;
-}
-
-#navigationTreeBasic {
-    padding: 4px;
-}
-
- 
-.Content .TopLeft
-{
-    width: 18px;
-    height: 18px;
-    line-height: 18px;
-    background-color: #000000;
-}
-
-.Content .Title
-{
-    font-size: 12px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    background-color: #000000;
-    color: #FFFFFF;
-    height: 18px;
-    line-height: 18px;
-    font-weight: bold;
-}
-
-.Content .Title a:link, 
-.Content .Title a:hover, 
-.Content .Title a:visited
-{
-    font-size: 12px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    background-color: #000000;
-    color: #FFFFFF;
-    height: 18px;
-    line-height: 18px;
-}
-
-.Content .Title .Indent
-{
-    width: 20px;
-}
-
-.Content .TopRight
-{
-    width: 18px;
-    height: 18px;
-    background-color:#000000;
-}
-
-.Content .CollapsedLeft
-{
-    width: 18px;
-    height: 18px;
-    background-color:#000000;
-}
-
-.Content .CollapsedRight
-{
-    width: 18px;
-    height: 18px;
-    background-color:#000000;
-}
-
-.Content .Left
-{
-    width: 18px;
-    background-color: #FFFFFF;
-}
-
-.Content .Body, .Content .Body td
-{
     font-size: 12px;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    background-color: #FFFFFF;
-    color: #1E1E52;
-}
-
-.Content .Body strong
-{
-    font-weight: bold;  
-    font-size: 12px;
-}
-
-.Content .Body th
-{
-    font-weight: bold;  
-    font-size: 12px;
 }
 
 .InputField
@@ -258,18 +138,20 @@ a:hover 
 
 .BlankTableLine
 {
-    border:0px;
-    padding:0;
+    border: 0px;
+    padding: 0;
 }
 
 .LightBackground
 {
+    padding: 1px;
     background-color: #FFFFFF;
     color:#000000;
 }
 
 .MediumBackground
 {
+    padding: 1px;
     background-color: #F2F2F2;
     color:#000000;
 }
@@ -280,157 +162,42 @@ a:hover 
 .DarkBackground a:hover
 {
     background-color: #2581C7;
+    padding: 2px;
     color:#FFFFFF;
     font-size: 14px;
+    font-weight: normal;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 .DarkBackground th
 {
+    padding: 2px;
     color:#FFFFFF;
     font-size: 14px;
+    font-weight: normal;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 .ReallyDarkBackground
 {
     background-color: #000000;
+    padding: 2px;
     color: #FFFFFF;
     font-size: 14px;
+    font-weight: bold;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 .ReallyDarkBackground th
 {
+    padding: 2px;
     color: #FFFFFF;
     font-size: 14px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-}
-
-.IndentedTitle
-{
-    background-color: #919FBC;
-    color:#FFFFFF;
-}
-
-.LightIndentedBG
-{
-    background-color: #FFFFFF;
-    color:#000000;
-}
-
-.MediumIndentedBG
-{
-    background-color: #DDDDDD;
-    color:#000000;
-}
-
-
-.Content .Body a:link,
-.Content .Body a:visited
-{
-    font-size: 10px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    text-decoration: underline;
-    color: #546BC7;
     font-weight: bold;
-}
-
-.Content .Body a:hover
-{
-    color: #5FA3D6;
-}
-
-.Content .Buttons 
-{
-    border-top-width: thin;
-    border-right-width: thin;
-    border-bottom-width: thin;
-    border-left-width: thin;
-    border-top-style: solid;
-    border-right-style: solid;
-    border-bottom-style: solid;
-    border-left-style: solid;
-    border-top-color: #7B7BAE;
-    border-right-color: #7B7BAE;
-    border-bottom-color: #141336;
-    border-left-color: #141336;
-    background-color: #23224C;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    text-decoration: underline;
-    color: #5FA3D6;
-}
-
-.Content .Right
-{
-    width: 18px;
-    background-color: #FFFFFF;
-}
-
-.Content .BottomLeft
-{
-    width: 18px;
-    height: 12px;
-    line-height: 12px;
-    background-color:#333366;
-}
-
-.Content .Footer
-{
-    line-height: 12px;
-    height: 12px;
-    font-size: 9px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    background-color:#333366;
-    color:#000000;
-}
-
-.Content .Footer a:link,
-.Content .Footer a:visited,
-.Content .Footer a:hover
-{
-    color: #5FA3D6;
-}
-
-.Content .BottomRight
-{
-    width: 18px;
-    line-height: 12px;
-    height: 12px;
-    background-color:#333366;
-}
-
-.Content .Spacer
-{
-    height: 10px;
-}
-
-.BottomSpacer
-{
-}
-
-.Footer
-{
-    font-size: 9px;
-    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-    height: 20px;
-    background-color: #5FA3D6;
-}
-
-.Footer a:link, 
-.Footer a:visited, 
-.Footer a:hover
-{
-    color: #5FA3D6;
-    text-decoration: underline;    
-}
-
-.Box
-{
-    border: thin solid #000000;
 }
 
+/** Accessbility **/
 .access
 {
     display: none;
@@ -442,8 +209,8 @@ a:hover 
 .skip a {
     position: absolute;
     overflow: hidden;
-    width: 0;
-    height: 0;
+    width: 0px;
+    height: 0px;
 }
 
 .skip a:active, .skip a:focus {

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css
Sat Jul 30 14:49:45 2011
@@ -14,154 +14,51 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-body, th, td {
-    color:#1E1E52;
-    font-family:Verdana,Tahoma,Arial,Helvetica,sans-serif;
-    font-size:12px;
-}
-
-/** 'tooltip' block **/
-
-a.tooltip {
-    position:relative;
-    z-index:24; 
-    background-color:#ccc;
-    color:#000;
-    text-decoration:none;
-}
-
-a.tooltip:hover {
-     z-index:25;
-     background-color:#ff0;
-}
-
-a.tooltip span.tooltip {
-     display: none;
-}
-
-a.tooltip:hover span.tooltip {
-    display:block;
-    position:float;  /*this line is wrong and ignored. what was it supposed to do? (options
are: absolute, fixed, inherit, relative, static)? */
-    top:-2em; left:28em; width:5em;
-    border:1px solid #0cf;
-    background-color:#cff; color:#000;
-    text-align: center;
-}
-
-
-/** 'portal' block **/
-
-#portal {
-
-}
-
-/** 'header' block **/
-
-#header {
-/**  background: #8DB7DF url('images/banner.png') no-repeat top left;; **/
-  background: #8DB7DF url('imagesG/head_left_754x86.gif') no-repeat top left;;
-  border-bottom: 1px solid #2E6794;
-  width: auto;
-  height: 50px;
-  margin: 0px;
-  vertical-align: top;
-}
-
-#header h1 {
-  display: none;
-  margin: 5px 10px 5px 10px;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: 200%;
-}
-
-#header p {
-  display: none;
-  margin: 0px 10px 0px 10px;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: smaller;
-}
-
-#logout {
-  float:right;
-  font-size:smaller;
-}
-
-/** 'navigation' block **/
-
-#navigation {
-  clear: both;
-}
-
-#navigation h2 {
-  padding: 5px 10px 5px 10px;
-  margin: 0px;
-  color: #6D97BF;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: 100%;
-}
-
-#navigation ul {
-  margin: 0px;
-  padding: 5px 10px 5px 10px;
-  list-style: none;
-  position: absolute;
-  background-color: #F0F0F0;
-  border-width: 0px 1px 1px 1px;
-  border-style: solid;
-  border-color: #000000;
-}
-
-#navigation ul li {
-  color: #888888;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: smaller;
-}
-
-#navigation ul li a {
-  color: #888888;
-  text-decoration: none;
-}
 
-#navigation ul li a:hover {
-  color: #6D97BF;
-  text-decoration: underline;
+/** main layout definition **/
+#headerDiv {
+    width:100%;
+    height:86px;
+}
+
+#navigationDiv {
+    width:300px;
+    /*height need calculate*/ 
+    float:left; 
+    background-color:#f0f0f0
+}
+
+#panelDiv {
+    height: 60px;
+    padding-left: 4px;
+    padding-right: 4px;
+    font-family: Verdana,Tahoma,Arial,Helvetica,sans-serif;
+    font-size: 12px;
+}
+
+#treeDiv {
+    /*height need calculate*/ 
+    padding-left: 4px;
+    padding-right: 4px;
+    overflow-y: auto; 
+    overflow-x: hidden;
+    font-size: 12px;
+}
+
+#contentDiv {
+    /*width need calculate*/ 
+    /*height need calculate*/ 
+    float:left;
 }
 
-#navigation .selected, #navigation .selected a {
-  color: #6D97BF;
-  font-weight: bold;
-}
-
-
-/** 'content' block **/
-
-#content {
-
-}
 
 /** 'portlet' block **/
-
-#portlets-left-column {
-  margin: 0;
-  padding: 0;
-  width: 49%;
-  float: left;
-}
-
-#portlets-right-column {
-  margin: 0;
-  padding: 0;
-  width: 49%;
-  float: right;
-}
-
 .portlet {
   margin: 0px 0px 10px 0px;
   padding: 0px;
-  
 }
 
-.portlet .header {
+.portlet .title {
   white-space: nowrap;
   padding-left: 0.25em;
   background-color: #000000;
@@ -169,7 +66,7 @@ a.tooltip:hover span.tooltip {
   font-weight: bold;
 }
 
-.portlet .header h2 {
+.portlet .title h2 {
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
     height: 18px;
     line-height: 18px;
@@ -180,36 +77,35 @@ a.tooltip:hover span.tooltip {
     font-weight: bold;
 }
 
-.portlet .header span {
+.portlet .title span {
   width: 16px;
   height: 16px;
   float: right;
 }
 
-
 /** 'portlet' block: portlet mode and window state controls **/
 
-.portlet .header span.minimized {
+.portlet .title span.minimized {
   background: url(images/controls/min.png) no-repeat;
 }
 
-.portlet .header span.maximized {
+.portlet .title span.maximized {
   background: url(images/controls/max.png) no-repeat;
 }
 
-.portlet .header span.normal {
+.portlet .title span.normal {
   background: url(images/controls/norm.png) no-repeat;
 }
 
-.portlet .header span.view {
+.portlet .title span.view {
   background: url(images/controls/view.png) no-repeat;
 }
 
-.portlet .header span.edit {
+.portlet .title span.edit {
   background: url(images/controls/edit.png) no-repeat;
 }
 
-.portlet .header span.help {
+.portlet .title span.help {
   background: url(images/controls/help.png) no-repeat;
 }
 
@@ -220,62 +116,3 @@ a.tooltip:hover span.tooltip {
   border-color: #cccccc;
 }
 
-
-/** 'footer' block **/
-
-#footer {
-  clear: both;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: smaller;
-  color: #808080;
-  text-align: center;
-  margin: 0px;
-  padding: 4px 20px 4px 20px;
-  border-top-width: 1px;
-  border-top-color: #888888;
-  border-top-style: dotted;
-}
-
-/* navigation Tree */
-#navigationTreeBasic, #navigationTreeAdvanced {
-    font-size:8px !important;
-}
-
-/** Login page styles **/
-
-fieldset {
-  margin: 0.5em;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #2E6794;
-}
-
-legend {
-  color: #2E6794;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-weight: bold;
-}
-
-/* removed by GERONIMO-4204
-label {
-  clear: both;
-  width: 40%;
-  float: left;
-  text-align: right;
-  margin: 0px 5px 10px 0px;
-}
-*/
-/*
-input {
-  color: #2E6794;
-  background-color: #8DB7DF;
-  margin: 0px 0px 10px 5px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #2E6794;
-}
-*/
-
-
-
-

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/test/java/org/apache/geronimo/console/navigation/NavigationJsonGeneratorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/test/java/org/apache/geronimo/console/navigation/NavigationJsonGeneratorTest.java?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/test/java/org/apache/geronimo/console/navigation/NavigationJsonGeneratorTest.java
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/test/java/org/apache/geronimo/console/navigation/NavigationJsonGeneratorTest.java
Sat Jul 30 14:49:45 2011
@@ -77,7 +77,7 @@ public class NavigationJsonGeneratorTest
         String json = navigationJsonGenerator.generateTreeJSON(navigationTree, "console",
                 "/images/ico_deploy_16x16.gif", "all", 3);
 
-        String expected = "[\n{label: \'cat1\',id: \'1\',children: [{label: \'cat1-1\',id:
\'1-1\',children: [{label: \'cat1-1-1\',id: \'1-1-1\',children: [{label: \'<img src=\"console/images/ico_deploy_16x16.gif\"
alt=\"\" border=\"0\">&nbsp;<a href=\"console/portal/1-1-1-1/cat1/cat1-1/cat1-1-1/item1-1-1-1\">item1-1-1-1</a>\',id:
\'1-1-1-1\'}]\n}]\n},{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\"
border=\"0\">&nbsp;<a href=\"console/portal/1-2/cat1/item1-2\">item1-2</a>\',id:
\'1-2\'}]\n},\n{label: \'cat2\',id: \'2\',children: [{label: \'<img src=\"console/images/ico_deploy_16x16.gif\"
alt=\"\" border=\"0\">&nbsp;<a href=\"console/portal/2-2/cat2/item2-2\">item2-2</a>\',id:
\'2-2\'}]\n}\n]";
+        String expected = "[\n{label: \'cat1\',id: \'1\',children: [{label: \'cat1-1\',id:
\'1-1\',children: [{label: \'cat1-1-1\',id: \'1-1-1\',children: [{label: \'<img src=\"console/images/ico_deploy_16x16.gif\"
alt=\"\" border=\"0\">&nbsp;item1-1-1-1\',href: \'console/portal/1-1-1-1/cat1/cat1-1/cat1-1-1/item1-1-1-1\',id:
\'1-1-1-1\'}]\n}]\n},{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\"
border=\"0\">&nbsp;item1-2\',href: \'console/portal/1-2/cat1/item1-2\',id: \'1-2\'}]\n},\n{label:
\'cat2\',id: \'2\',children: [{label: \'<img src=\"console/images/ico_deploy_16x16.gif\"
alt=\"\" border=\"0\">&nbsp;item2-2\',href: \'console/portal/2-2/cat2/item2-2\',id:
\'2-2\'}]\n}\n]";
 
         System.out.println(json);
         Assert.assertEquals(expected, json);
@@ -86,7 +86,8 @@ public class NavigationJsonGeneratorTest
         json = navigationJsonGenerator.generateTreeJSON(navigationTree, "console", "/images/ico_deploy_16x16.gif",
                 "all", 5);
 
-        expected = "[\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\"
border=\"0\">&nbsp;<a href=\"console/portal/1-1-1-1/cat1/cat1-1/cat1-1-1/item1-1-1-1\">item1-1-1-1</a>\',id:
\'1-1-1-1\'},\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\" border=\"0\">&nbsp;<a
href=\"console/portal/1-2/cat1/item1-2\">item1-2</a>\',id: \'1-2\'},\n{label: \'<img
src=\"console/images/ico_deploy_16x16.gif\" alt=\"\" border=\"0\">&nbsp;<a href=\"console/portal/2-2/cat2/item2-2\">item2-2</a>\',id:
\'2-2\'},\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\" border=\"0\">&nbsp;<a
href=\"console/portal/2-2-1/cat2/cat2-1/item2-2-1\">item2-2-1</a>\',id: \'2-2-1\'}\n]";
+        expected = "[\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\"
border=\"0\">&nbsp;item1-1-1-1\',href: \'console/portal/1-1-1-1/cat1/cat1-1/cat1-1-1/item1-1-1-1\',id:
\'1-1-1-1\'},\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\" border=\"0\">&nbsp;item1-2\',href:
\'console/portal/1-2/cat1/item1-2\',id: \'1-2\'},\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\"
alt=\"\" border=\"0\">&nbsp;item2-2\',href: \'console/portal/2-2/cat2/item2-2\',id:
\'2-2\'},\n{label: \'<img src=\"console/images/ico_deploy_16x16.gif\" alt=\"\" border=\"0\">&nbsp;item2-2-1\',href:
\'console/portal/2-2-1/cat2/cat2-1/item2-2-1\',id: \'2-2-1\'}\n]";
+        
         System.out.println(json);
         Assert.assertEquals(expected, json);
 

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Sat Jul 30
14:49:45 2011
@@ -104,7 +104,7 @@
                 <attribute name="pageTitle">1-6/Application Server/Shutdown</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[ServerManager]</attribute>
-                <attribute name="icon">/images/ico_x_16x16.gif</attribute>
+                <attribute name="icon">/images/ico_shutdown_16x16.gif</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
Sat Jul 30 14:49:45 2011
@@ -24,10 +24,8 @@
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/DependencyViewHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
-<style type="text/css">
-    @import "/console/dojo/dojo/resources/dojo.css";
-    @import "/console/dojo/dijit/themes/claro/claro.css";
-</style>
+
+
 <script type="text/javascript" src="/console/dojo/dojo/dojo.js" djConfig="parseOnLoad:true"></script>
 <script type="text/javascript" src="/console/dojo/dijit/dijit.js"></script>
 <script type="text/javascript">

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
Sat Jul 30 14:49:45 2011
@@ -35,16 +35,6 @@
 <!------------------------>
 <!--     DOJO Stuff     -->
 <!------------------------>
-<style type="text/css">
-    @import "/console/dojo/dojo/resources/dojo.css";
-    @import "/console/dojo/dijit/themes/claro/claro.css";
-    
-    table thead th { 
-        background: #2581C7; 
-        color: #FFFFFF;    
-        font-weight: bold;
-    }
-</style>
 <script type="text/javascript" src="/console/dojo/dojo/dojo.js" djConfig="parseOnLoad:
true"></script>
 <script type="text/javascript" src="/console/dojo/dijit/dijit.js"></script>
 
@@ -614,9 +604,9 @@
             <!-- Main tab container START -->
             <div dojoType="dijit.layout.TabContainer" style="width: 100%; height: 100px;">
                 <div dojoType="dijit.layout.ContentPane" title="<fmt:message key="jmxmanager.help.attributes"/>"
selected="true">
-                    <table width="100%">
+                    <table class="TableLine" width="100%">
                         <thead>
-                            <tr>
+                            <tr class="DarkBackground">
                                 <th width="10%"><fmt:message key="jmxmanager.help.name"/></th>
                                 <th width="20%"><fmt:message key="jmxmanager.help.value"/></th>
                                 <th width="10%"><fmt:message key="jmxmanager.help.type"/></th>
@@ -634,9 +624,9 @@
                     </table>
                 </div>
                 <div dojoType="dijit.layout.ContentPane" title="<fmt:message key="jmxmanager.help.operations"/>">
-                    <table width="100%">
+                    <table class="TableLine" width="100%">
                         <thead>
-                            <tr>
+                            <tr class="DarkBackground">
                                 <th width="30%"><fmt:message key="jmxmanager.help.name"/></th>
                                 <th width="70%"><fmt:message key="jmxmanager.help.paramList"/></th>
                             </tr>
@@ -645,9 +635,9 @@
                     </table>
                 </div>
                 <div dojoType="dijit.layout.ContentPane" title="<fmt:message key="jmxmanager.help.info"/>">
-                    <table width="100%">
+                    <table class="TableLine" width="100%">
                         <thead>
-                            <tr>
+                            <tr class="DarkBackground">
                                 <th width="30%"><fmt:message key="jmxmanager.help.name"/></th>
                                 <th width="70%"><fmt:message key="jmxmanager.help.value"/></th>
                             </tr>
@@ -656,9 +646,9 @@
                     </table>
                 </div>
                 <div dojoType="dijit.layout.ContentPane" title="<fmt:message key="jmxmanager.help.stats"/>">
-                    <table width="100%">
+                    <table class="TableLine" width="100%">
                         <thead>
-                            <tr>
+                            <tr class="DarkBackground">
                                 <th width="30%"><fmt:message key="jmxmanager.help.name"/></th>
                                 <th width="70%"><fmt:message key="jmxmanager.help.value"/></th>
                             </tr>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
Sat Jul 30 14:49:45 2011
@@ -25,10 +25,7 @@
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/JNDIViewHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
-<style type="text/css">
-    @import "/console/dojo/dojo/resources/dojo.css";
-    @import "/console/dojo/dijit/themes/claro/claro.css";
-</style>
+
 <script type="text/javascript" src="/console/dojo/dojo/dojo.js" djConfig="parseOnLoad:true"></script>
 <script type="text/javascript" src="/console/dojo/dijit/dijit.js"></script>
 

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
Sat Jul 30 14:49:45 2011
@@ -33,17 +33,6 @@
 <!------------------------>
 <!--     DOJO Stuff     -->
 <!------------------------>
-<style type="text/css">
-    @import "/console/dojo/dojo/resources/dojo.css";
-    @import "/console/dojo/dijit/themes/claro/claro.css";
-    
-    table thead th { 
-        background: #2581C7; 
-        color: #FFFFFF;    
-        font-weight: bold;
-    }
-</style>
-
 <script type="text/javascript" src="/console/dojo/dojo/dojo.js" djConfig="parseOnLoad:
true"></script>
 <script type="text/javascript" src="/console/dojo/dijit/dijit.js"></script>
 
@@ -456,9 +445,9 @@ callOnLoad(init);
             
                 <!-- Attributes Tab START -->
                 <div dojoType="dijit.layout.ContentPane" title="<fmt:message key='ldapmanager.viewLDAPServer.attributes'/>"
selected="true">
-                       <table width="100%">
+                    <table class="TableLine" width="100%">
                         <thead>
-                            <tr>
+                            <tr class="DarkBackground">
                                 <th width="40%"><fmt:message key="ldapmanager.viewLDAPServer.name"/></th>
                                 <th width="60%"><fmt:message key="ldapmanager.viewLDAPServer.value"/></th>
                             </tr>
@@ -513,9 +502,9 @@ callOnLoad(init);
                             </td>
                         </tr>
                     </table>
-                    <table width="100%">
+                    <table class="TableLine" width="100%">
                         <thead>
-                            <tr>
+                            <tr class="DarkBackground">
                                 <th><fmt:message key="ldapmanager.viewLDAPServer.DN"
/>&nbsp;<span id='searchResultCount'></span></th>
                             </tr>
                         </thead>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp
Sat Jul 30 14:49:45 2011
@@ -27,17 +27,7 @@
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/EjbHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
-<style type="text/css">
 
-@import "/console/dojo/dojo/resources/dojo.css";
-@import "/console/dojo/dijit/themes/claro/claro.css";
-
-table thead td, table thead th { 
-    background: #2581C7; /* #94BEFF */
-    color: #FFFFFF;    /* added */
-}
-
-</style>
 <script type="text/javascript" src="/console/dojo/dojo/dojo.js" djConfig="parseOnLoad:
true"></script>
 <script type="text/javascript" src="/console/dojo/dijit/dijit.js"></script>
     
@@ -163,41 +153,38 @@ table thead td, table thead th { 
 		rootId="Ejb Containers" rootLabel="Ejb Containers" childrenAttrs="children"></div>
 
 	
-<div dojoType="dijit.layout.LayoutContainer"  id="mainLayout" style="width: 100%; height:
700px;">
-   <!-- Horizontal split container -->
+<div dojoType="dijit.layout.LayoutContainer" id="mainLayout" style="width: 100%; height:
700px;">
+    <!-- Horizontal split container -->
     <div dojoType="dijit.layout.SplitContainer" orientation="horizontal" sizerWidth="1"
activeSizing="true" layoutAlign="client" style="width: 100%; height: 100%;" >
-       <div dojoType="dijit.layout.ContentPane" layoutAlign="left" style="background-color:white;
overflow: auto;" preload="true" widgetId="ejbcontainerTree" sizeShare="40">       
-         <div class="claro" dojoType="dijit.Tree" model="storeModel" openOnClick="false"
>
-	         <script type="dojo/method" event="onClick" args="item">
-			 if(item.id!="Ejb Containers") {             	        
-		        var ids = serverStore.getValues(item, "values");
-			    if(ids[1] != null) {
-		            EjbHelper.getDeploymentInfo(ids[0],ids[1],updateEjbInfoTable);		       
-			    } else {
-			        EjbHelper.getContainerInfo(ids[0],updateEjbInfoTable);
-			    }
-			 } else {
-			    dwr.util.removeAllRows('ejbInfoTableBody');
-			 }
-             
-		     </script> 
-	      </div>
-      </div> 
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="left" style="background-color:white;
overflow: auto;" preload="true" widgetId="ejbcontainerTree" sizeShare="40">       
+            <div class="claro" dojoType="dijit.Tree" model="storeModel" openOnClick="false"
>
+    	        <script type="dojo/method" event="onClick" args="item">
+        			if(item.id!="Ejb Containers") {             	        
+        		        var ids = serverStore.getValues(item, "values");
+        			    if(ids[1] != null) {
+        		            EjbHelper.getDeploymentInfo(ids[0],ids[1],updateEjbInfoTable);		  
    
+        			    } else {
+        			        EjbHelper.getContainerInfo(ids[0],updateEjbInfoTable);
+        			    }
+        			} else {
+        			    dwr.util.removeAllRows('ejbInfoTableBody');
+        			}
+    		    </script> 
+	        </div>
+        </div> 
 	
-      <div id="infoTab" dojoType="dijit.layout.ContentPane" title="Ejb Info" label="Info"
sizeShare="60" style="background-color:white; overflow: auto;" layoutAlign="right" class="claro"
>
-         <table id="ejbsTable",
-            cellpadding="0" 
-            cellspacing="2" 
-            border="0"
-            width="100%">
-            <thead>                      
-              <th width="40%"><B>&nbsp;<fmt:message key="portlet.openejb.view.name"
/>&nbsp;</B></th>
-              <th width="60%"><B>&nbsp;<fmt:message key="portlet.openejb.view.value"
/>&nbsp;</B></th>
-            </thead>
-            <tbody id="ejbInfoTableBody">
-            </tbody>
-         </table>
-      </div>
-   </div>
+        <div id="infoTab" dojoType="dijit.layout.ContentPane" title="Ejb Info" label="Info"
sizeShare="60" style="background-color:white; overflow: auto;" layoutAlign="right" class="claro"
>
+            <table id="ejbsTable" class="TableLine" width="100%">
+                <thead>
+                    <tr class="DarkBackground">
+                        <th width="40%"><fmt:message key="portlet.openejb.view.name"
/>&nbsp;</th>
+                        <th width="60%"><fmt:message key="portlet.openejb.view.value"
/>&nbsp;</th>
+                    </tr>
+                </thead>
+                <tbody id="ejbInfoTableBody">
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>   
 



Mime
View raw message