svn commit: r1148198 - in /geronimo/server/trunk/plugins/console: console-core/src/main/java/org/apache/geronimo/console/message/ console-portal-driver/src/main/webapp/ console-portal-driver/src/main/webapp/WEB-INF/themes/

[ge...@apache.org]

Author: genspring
Date: Tue Jul 19 07:04:18 2011
New Revision: 1148198

URL: http://svn.apache.org/viewvc?rev=1148198&view=rev
Log:
GERONIMO-6080 When shutdown server or uninstall module in browser, could not dispaly the confirm dialog. Patch from Yi Xiao.

Modified:
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java
    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/portlet-skin.jsp

Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java?rev=1148198&r1=1148197&r2=1148198&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java Tue Jul 19 07:04:18 2011
@@ -45,7 +45,6 @@ public final class ConfirmMessageTag ext
             out.println(".claro .dijitDialogTitleBar {display:none;}");
             out.println(".claro .dijitButtonNode {background:#F7F7F7; border:2px solid #88A4D7; padding:0.2em; font-family:Verdana,Helvetica,sans-serif;}");
             out.println("</style>");
-            out.println(" <script type=\"text/javascript\" src=\"" + DOJO_BASE + "/dojo/dojo.js\" djConfig=\"parseOnLoad:true\"></script>");
         } catch (IOException e) {
             log.error("Unable to display confirm messages");
         }

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=1148198&r1=1148197&r2=1148198&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 Tue Jul 19 07:04:18 2011
@@ -141,7 +141,7 @@ function convertBRtoLineBreak (str) {
 function showConfirmMessage() {
     dojo.require("dijit.Dialog");
     dojo.require("dijit.form.Button");
-    document.body.className = "soria";
+    document.body.className = "claro";
     var target = arguments[0];
     var submit = new dojo.Deferred();
     submit.addCallback(function(){

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=1148198&r1=1148197&r2=1148198&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 Tue Jul 19 07:04:18 2011
@@ -40,6 +40,8 @@ limitations under the License.
       <h2><fmt:message key="<%=(String)request.getAttribute( org.apache.pluto.driver.AttributeKeys.PORTLET_TITLE )%>"/></h2>
     </div>
     <div 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/>
     </div>
   </div>