geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1150575 - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/webapp/WEB-INF/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/ console/console-base-portlets/src/main/webapp/WEB-INF/ console/cons...
Date Mon, 25 Jul 2011 08:17:40 GMT
Author: rwonly
Date: Mon Jul 25 08:17:37 2011
New Revision: 1150575

URL: http://svn.apache.org/viewvc?rev=1150575&view=rev
Log:
GERONIMO-6094 Some issues of confirm msg tld in admin console

Added:
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
  (with props)
Removed:
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
    geronimo/server/trunk/plugins/console/console-filter/src/main/resources/XSRF.js
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/navigation.js
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
Mon Jul 25 08:17:37 2011
@@ -34,12 +34,6 @@ limitations under the License.
         <tagclass>org.apache.geronimo.console.message.CommonMessageTag</tagclass>
         <bodycontent>empty</bodycontent>
     </tag>
-
-    <tag>
-        <name>confirmMsg</name>
-        <tagclass>org.apache.geronimo.console.message.ConfirmMessageTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
     
 </taglib>
 

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
Mon Jul 25 08:17:37 2011
@@ -20,8 +20,9 @@
 <%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
 <fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
+    
+<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
 
-<CommonMsg:confirmMsg/>
 <CommonMsg:commonMsg/>
 
 <p><fmt:message key="jmsmanager.server.normal.title" />:</p>
@@ -68,7 +69,7 @@
                  <portlet:param name="brokerName" value="${entry.brokerName}" />  

                </portlet:renderURL>"><fmt:message key="jmsmanager.common.edit"/></a>
                <a href="<portlet:actionURL portletMode="view"><portlet:param
name="mode" value="delete" /><portlet:param name="brokerURI" value="${entry.brokerURI}"
/><portlet:param name="brokerName" value="${entry.brokerName}" /></portlet:actionURL>"
-                   onClick="return showConfirmMessage(this, '<fmt:message key="jmsmanager.broker.confirmMsg01"/>${entry.brokerName}?',
'<fmt:message key="jmsmanager.broker.ok"/>', '<fmt:message key="jmsmanager.broker.cancel"/>');">
+                   onClick="return showGlobalConfirmMessage('<fmt:message key="jmsmanager.broker.confirmMsg01"/>${entry.brokerName}?');">
                    <fmt:message key="jmsmanager.common.delete"/>
                </a>
              </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
Mon Jul 25 08:17:37 2011
@@ -24,10 +24,10 @@ limitations under the License.
 
 <taglib>
   
-  <tlibversion>1.0</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>pluto</shortname>
-  <uri>http://portals.apache.org/pluto</uri>
+    <tlibversion>1.0</tlibversion>
+    <jspversion>1.1</jspversion>
+    <shortname>pluto</shortname>
+    <uri>http://portals.apache.org/pluto</uri>
 
     <tag>
         <name>commonMsg</name>
@@ -35,11 +35,6 @@ limitations under the License.
         <bodycontent>empty</bodycontent>
     </tag>
 
-    <tag>
-        <name>confirmMsg</name>
-        <tagclass>org.apache.geronimo.console.message.ConfirmMessageTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
 
 </taglib>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
Mon Jul 25 08:17:37 2011
@@ -21,56 +21,29 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<CommonMsg:confirmMsg/>
-
+<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
+      
 <script>
-
-// Check to see if a component is "safe" to stop within a running server.
-// Service components with names that begin with "org.apache.geronimo.configs/", for example,
-// may not be safe to stop because doing so might prevent other components
-// that depend on them (like the console itself) from functioning properly.
-// If the component is not safe to stop then prompt to make sure that
-// the user really intends to stop the component prior to any action.
-function promptIfUnsafeToStop(target, bundleId, bundleName) {
-    // otherwise don't challenge the stop operation
-    return true;
-}
-function promptIfUnsafeToRestart(target, bundleId, bundleName) {
-    // otherwise don't challenge the restart operation
-    return true;
-}
-function promptIfUnsafeToUpdate(target, bundleId, bundleName) {
-    return true;
-}
-
-// Uninstall is always a potentially dangerous action, so we should prompt the
-// the user to ensure that they really indent to do this.  Uninistalling
-// some modules is more destructive than others (such as modules which are
-// dependencies of the web console or dependencies of other core server 
-// modules.  In such cases. it may leave the server in a state where it 
-// cannot be restarted.  These situations require more stringent warnings.
 function uninstallPrompt(target, bundleId, bundleName) {
-    // if the component is none of the above provide a standard warning
-    return showConfirmMessage(target, '<fmt:message key="configmanager.normal.confirmMsg10"/>
' + bundleName + '?', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message
key="configmanager.normal.cancel"/>');
+    var msg = '<fmt:message key="configmanager.normal.confirmMsg10"/>: ' + bundleName
+ '?';
+    return showGlobalConfirmMessage(msg);
 }
 
 function refreshPrompt(target, bundleId, bundleName) {
-    // if the component is none of the above provide a standard warning
-    return showConfirmMessage(target, '<fmt:message key="configmanager.normal.confirmMsg11"/>
' + bundleName + '?', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message
key="configmanager.normal.cancel"/>');
+    var msg = '<fmt:message key="configmanager.normal.confirmMsg11"/>: ' + bundleName
+ '?';
+    return showGlobalConfirmMessage(msg);
 }
-
-
 </script>
 
 <CommonMsg:commonMsg/>
 
 <br/>
-<table width="100%" class="TableLine" summary="OSGi install">
+<table width="100%" class="BlankTableLine" summary="OSGi install">
     <tr>
         <td>
             <form id="installForm" enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param
name='action' value='install'/></portlet:actionURL>">
                 Install New:
-                <input type="file" name="bundleFile" />
+                <input type="file" name="bundleFile"/>
                             
                 Start:
                 <input type="checkbox" name="startAfterInstalled" value="yes"/>
@@ -100,10 +73,9 @@ function refreshPrompt(target, bundleId,
     </tr>
 </table>
 
-<br/>
 
 
-<table width="100%" class="TableLine" summary="OSGi filter">
+<table width="100%" class="BlankTableLine" summary="OSGi filter">
     <tr>
         <td>
             <form id="listForm" method="POST" action="<portlet:actionURL><portlet:param
name='action' value='list'/></portlet:actionURL>">
@@ -147,11 +119,10 @@ function refreshPrompt(target, bundleId,
     </tr>
 </table>
 
-<br/>
 
 <table width="100%" class="TableLine" summary="OSGi Manager">
     <tr class="DarkBackground">
-        <th scope="col" width="40">Id</th>   
+        <th scope="col" width="35">Id</th>   
         <th scope="col">Symbolic Name</th> 
         <th scope="col" width="150">Version</th>
         <th scope="col" width="150">Type</th>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
Mon Jul 25 08:17:37 2011
@@ -23,7 +23,7 @@
 
 <a href="<portlet:actionURL/>" >OSGi Manager</a> > Find Packages 
 <br/><br/>
-<table width="100%" class="TableLine" summary="Find Packages">
+<table width="100%" class="BlankTableLine" summary="Find Packages">
     <tr>
         <td>
             The Packages with Keyword: "<b>${packageStringValue}</b>"

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
Mon Jul 25 08:17:37 2011
@@ -23,7 +23,7 @@
 
 <a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Bundle Manifest
 <br/><br/>
-<table width="100%" class="TableLine" summary="OSGi install">
+<table width="100%" class="BlankTableLine" summary="OSGi install">
     <tr>
         <td>
             The Manifest of Bundle:

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowServices.jsp
Mon Jul 25 08:17:37 2011
@@ -23,7 +23,7 @@
 
 <a href="<portlet:actionURL/>" >OSGi Manager</a> > Show Services
 <br/><br/>
-<table width="100%" class="TableLine" summary="OSGi install">
+<table width="100%" class="BlankTableLine" summary="OSGi install">
     <tr>
         <td>
             The Services related to Bundle:

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
Mon Jul 25 08:17:37 2011
@@ -44,7 +44,8 @@
         }
     }
 </script>
-<table width="100%" class="TableLine" summary="OSGi install">
+<br/>
+<table width="100%" class="BlankTableLine" summary="OSGi install">
     <tr>
         <td>
             The Wired Bundles of Bundle:

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
Mon Jul 25 08:17:37 2011
@@ -21,7 +21,7 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<CommonMsg:confirmMsg/>
+<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
 
 <script>
 var EXPERT_COOKIE = "org.apache.geronimo.configmanager.expertmode";
@@ -36,15 +36,15 @@ var SHOW_DEPENDENCIES_COOKIE = "org.apac
 function promptIfUnsafeToStop(target, configId, expertConfig, type) {
     // if the component is a Geronimo "expert" service then provide a stern warning
     if ((type == 'SERVICE') && (expertConfig == 'true')) {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg01"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg01"/>');
     }
     // if the component is the web console provide an appropriate warning
     if (configId.indexOf("org.apache.geronimo.plugins") == 0 && configId.indexOf("console")
> 0) {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg02"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg02"/>');
     }
     // if the component is any other Geronimo "expert" component provide an appropriate warning
     if (expertConfig == 'true') {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg03"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg03"/>');
     }
     // otherwise don't challenge the stop operation
     return true;
@@ -60,15 +60,15 @@ function promptIfUnsafeToStop(target, co
 function promptIfUnsafeToRestart(target, configId, expertConfig, type) {
     // if the component is a Geronimo "expert" service then provide a stern warning
     if ((type == 'SERVICE') && (expertConfig == 'true')) {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg04"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg04"/>');
     }
     // if the component is the web console provide an appropriate warning
     if (configId.indexOf("org.apache.geronimo.plugins") == 0 && configId.indexOf("console")
> 0) {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg05"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg05"/>');
     }
     // if the component is a Geronimo "expert" component then provide an appropriate warning
     if (expertConfig == 'true') {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg06"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg06"/>');
     }
     // otherwise don't challenge the restart operation
     return true;
@@ -84,18 +84,18 @@ function promptIfUnsafeToRestart(target,
 function uninstallPrompt(target, configId, expertConfig, type) {
     // if the component is a geronimo "expert" service always provide the most stern warning
     if ((type == 'SERVICE') && (expertConfig == 'true')) {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg07"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg07"/>');
     }
     // if the component is a the web console itself then provide an appropriate warning
     if (configId.indexOf("org.apache.geronimo.plugins") == 0 && configId.indexOf("console")
> 0) {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg08"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg08"/>');
     }
     // if the component is any other Apache Geronimo "expert" component then provide an appropriate
warning
     if (expertConfig == 'true') {
-        return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg09"/>',
'<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+        return showGlobalConfirmMessage(configId + '<fmt:message key="configmanager.normal.confirmMsg09"/>');
     }
     // if the component is none of the above provide a standard warning
-    return showConfirmMessage(target, '<fmt:message key="configmanager.normal.confirmMsg10"/>'
+ configId + '?', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
+    return showGlobalConfirmMessage('<fmt:message key="configmanager.normal.confirmMsg10"/>'
+ configId + '?');
 }
 
 // Toggle expert mode on and off with onClick
@@ -197,18 +197,18 @@ function toggleShowDependenciesMode() {
 
 <table width="100%" class="TableLine" summary="Config Manager">
     <tr class="DarkBackground">
-        <th scope="col" align="left">&nbsp;<fmt:message key="configmanager.normal.componentName"
/></th>   
+        <th scope="col"><fmt:message key="configmanager.normal.componentName" /></th>
  
         <c:if test="${showDisplayName}">    
-               <th scope="col"><fmt:message key="configmanager.normal.displayName"
/></th> 
+            <th scope="col"><fmt:message key="configmanager.normal.displayName"
/></th> 
         </c:if>
         <c:if test="${showWebInfo}">          
-          <th scope="col">URL</th>
+            <th scope="col">URL</th>
         </c:if>
-        <th scope="col">&nbsp;<fmt:message key="consolebase.common.state"/></th>
-        <th scope="col" align="center" colspan="3"><fmt:message key="consolebase.common.commands"/></th>
+        <th scope="col"><fmt:message key="consolebase.common.state"/></th>
+        <th scope="col" colspan="3"><fmt:message key="consolebase.common.commands"
/></th>
         <c:if test="${showDependencies}">
-          <th scope="col" align="left"><fmt:message key="configmanager.normal.parentComponents"
/></th>
-          <th scope="col" align="left"><fmt:message key="configmanager.normal.childComponents"
/></th>
+            <th scope="col"><fmt:message key="configmanager.normal.parentComponents"
/></th>
+            <th scope="col"><fmt:message key="configmanager.normal.childComponents"
/></th>
         </c:if>
     </tr>
   <c:set var="backgroundClass" value='MediumBackground'/>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
Mon Jul 25 08:17:37 2011
@@ -196,6 +196,7 @@ function showHideByCheckbox(cb,target){
   </table>
 </form>
 
+<br/>
 
 <b><fmt:message key="repository.normal.currentRepositoryEntries"/></b>
 <p><fmt:message key="repository.normal.toViewUsage"/></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
Mon Jul 25 08:17:37 2011
@@ -21,7 +21,7 @@
 <fmt:setBundle basename="consolebase" />
 <portlet:defineObjects />
 
-<CommonMsg:confirmMsg/>
+<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
     <tr>
@@ -45,7 +45,7 @@
             <form action="<portlet:actionURL/>" method="POST">
                 <input type="hidden" name="shutdown" value="shutdown" />
                 <input type="button" value='<fmt:message key="servermanager.normal.shutdown"/>'

-                       onClick="showConfirmMessage(this, '<fmt:message key="servermanager.normal.comfirmMsg01"/>',
'<fmt:message key="servermanager.normal.ok"/>', '<fmt:message key="servermanager.normal.cancel"/>');"
/>
+                       onClick="showGlobalConfirmMessage('<fmt:message key="servermanager.normal.comfirmMsg01"/>')"
/>
             </form>
             </td>
         </tr>

Modified: geronimo/server/trunk/plugins/console/console-filter/src/main/resources/XSRF.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-filter/src/main/resources/XSRF.js?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-filter/src/main/resources/XSRF.js (original)
+++ geronimo/server/trunk/plugins/console/console-filter/src/main/resources/XSRF.js Mon Jul
25 08:17:37 2011
@@ -17,23 +17,17 @@
 <script language="JavaScript">
 var formID = '<%XSRF_UNIQUEID%>';
 function updateLinks() {
-    var elements = document.all ? document.all : document.getElementsByTagName('*');
+    var elements = document.getElementsByTagName('*');
     for (var i=0; i<elements.length; i++) {   
         var link = elements[i].getAttribute('href');
         if (link != null && isURL(link) && link.indexOf('?') != -1) {
             // add formId only if other attributes are present in link
-            // Note: we cannot use setAttribute due to IE issues so we are using element.*=
-            elements[i].href = link + '&formId=' + formID;
-        }
-        
-        if(link != null && isURL(link) && link.indexOf("/console/portal/")==-1){
-        
-            if (document.all) {    //IE
-                elements[i].target="_parent";   
-            } else if (document.getElementById) {  //firefox
-               elements[i].setAttribute("target", "_parent");
-            }      
-             
+            elements[i].setAttribute('href', link + '&formId=' + formID);
+        }
+        
+        // this is not for XSS/XSRF defense. this is only because we are using iframe...
+        if(link != null && isURL(link) && link.indexOf("/console/portal/")==-1){
+            elements[i].setAttribute("target", "_parent");
         }        
     }
 }
@@ -46,9 +40,9 @@ function updateForms() {
             var link = forms[i].getAttribute('action');
             if (link != null && isURL(link)) {
                 if (link.indexOf('?') == -1) {
-                    forms[i].action = link + '?formId=' + formID;
+                    forms[i].setAttribute('action', link + '?formId=' + formID);
                 } else {
-                    forms[i].action = link + '&formId=' + formID;
+                    forms[i].setAttribute('action', link + '&formId=' + formID);
                 }
             }
         } else {

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js
Mon Jul 25 08:17:37 2011
@@ -138,71 +138,6 @@ function convertBRtoLineBreak (str) {
     return str;
 }
 
-function showConfirmMessage() {
-    dojo.require("dijit.Dialog");
-    dojo.require("dijit.form.Button");
-    document.body.className = "claro";
-    var target = arguments[0];
-    var submit = new dojo.Deferred();
-    submit.addCallback(function(){
-        switch (target.nodeName.toLowerCase()) {
-            case "input":
-                var formNode = target.parentNode;
-                while (formNode) {
-                    if (formNode.nodeName.toLowerCase() == "form") {
-                        break;
-                    }
-                    formNode = formNode.parentNode;
-                }
-                if (formNode) {
-                    formNode.submit();
-                }
-                break;
-            case "a":
-                location.href=target.href;
-                break;
-            default:                            
-        }
-    });
-    var d = new dijit.Dialog();
-    dojo.style(d.closeButtonNode, "visibility", "hidden");
-    var table = document.createElement("table");
-    table.width="100%";
-    var tbody =  document.createElement("tbody");
-    table.appendChild(tbody);
-    var tr1 = document.createElement("tr");
-    tbody.appendChild(tr1);
-    var tr2 = document.createElement("tr");
-    tbody.appendChild(tr2);
-    var td11 = document.createElement("td");
-    tr1.appendChild(td11);
-    td11.colSpan="2"; td11.style.paddingBottom="10px"; td11.align="left";
-    var img = document.createElement("img");
-    td11.appendChild(img);
-    td11.appendChild(document.createTextNode(arguments[1]));
-    img.height="16"; img.width="16"; img.style.marginRight="8"; img.align="baseline"; img.src="/console/images/msg_warn.gif";
img.alt="Warn"; img.title="Warning";               
-    var td21 = document.createElement("td");
-    tr2.appendChild(td21);
-    td21.align="right";
-    var td22 = document.createElement("td");
-    tr2.appendChild(td22);
-    td22.align="left";
-    var b1 = new dijit.form.Button({label: arguments[2], tabIndex: "2"});
-    td21.appendChild(b1.domNode);
-    dojo.connect(b1, "onClick", function() {
-        d.hide();
-        submit.callback();
-    });
-    var b2 = new dijit.form.Button({label: arguments[3], tabIndex: "1"});
-    td22.appendChild(b2.domNode);
-    dojo.connect(b2, "onClick", function() {
-        d.hide();             
-    });
-    d.setContent(table);
-    d.show();
-    return false;
-}
-
 function showHideSection(id){
     if(document.getElementById(id)!=null){
         if(document.getElementById(id).style.display=="none"){

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js?rev=1150575&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
(added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
Mon Jul 25 08:17:37 2011
@@ -0,0 +1,23 @@
+//======================================================================
+//   Licensed to the Apache Software Foundation (ASF) under one or more
+//   contributor license agreements.  See the NOTICE file distributed with
+//   this work for additional information regarding copyright ownership.
+//   The ASF licenses this file to You under the Apache License, Version 2.0
+//   (the "License"); you may not use this file except in compliance with
+//   the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//======================================================================
+function showGlobalConfirmMessage(msg){
+    if (parent){
+        return parent.globalConfirm(msg);
+    }else{
+        return confirm(msg);
+    }
+} 

Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp
Mon Jul 25 08:17:37 2011
@@ -21,10 +21,10 @@ limitations under the License.
     <tr>
         <td height="86" class="Logo" border="0"></td>
         <td height="86" class="Top" border="0">&nbsp;</td>
-        <td height="86" class="Top" border="0" width="40"></td>
         <td height="86" class="Top" border="0" width="40">
-            <a href="<%=request.getContextPath()%>/logout.jsp"><img border="0"
src="<%=request.getContextPath()%>/images/head_logout_63x86.gif" alt="Logout"/></a>
+            <a href="<%=request.getContextPath()%>/logout.jsp"><img border="0"
style="vertical-align:middle" src="<%=request.getContextPath()%>/images/head_logout_63x86.gif"
alt="Logout"/></a>
         </td>
+        <td height="86" class="Top" border="0" width="5"></td>
     </tr>
 </table>
 

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp
Mon Jul 25 08:17:37 2011
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +20,6 @@ limitations under the License.
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
-
 <%@ page language="java" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page session="true" buffer="none" %>
@@ -30,14 +30,20 @@ limitations under the License.
 <html lang="en">
 <head>
     <title><fmt:message key="console.head.title"/></title>
+    <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
     <link rel="stylesheet" href="/console/dojo/dijit/themes/claro/claro.css" type="text/css"/>
-    <link rel="stylesheet" href="<%=request.getContextPath()%>/main.css" type="text/css"/>
     <link rel="stylesheet" href="<%=request.getContextPath()%>/pluto.css" type="text/css"/>
+    <link rel="stylesheet" href="<%=request.getContextPath()%>/main.css" type="text/css"/>
     <link rel="stylesheet" href="<%=request.getContextPath()%>/CommonMsg.css" type="text/css"/>
-    <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
     <script language="Javascript" src="<%=request.getContextPath()%>/js/forms.js"
type="text/javascript"></script>
     <script language="Javascript" src="<%=request.getContextPath()%>/CommonMsg.js"
type="text/javascript"></script>
 </head>
+<style type="text/css">
+body{
+  padding:0;
+  margin:0;
+}
+</style>
 <c:choose>
     <c:when test="${param.noxssShowTree!=null}">
          <jsp:include page="portlets-with-tree.jsp" />

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
Mon Jul 25 08:17:37 2011
@@ -43,8 +43,6 @@ limitations under the License.
     </tr>
     <tr>
       <td class="body">
-      <script language="Javascript" src="/console/dojo/dojo/dojo.js" type="text/javascript"></script>
-      <script language="Javascript" src="/console/dojo/dijit/dijit.js" type="text/javascript"></script>
       <pluto:render/>
       </td>
     </tr>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp
Mon Jul 25 08:17:37 2011
@@ -18,24 +18,21 @@ limitations under the License.
 --%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
-<body id="portlets" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
-<!-- Content block: portlets are divided into two columns/groups -->
-<!--<div id="body-block" style="height:100%">-->
-<div id="content"><pluto:isMaximized var="isMax" />
+<body id="portlets">
 
-<c:forEach var="portlet" varStatus="status" items="${currentPage.portletIds}">
-    <c:set var="portlet" value="${portlet}" scope="request" />
-    <jsp:include page="portlet-skin.jsp" />
-</c:forEach>
+<div id="content">
+    <pluto:isMaximized var="isMax" />
+    <c:forEach var="portlet" varStatus="status" items="${currentPage.portletIds}">
+        <c:set var="portlet" value="${portlet}" scope="request" />
+        <jsp:include page="portlet-skin.jsp" />
+    </c:forEach>
 </div>
 
 <script type="text/javascript">
     if(parent){
-       
         if(!(parent.location.hash=="#noxssPage=<c:out value="${hashOfCurrentPortalPage}"/>"))
-        parent.location.hash="#noxssPage=<c:out value="${hashOfCurrentPortalPage}"/>";
+            parent.location.hash="#noxssPage=<c:out value="${hashOfCurrentPortalPage}"/>";
         <!--window.parent.dojo.hash("#noxssPage=<c:out value='${hashOfCurrentPortalPage}'/>",true);-->
-        
     }
 </script>
 </body>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
Mon Jul 25 08:17:37 2011
@@ -23,14 +23,37 @@ limitations under the License.
 <fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 <%@ page import="org.apache.geronimo.pluto.impl.PageConfig"%>
 
-<body id="admin-console" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0"
rightmargin="0">
+<%-- Confirm Message Definition: Start --%>
+<style type="text/css">
+#darkCover {
+  position:fixed;
+  z-index:1000; 
+  width:100%; 
+  height:100%; 
+  top:0; 
+  left:0; 
+  background-color:#333333;
+  filter:alpha(opacity=70);
+  opacity:0.7;
+}
+</style>
+<div id="darkCover" style="display:none"></div>
+<script type="text/javascript">
+function globalConfirm(msg){
+    document.getElementById("darkCover").style.display='block';
+    var result = confirm(msg);
+    document.getElementById("darkCover").style.display='none';
+    return result;
+}
+</script>
+<%-- Confirm Message Definition: End --%>
 
+<body id="admin-console">
 
 <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" src="/console/dojo/dojox/dojox.js" ></script>
 
-
 <script>
 //we have to use dojo.hash to maintain the hash change history because browser does not 
 //recogonize a hash change when users click back/forward button.
@@ -132,7 +155,7 @@ if(document.location.hash!='') {
     var pageName = "<fmt:message key="<%=pageName%>"/>";
     quickLaunchPortlets(pageName);
 </script>
-<script language="JavaScript">
+<script type="text/javascript">
 
 function autoResizeIframe(){
     // reset the height of index page each time the new portlet is loaded
@@ -145,7 +168,7 @@ function autoResizeIframe(){
         var toHeight; 
         toHeight = (iframeDocument.height) ? iframeDocument.height : iframeDocument.body.scrollHeight;
         
-        (iframe.style) ? iframe.style.height = toHeight : iframe.height = toHeight; 
+        iframe.height = toHeight; 
         
     }catch (ex){
         window.status = ex.message;

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/navigation.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/navigation.js?rev=1150575&r1=1150574&r2=1150575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/navigation.js
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/navigation.js
Mon Jul 25 08:17:37 2011
@@ -127,7 +127,7 @@
         try {
             //reset the height of iframe page each time the new portlet is loaded
             var iframe = document.getElementById("portletsFrame");
-            (iframe.style) ? iframe.style.height = 400 : iframe.height = 400; 
+            iframe.height = 400; 
         }catch(err){
             window.status = err.message;
         }

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=1150575&r1=1150574&r2=1150575&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 Mon
Jul 25 08:17:37 2011
@@ -245,15 +245,27 @@ a:hover 
     font-size: 12px;
 }
 
-.LightBackground
+.InputField
 {
-    background-color: #FFFFFF;
-    color:#000000;
+    width: 150px;
+}
+
+.TableLine {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #DDDDDD;	
+}
+
+.BlankTableLine
+{
+    border:0px;
+    padding:0;
 }
 
-.LightBackground .InputField
+.LightBackground
 {
-  width: 150px;
+    background-color: #FFFFFF;
+    color:#000000;
 }
 
 .MediumBackground
@@ -269,15 +281,29 @@ a:hover 
 {
     background-color: #2581C7;
     color:#FFFFFF;
-    font-size: 15px;
+    font-size: 14px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.DarkBackground th
+{
+    color:#FFFFFF;
+    font-size: 14px;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 .ReallyDarkBackground
 {
-    color: #FFFFFF;
     background-color: #000000;
-    font-size: 15px;
+    color: #FFFFFF;
+    font-size: 14px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.ReallyDarkBackground th
+{
+    color: #FFFFFF;
+    font-size: 14px;
     font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
@@ -434,9 +460,3 @@ a:hover 
     border: 2px solid #000000;
     font-weight: bold;
 }
-
-.TableLine {
-    border-style: solid;
-    border-width: 1px;
-    border-color: #DDDDDD;	
-}
\ No newline at end of file



Mime
View raw message