You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/07/30 16:49:49 UTC
svn commit: r1152478 [1/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...
Author: rwonly
Date: Sat Jul 30 14:49:45 2011
New Revision: 1152478
URL: http://svn.apache.org/viewvc?rev=1152478&view=rev
Log:
GERONIMO-6059 New look and feel of Geronimo 3.0 admin console (Step 1)
Added:
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/GlobalUtils.js
- copied, changed from r1151321, geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_shutdown_16x16.gif (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/transparent_line.png (with props)
Removed:
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js
Modified:
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/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties
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/configmanager/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-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java
geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_ja.properties
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/navigation/NavigationJsonGenerator.java
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
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/navigation.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/login.jsp
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css
geronimo/server/trunk/plugins/console/console-portal-driver/src/test/java/org/apache/geronimo/console/navigation/NavigationJsonGeneratorTest.java
geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -21,8 +21,6 @@
<fmt:setBundle basename="activemq"/>
<portlet:defineObjects/>
-<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
-
<CommonMsg:commonMsg/>
<p><fmt:message key="jmsmanager.server.normal.title" />:</p>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties Sat Jul 30 14:49:45 2011
@@ -158,7 +158,7 @@ consolebase.warnMsg03 = Web statistics
consolebase.warnMsg04 = Statistics are not currently being collected.
consolebase.warnMsg05 = CA is not running or CA may not have been initialized. Unable to lock CA.
consolebase.warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You might be seeing this message since you have clicked 'Issue Certificate' button a second time.
-consolebase.warnMsg07 = <p style='font-size:120%;'><b>A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.</b></p>
+consolebase.warnMsg07 = A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.
consolebase.warnMsg08 = There are no Web Containers defined.
consolebase.bundlemanager.info.start = Bundle: {0} (id={1}) is successfully started.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties Sat Jul 30 14:49:45 2011
@@ -159,7 +159,7 @@ consolebase.warnMsg03 = ç¾å¨ã�
consolebase.warnMsg04 = ç¾å¨ãçµ±è¨æ
å ±ãæ
å ±åéãã¦ãã¾ããã
consolebase.warnMsg05 = èªè¨¼å±ãå®è¡ä¸ã§ãªãããåæåããã¦ããªãå¯è½æ§ãããã¾ããèªè¨¼å±ã®ããã¯ã解é¤ã§ãã¾ããã
consolebase.warnMsg06 = ã·ãªã¢ã«çªå· <b>{0}</b> ã®è¨¼ææ¸ã¯ãã§ã«çºè¡æ¸ã¿ã§ãã'証ææ¸ã®çºè¡' ãã¿ã³ã 2 åã¯ãªãã¯ããããããã®ã¡ãã»ã¼ã¸ã確èªããå¯è½æ§ãããã¾ãã
-consolebase.warnMsg07 = <div style='font-size:large;'><b>ãµã¼ãã¼ã®ã·ã£ãããã¦ã³ã¯ããã® Web ã³ã³ã½ã¼ã«ãç¡å¹åãã¾ã!</b></div>\r\n<p>ãµã¼ãã¼ãå¼·å¶çµäºããããå ´åã®ã¿ç¶è¡ãã¦ãã ããã</p>
+consolebase.warnMsg07 = ãµã¼ãã¼ã®ã·ã£ãããã¦ã³ã¯ããã® Web ã³ã³ã½ã¼ã«ãç¡å¹åãã¾ã! ãµã¼ãã¼ãå¼·å¶çµäºããããå ´åã®ã¿ç¶è¡ãã¦ãã ããã
consolebase.warnMsg08 = Web ã³ã³ããã¼ãå®ç¾©ãã¦ãã¾ããã
consolebase.bundlemanager.info.start = Bundle: {0} (id={1}) is successfully started.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties Sat Jul 30 14:49:45 2011
@@ -159,7 +159,7 @@ consolebase.warnMsg03 = 该Web容
consolebase.warnMsg04 = å½åå°æªæ¶éç»è®¡æ°æ®ã
consolebase.warnMsg05 = CAæªå¤äºè¿è¡ç¶ææè
CAå°æªåå§åãæ æ³éå®CAã
consolebase.warnMsg06 = åºåå·ä¸º<b>{0}</b>çè¯ä¹¦å
å已被åå¸ï¼å½ä½ ç¹å»äº'åå¸è¯ä¹¦'æé®ä¸¤æ¬¡æ¶ä½ å¯è½ä¼çå°è¿æ¡æ¶æ¯ã
-consolebase.warnMsg07 = <p style='font-size:120%;'><b>å
³éæå¡å¨å°ä¼ä½¿Webæ§å¶å°ä¸å¯ç¨ï¼åªæå½ä½ ç¡®å®è¦å
³éæå¡å¨æ¶ï¼æ继ç»ã</b></p>
+consolebase.warnMsg07 = å
³éæå¡å¨å°ä¼ä½¿Webæ§å¶å°ä¸å¯ç¨ï¼åªæå½ä½ ç¡®å®è¦å
³éæå¡å¨æ¶ï¼æ继ç»ã
consolebase.warnMsg08 = æªå®ä¹ä»»ä½Web容å¨ã
consolebase.bundlemanager.info.start = Bundle: {0} (id={1}) is successfully started.
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -20,9 +20,7 @@
<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg"%>
<fmt:setBundle basename="consolebase"/>
<portlet:defineObjects/>
-
-<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
-
+
<script>
function uninstallPrompt(target, bundleId, bundleName) {
var msg = '<fmt:message key="configmanager.normal.confirmMsg10"/>: ' + bundleName + '?';
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -21,8 +21,6 @@
<fmt:setBundle basename="consolebase"/>
<portlet:defineObjects/>
-<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
-
<script>
var EXPERT_COOKIE = "org.apache.geronimo.configmanager.expertmode";
var SHOW_DEPENDENCIES_COOKIE = "org.apache.geronimo.configmanager.showDependencies";
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -21,15 +21,8 @@
<fmt:setBundle basename="consolebase" />
<portlet:defineObjects />
-<script language="Javascript" src="/console/ConfirmMsg.js" type="text/javascript"></script>
+<CommonMsg:commonMsg />
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="25%"> </td>
- <td><CommonMsg:commonMsg /></td>
- <td width="25%"> </td>
- </tr>
-</table>
<%-- Removed until a better mechanism for rebooting the server is created
<table width="100%">
<form action="<portlet:actionURL/>">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Sat Jul 30 14:49:45 2011
@@ -58,19 +58,17 @@
<td valign="top">
<%if(request.isUserInRole("admin")){ %>
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+ <table width="100%" class="TableLine">
<tr>
- <td class="DarkBackground" align="left" nowrap>
- <font face="Verdana" size="+1"><fmt:message key="welcome.welcomeNormal.commonActions"/></font>
+ <td class="DarkBackground" nowrap>
+ <fmt:message key="welcome.welcomeNormal.commonActions"/>
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" nowrap>
- <br />
- <img src='/console/images/ico_list_16x16.gif' alt=""/><a href="/console/portal/2-3/Applications/Deployer"><fmt:message key="welcome.welcomeNormal.deployNew"/></a><br />
- <img src='/console/images/ico_servcomp_16x16.gif' alt=""/><a href="/console/portal/1-2/Application Server/Web Server"><fmt:message key="welcome.welcomeNormal.webServerPorts"/></a><br />
- <img src='/console/images/ico_look_16x16.gif' alt=""/><a href="/console/portal/1-1-1/Application Server/System%20Information/Server Information"><fmt:message key="welcome.welcomeNormal.serverInfo"/></a><br />
- <br />
+ <td class="MediumBackground" nowrap>
+ <img src='/console/images/ico_list_16x16.gif' alt=""/> <a href="/console/portal/2-3/Applications/Deployer"><fmt:message key="welcome.welcomeNormal.deployNew"/></a><br />
+ <img src='/console/images/ico_servcomp_16x16.gif' alt=""/> <a href="/console/portal/1-2/Application Server/Web Server"><fmt:message key="welcome.welcomeNormal.webServerPorts"/></a><br />
+ <img src='/console/images/ico_look_16x16.gif' alt=""/> <a href="/console/portal/1-1-1/Application Server/System%20Information/Server Information"><fmt:message key="welcome.welcomeNormal.serverInfo"/></a><br />
</td>
</tr>
</table>
@@ -79,21 +77,19 @@
<br />
<br />
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+ <table width="100%" class="TableLine">
<tr>
- <td class="DarkBackground" align="left" nowrap>
- <font face="Verdana" size="+1"><fmt:message key="welcome.welcomeNormal.online"/></font>
+ <td class="DarkBackground" nowrap>
+ <fmt:message key="welcome.welcomeNormal.online"/>
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" nowrap>
- <br />
- <a href="http://geronimo.apache.org/"><fmt:message key="welcome.welcomeNormal.homePage"/></a><br />
- <a href="http://geronimo.apache.org/redirects/issues.html"><fmt:message key="welcome.welcomeNormal.problemTracker"/></a><br />
- <a href="http://geronimo.apache.org/redirects/userMailingList.html"><fmt:message key="welcome.welcomeNormal.userMaillist"/></a><br />
- <a href="http://geronimo.apache.org/redirects/developerMailingList.html"><fmt:message key="welcome.welcomeNormal.devMaillist"/></a><br />
- <a href="irc://irc.freenode.net/#geronimo"><fmt:message key="welcome.welcomeNormal.irc"/></a><br />
- <br />
+ <td class="MediumBackground" nowrap>
+ - <a href="http://geronimo.apache.org/"><fmt:message key="welcome.welcomeNormal.homePage"/></a><br />
+ - <a href="http://geronimo.apache.org/redirects/issues.html"><fmt:message key="welcome.welcomeNormal.problemTracker"/></a><br />
+ - <a href="http://geronimo.apache.org/redirects/userMailingList.html"><fmt:message key="welcome.welcomeNormal.userMaillist"/></a><br />
+ - <a href="http://geronimo.apache.org/redirects/developerMailingList.html"><fmt:message key="welcome.welcomeNormal.devMaillist"/></a><br />
+ - <a href="irc://irc.freenode.net/#geronimo"><fmt:message key="welcome.welcomeNormal.irc"/></a><br />
</td>
</tr>
</table>
@@ -101,20 +97,18 @@
<br />
<br />
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+ <table width="100%" class="TableLine">
<tr>
- <td class="DarkBackground" align="left" nowrap>
- <font face="Verdana" size="+1"><fmt:message key="welcome.welcomeNormal.doc"/> </font>
+ <td class="DarkBackground" nowrap>
+ <fmt:message key="welcome.welcomeNormal.doc"/>
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" nowrap>
- <br />
- <a href="http://geronimo.apache.org/faq.html"><fmt:message key="welcome.welcomeNormal.faq"/></a><br />
- <a href="http://geronimo.apache.org/redirects/wiki.html"><fmt:message key="welcome.welcomeNormal.wiki"/></a><br />
- <a href="http://geronimo.apache.org/documentation.html"><fmt:message key="welcome.welcomeNormal.doc"/></a><br />
- <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html"><fmt:message key="welcome.welcomeNormal.addiDoc"/></a><br />
- <br />
+ <td class="MediumBackground" nowrap>
+ - <a href="http://geronimo.apache.org/faq.html"><fmt:message key="welcome.welcomeNormal.faq"/></a><br />
+ - <a href="http://geronimo.apache.org/redirects/wiki.html"><fmt:message key="welcome.welcomeNormal.wiki"/></a><br />
+ - <a href="http://geronimo.apache.org/documentation.html"><fmt:message key="welcome.welcomeNormal.doc"/></a><br />
+ - <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html"><fmt:message key="welcome.welcomeNormal.addiDoc"/></a><br />
</td>
</tr>
</table>
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/CommonMessageTag.java Sat Jul 30 14:49:45 2011
@@ -39,7 +39,7 @@ public final class CommonMessageTag exte
List<CommonMessage> messages = (List<CommonMessage>) pageContext.getRequest().getAttribute(COMMON_MESSAGES);
if (null != messages && 0 != messages.size()) {
try {
- out.println("<table align=\"center\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" border=\"0\" summary=\"Inline Messages\" valign=\"top\" class=\"messagePortlet\"><tbody>");
+ out.println("<table cellspacing=\"0\" width=\"100%\" summary=\"Inline Messages\" class=\"messagePortlet\"><tbody>");
for (CommonMessage message : messages) {
out.println(message.renderMessage());
}
Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Sat Jul 30 14:49:45 2011
@@ -102,7 +102,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/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties Sat Jul 30 14:49:45 2011
@@ -18,15 +18,15 @@
console.common.ConsoleLogIn = Geronimo Console Login
console.common.applications = Applications
console.common.login = Login
-console.common.loginToConsole = Log in to the Geronimo Console
+console.common.loginToConsole = Log in to the Administrative Console
console.common.pages = Pages
console.common.password = Password
console.common.username = User Name
console.head.title = Geronimo Console
console.login.components = <strong>Geronimo™</strong> has integrated the following components:<BR/> • Application server (Apache Geronimo)<br/> • Web server and servlet engine (Tomcat)<br/> • Web server and servlet engine (Jetty)<br/> • JSP compiler (Jasper)<br/> • JAX-RPC Web Services engine (Apache Axis)<br/> • JAX-WS Web Services engine (Apache Axis2)<br/> • JAX-WS Web Services engine (Apache CXF)<br/> • Relational database (Apache Derby)<br/> • Messaging (ActiveMQ)<br/> • User management services<br/> • Centralized administration console<br/>
-console.login.introduction = <strong>GERONIMO™</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance.
+console.login.introduction = <strong>Geronimo™</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance.
console.login.requireCookies = Note: To log in to the Geronimo Console, cookies must be enabled in your web browser.
-console.login.welcome = Welcome to the Geronimo™ Console
+console.login.welcome = Welcome to the GERONIMO™ Console
console.login_error.invalid = Invalid User Name and/or Password!
console.login_success.loginSuccessful = Login Successful
console.login_success.returnToPortalTests = Click here to return to the portal tests.
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_ja.properties?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_ja.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_ja.properties Sat Jul 30 14:49:45 2011
@@ -25,9 +25,9 @@ console.common.password
console.common.username = ã¦ã¼ã¶ã¼å
console.head.title = Geronimo ã³ã³ã½ã¼ã«
console.login.components = <strong>Geronimo™</strong> ã¯ä»¥ä¸ã®ã³ã³ãã¼ãã³ããçµ±åãã¦ãã¾ã:<BR/> • ã¢ããªã±ã¼ã·ã§ã³ã»ãµã¼ãã¼ (Apache Geronimo)<br/> • Web ãµã¼ãã¼ã¨ãµã¼ãã¬ããã»ã¨ã³ã¸ã³ (Tomcat)<br/> • Web ãµã¼ãã¼ã¨ãµã¼ãã¬ããã»ã¨ã³ã¸ã³ (Jetty)<br/> • JSP ã³ã³ãã¤ã©ã¼ (Jasper)<br/> • JAX-RPC Web ãµã¼ãã¹ã»ã¨ã³ã¸ã³ (Apache Axis)<br/> • JAX-WS Web ãµã¼ãã¹ã»ã¨ã³ã¸ã³ (Apache Axis2)<br/> • JAX-WS Web ãµã¼ãã¹ã»ã¨ã³ã�
�ã³ (Apache CXF)<br/> • ãªã¬ã¼ã·ã§ãã«ã»ãã¼ã¿ãã¼ã¹ (Apache Derby)<br/> • ã¡ãã»ã¼ã¸ã³ã° (ActiveMQ)<br/> • ã¦ã¼ã¶ã¼ç®¡çãµã¼ãã¹<br/> • éä¸åããã管çã³ã³ã½ã¼ã«<br/>
-console.login.introduction = <strong>GERONIMO™</strong> 㯠Java èªå®ã®åç¨è£½åã¯ã©ã¹ã®ãã©ãããã©ã¼ã ã§ãéçºè
ã¯ã¢ããªã±ã¼ã·ã§ã³ãç´ æ©ããããã¤ãã管çãããã¨ãã§ãã¾ãããã®ææã¯ããªã¼ãã³ã½ã¼ã¹ã»ã³ãã¥ããã£ã¼ã®é©æ°çãªææ°æè¡ãæ´»ç¨ããçµ±åçã§é«æ©è½ãªã¢ããªã±ã¼ã·ã§ã³ã»ãã©ãããã©ã¼ã ã§ãããã¢ããªã±ã¼ã·ã§ã³ã®ãããã¤ã管çãç°¡åã«è¡ãã¾ãã
+console.login.introduction = <strong>Geronimo™</strong> 㯠Java èªå®ã®åç¨è£½åã¯ã©ã¹ã®ãã©ãããã©ã¼ã ã§ãéçºè
ã¯ã¢ããªã±ã¼ã·ã§ã³ãç´ æ©ããããã¤ãã管çãããã¨ãã§ãã¾ãããã®ææã¯ããªã¼ãã³ã½ã¼ã¹ã»ã³ãã¥ããã£ã¼ã®é©æ°çãªææ°æè¡ãæ´»ç¨ããçµ±åçã§é«æ©è½ãªã¢ããªã±ã¼ã·ã§ã³ã»ãã©ãããã©ã¼ã ã§ãããã¢ããªã±ã¼ã·ã§ã³ã®ãããã¤ã管çãç°¡åã«è¡ãã¾ãã
console.login.requireCookies = 注æ: Geronimo ã³ã³ã½ã¼ã«ã¸ãã°ã¤ã³ããã«ã¯ããã©ã¦ã¶ã¼ã® Cookie ãæå¹ã«ããå¿
è¦ãããã¾ãã
-console.login.welcome = Geronimo™ ã³ã³ã½ã¼ã«ã¸ãããã
+console.login.welcome = GERONIMO™ ã³ã³ã½ã¼ã«ã¸ãããã
console.login_error.invalid = ã¦ã¼ã¶ã¼åã¾ãã¯ãã¹ã¯ã¼ãã«èª¤ããããã¾ã!
console.login_success.loginSuccessful = ãã°ã¤ã³æå
console.login_success.returnToPortalTests = ãããã¯ãªãã¯ããã¨ãã¼ã¿ã«ã»ãã¹ãã¸æ»ãã¾ãã
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_zh.properties Sat Jul 30 14:49:45 2011
@@ -18,15 +18,15 @@
console.common.ConsoleLogIn = Geronimoæ§å¶å°ç»å½
console.common.applications = åºç¨
console.common.login = ç»å½
-console.common.loginToConsole = ç»å½Geronimoæ§å¶å°
+console.common.loginToConsole = ç»å½å°ç®¡çæ§å¶å°
console.common.pages = 页é¢
console.common.password = å¯ç
console.common.username = ç¨æ·å
console.head.title = Geronimoæ§å¶å°
console.login.components = <strong>Geronimo™</strong> éæäºå¦ä¸ç»ä»¶:<BR/> • åºç¨æå¡å¨ (Apache Geronimo)<br/> • Webæå¡å¨åservletå¼æ (Tomcat)<br/> • Webæå¡å¨åservletå¼æ (Jetty)<br/> • JSPç¼è¯å¨ (Jasper)<br/> • JAX-RPC Webæå¡å¼æ (Apache Axis)<br/> • JAX-WS Webæå¡å¼æ (Apache Axis2)<br/> • JAX-WS Webæå¡å¼æ (Apache CXF)<br/> • å
³ç³»æ°æ®åº (Apache Derby)<br/> • æ¶æ¯ä¸é´ä»¶ (ActiveMQ)<br/> • ç¨æ·ç®¡çæå¡<br/> • éä¸å¼ç管çæ§å¶å°<br/>
-console.login.introduction = <strong>GERONIMO™</strong>æ¯ä¸ä¸ªéè¿äºJava认è¯çãç产级çå¹³å°ãå
¶åè¡·æ¯ä¸ºäºè®©å¼åè
è½å¤å¿«éé¨ç½²å管çå
¶åºç¨ï¼ç»æ便è¯çäºä¸ä¸ªå®æ´å¹¶ä¸åè½å¼ºå¤§çåºç¨å¹³å°ãå®å©ç¨äºå¼æºç¤¾çææ°åæ°ä¸ç®åäºåºç¨çé¨ç½²åç»´æ¤ã
+console.login.introduction = <strong>Geronimo™</strong>æ¯ä¸ä¸ªéè¿äºJava认è¯çãç产级çå¹³å°ãå
¶åè¡·æ¯ä¸ºäºè®©å¼åè
è½å¤å¿«éé¨ç½²å管çå
¶åºç¨ï¼ç»æ便è¯çäºä¸ä¸ªå®æ´å¹¶ä¸åè½å¼ºå¤§çåºç¨å¹³å°ãå®å©ç¨äºå¼æºç¤¾çææ°åæ°ä¸ç®åäºåºç¨çé¨ç½²åç»´æ¤ã
console.login.requireCookies = 注æï¼éè¦æ¿æ´»æµè§å¨çCookieåè½ï¼æè½ç»å½å°Geronimoæ§å¶å°ã
-console.login.welcome = 欢è¿ä½¿ç¨Geronimo™ç®¡çæ§å¶å°
+console.login.welcome = 欢è¿ä½¿ç¨GERONIMO™ç®¡çæ§å¶å°
console.login_error.invalid = æ æçç¨æ·åæå¯ç ï¼
console.login_success.loginSuccessful = ç»å½æå
console.login_success.returnToPortalTests = ç¹å»è¿éè¿åå°portalæµè¯é¡µé¢ã
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/navigation/NavigationJsonGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/navigation/NavigationJsonGenerator.java?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/navigation/NavigationJsonGenerator.java (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/navigation/NavigationJsonGenerator.java Sat Jul 30 14:49:45 2011
@@ -193,9 +193,10 @@ public class NavigationJsonGenerator {
if (!node.isLeafNode()) {
sb.append("label: \'" + getLocalizedString(node.getLabel()) + "\'");
} else {
- sb.append("label: \'<img src=\"" + contextPath + node.getIcon() + "\" alt=\"\" border=\"0\"> ");
- sb.append("<a href=\"" + contextPath + "/portal/" + node.getId() + "/" + node.getPath() + "\">"
- + getLocalizedString(node.getLabel()) + "</a>\'");
+ sb.append("label: \'<img src=\"" + contextPath + node.getIcon() + "\" alt=\"\" border=\"0\"> " + getLocalizedString(node.getLabel()) + "\'");
+
+ sb.append(",");
+ sb.append("href: \'" + contextPath + "/portal/" + node.getId() + "/" + node.getPath() + "\'");
}
sb.append(",");
@@ -224,9 +225,10 @@ public class NavigationJsonGenerator {
sb.append("{");
if (node.isLeafNode()) {
- sb.append("label: \'<img src=\"" + contextPath + node.getIcon() + "\" alt=\"\" border=\"0\"> ");
- sb.append("<a href=\"" + contextPath + "/portal/" + node.getId() + "/" + node.getPath() + "\">"
- + getLocalizedString(node.getLabel()) + "</a>\'");
+ sb.append("label: \'<img src=\"" + contextPath + node.getIcon() + "\" alt=\"\" border=\"0\"> " + getLocalizedString(node.getLabel()) + "\'");
+
+ sb.append(",");
+ sb.append("href: \'" + contextPath + "/portal/" + node.getId() + "/" + node.getPath() + "\'");
}
sb.append(",");
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.css Sat Jul 30 14:49:45 2011
@@ -15,10 +15,11 @@
* limitations under the License.
======================================================================*/
.messagePortlet {
- background-color:#F7F7F7;
- border:1px solid #88A4D7;
+ background-color:#f3f3f3;
+ border:1px dashed #333333;
+ padding: 3px;
font-family:Verdana,Helvetica,sans-serif;
- font-size:75%;
+ font-size:12px;
}
.expand-task {
color:#000000;
Copied: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/GlobalUtils.js (from r1151321, 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/GlobalUtils.js?p2=geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/GlobalUtils.js&p1=geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js&r1=1151321&r2=1152478&rev=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/ConfirmMsg.js (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/GlobalUtils.js Sat Jul 30 14:49:45 2011
@@ -15,9 +15,21 @@
// limitations under the License.
//======================================================================
function showGlobalConfirmMessage(msg){
- if (parent){
+ if (window.parent!=window.self){
return parent.globalConfirm(msg);
}else{
return confirm(msg);
}
}
+
+function showGlobalStatus(txt){
+ if (window.parent!=window.self) {
+ parent.showStatus(txt);
+ }
+}
+
+function hideGlobalStatus(){
+ if (window.parent!=window.self) {
+ setTimeout("parent.hideStatus()", 300);
+ }
+}
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -17,14 +17,14 @@ implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<table width="100%" height="86" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td height="86" class="Logo" border="0"></td>
- <td height="86" class="Top" border="0"> </td>
- <td height="86" class="Top" border="0" width="40">
+ <td class="Logo"> </td>
+ <td class="Top"> </td>
+ <td class="Top" width="40">
<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>
+ <td class="Top" 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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -31,6 +31,7 @@ limitations under the License.
<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/dojo/resources/dojo.css" type="text/css"/>
<link rel="stylesheet" href="/console/dojo/dijit/themes/claro/claro.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"/>
@@ -39,14 +40,13 @@ limitations under the License.
<script language="Javascript" src="<%=request.getContextPath()%>/CommonMsg.js" type="text/javascript"></script>
</head>
<style type="text/css">
-body{
- padding:0;
- margin:0;
-}
+html {
+ height: 100%;
+}
</style>
<c:choose>
<c:when test="${param.noxssShowTree!=null}">
- <jsp:include page="portlets-with-tree.jsp" />
+ <jsp:include page="portlets-with-tree.jsp" />
</c:when>
<c:otherwise>
<jsp:include page="portlets-only.jsp" />
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=1152478&r1=1152477&r2=1152478&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp Sat Jul 30 14:49:45 2011
@@ -40,8 +40,7 @@ limitations under the License.
</c:forEach>
<%
-
- List<PageConfig> filteredPageConfigList = NavigationJsonGenerator.filterPagesByRole(pageConfigList,request);
+ List<PageConfig> filteredPageConfigList = NavigationJsonGenerator.filterPagesByRole(pageConfigList,request);
NavigationJsonGenerator generator = new NavigationJsonGenerator(request.getLocale());
Map<String, TreeNode> treeBasic = generator.getNavigationTree(filteredPageConfigList, "basic");
@@ -52,51 +51,52 @@ limitations under the License.
Map<String, TreeNode> treeAll = generator.getNavigationTree(filteredPageConfigList, "all");
String treeJson = generator.generateTreeJSON(treeAll, request.getContextPath(), "/images/ico_doc_16x16.gif", "all", 8);
String listJson = generator.generateQuickLauncherJSON(treeAll, request.getContextPath(), "/images/ico_doc_16x16.gif", "all");
-
%>
-<table class="claro" width="260px" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="ReallyDarkBackground"><strong> <fmt:message key="Console Navigation"/></strong></td>
- </tr>
- <tr>
- <td>
- <!-- mode div -->
- <div id="modeSwitcher" class="<%=isBasicTreeHasValidItem?"padding4":"hidden"%>">
- <input type="radio" name="mode" id ="mode" checked="checked" onclick="changeMode()"/><fmt:bundle basename="portaldriver"><fmt:message key="console.mode.basic"/></fmt:bundle>
-
- <input type="radio" name="mode" id ="mode" onclick="changeMode()"/><fmt:bundle basename="portaldriver"><fmt:message key="console.mode.advanced"/></fmt:bundle>
- </div>
-
-
- <!-- quick launcher div -->
- <div id="tquickLauncher" class="padding4" style="display:none;">
- <input id="quickLauncher">
- </div>
-
+<!-- panel div -->
+<div id="panelDiv">
+ <div style="height:10px"></div>
+
+ <!-- quick launcher div -->
+ <div id="quickLauncherDiv">
+ <strong> Quick Launch:</strong>
+ <input id="quickLauncher" />
+ </div>
+
+ <div style="height:5px"></div>
+
+ <!-- mode div -->
+ <div id="modeSwitcherDiv" class="<%=isBasicTreeHasValidItem?"":"Hidden"%>">
+ <strong> Navigator:</strong>
+ <input type="radio" name="mode" id="mode" checked="checked" onclick="changeMode()"/> <fmt:bundle basename="portaldriver"><fmt:message key="console.mode.basic"/></fmt:bundle>
+ <input type="radio" name="mode" id="mode" onclick="changeMode()"/> <fmt:bundle basename="portaldriver"><fmt:message key="console.mode.advanced"/></fmt:bundle>
+ </div>
+
+ <div style="height:5px"></div>
+</div>
+
+<!-- tree div -->
+<div id="treeDiv">
+ <div id="navigationTreeBasic"></div>
+ <div id="navigationTreeAdvanced"></div>
+</div>
- <!-- tree div -->
- <div id="navigationTreeBasic"></div>
- <div id="navigationTreeAdvanced"></div>
-
- </td>
- </tr>
-</table>
+
<script language="Javascript" src="<%=request.getContextPath()%>/js/navigation.js" type="text/javascript"></script>
<script language="Javascript">
- dojo.require("dojo.data.ItemFileReadStore");
- dojo.require("dijit.form.FilteringSelect");
- dojo.require("dijit.Tree");
- var treeData = <%=treeJson%>;
- var treeDataBasic =<%=treeJsonBasic%>;
- var listData = <%=listJson%>;
- var listDataBasic = <%=listJsonBasic%>;
- var treeModel="";
- var navigationTreeBasic="";
- var navigationTreeAdvanced="";
- var filterSelect="";
+ dojo.require("dojo.data.ItemFileReadStore");
+ dojo.require("dijit.form.FilteringSelect");
+ dojo.require("dijit.Tree");
+ var treeData = <%=treeJson%>;
+ var treeDataBasic =<%=treeJsonBasic%>;
+ var listData = <%=listJson%>;
+ var listDataBasic = <%=listJsonBasic%>;
+ var treeModel="";
+ var navigationTreeBasic="";
+ var navigationTreeAdvanced="";
+ var filterSelect="";
- var treeStore = new dojo.data.ItemFileReadStore
+ var treeStore = new dojo.data.ItemFileReadStore
({
data: {
identifier: 'id',
@@ -104,14 +104,14 @@ limitations under the License.
items: treeData
}
});
- var treeStoreBasic = new dojo.data.ItemFileReadStore
+ var treeStoreBasic = new dojo.data.ItemFileReadStore
({
data: {
identifier: 'id',
label: 'label',
items: treeDataBasic
}
- });
+ });
var listStore = new dojo.data.ItemFileReadStore({
data: {
identifier: 'name',
@@ -125,15 +125,37 @@ limitations under the License.
label: 'label',
items: listDataBasic
}
- });
+ });
- <% if(isBasicTreeHasValidItem) {%>
+ <% if(isBasicTreeHasValidItem) {%>
- dojo.addOnLoad(function() { createNavigationTree(treeStoreBasic,listStoreBasic,"basic"); });
+ dojo.addOnLoad(function() { createNavigationTree(treeStoreBasic,listStoreBasic,"basic"); });
- <%} else {%>
+ <%} else {%>
- dojo.addOnLoad(function() { createNavigationTree(treeStore,listStore,"advanced"); });
+ dojo.addOnLoad(function() { createNavigationTree(treeStore,listStore,"advanced"); });
- <% }%>
+ <%}%>
+
+
+ if(dijit.byId("quickLauncher")!=null){
+ dijit.byId("quickLauncher").store=listStore;
+ }else{
+ filterSelect = new dijit.form.FilteringSelect(
+ {
+ store: listStore,
+ searchAttr: "name",
+ labelAttr: "label",
+ labelType: "html",
+ onKeyPress: function(event){
+ if(event.charCode!=dojo.keys.ENTER) return;
+ quickLaunchPortlets(this.value);
+ },
+ onChange: function(event){
+ quickLaunchPortlets(this.value);
+ }
+ },
+ dojo.byId("quickLauncher")
+ );
+ }
</script>
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -25,28 +25,24 @@ limitations under the License.
<!-- Use pluto portlet tag to render the portlet -->
<pluto:portlet portletId="${portlet}">
- <!-- Assemble the rendering result -->
- <table cellspacing="0" cellpadding="0" width="100%" class="portlet" id='<c:out value="${portlet}"/>'>
- <tr>
- <td class="header">
- <!-- Portlet Mode Controls -->
- <pluto:modeAnchor portletMode="view"/>
- <pluto:modeAnchor portletMode="edit"/>
- <pluto:modeAnchor portletMode="help"/>
- <!-- Window State Controls -->
- <a href="<pluto:url windowState="minimized"/>"><span class="minimized"></span></a>
- <a href="<pluto:url windowState="maximized"/>"><span class="maximized"></span></a>
- <a href="<pluto:url windowState="normal"/>"><span class="normal"></span></a>
- <!-- Portlet Title -->
- <h2><fmt:message key="<%=(String)request.getAttribute( org.apache.pluto.driver.AttributeKeys.PORTLET_TITLE )%>"/></h2>
- </td>
- </tr>
- <tr>
- <td class="body">
- <pluto:render/>
- </td>
- </tr>
- </table>
+ <!-- Assemble the rendering result -->
+ <div class="portlet" id='<c:out value="${portlet}"/>'>
+ <div class="title">
+ <!-- Portlet Mode Controls -->
+ <pluto:modeAnchor portletMode="view"/>
+ <pluto:modeAnchor portletMode="edit"/>
+ <pluto:modeAnchor portletMode="help"/>
+ <!-- Window State Controls -->
+ <a href="<pluto:url windowState="minimized"/>"><span class="minimized"></span></a>
+ <a href="<pluto:url windowState="maximized"/>"><span class="maximized"></span></a>
+ <a href="<pluto:url windowState="normal"/>"><span class="normal"></span></a>
+ <!-- Portlet Title -->
+ <h2><fmt:message key="<%=(String)request.getAttribute( org.apache.pluto.driver.AttributeKeys.PORTLET_TITLE )%>"/></h2>
+ </div>
+ <div class="body">
+ <pluto:render/>
+ </div>
+ </div>
</pluto:portlet>
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -18,15 +18,47 @@ limitations under the License.
--%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<style type="text/css">
+body {
+ margin:0;
+ padding:10px;
+ overflow-x:hidden;
+ overflow-y:scroll;
+}
+</style>
+
+<%-- Transparent Line Definition : Start --%>
+<style type="text/css">
+#transparentLine{
+ background: url("/console/images/transparent_line.png") repeat-x;
+ position:fixed;
+ z-index:999;
+ width: 100%;
+ height: 9px;
+ top: 0;
+ left: 0;
+}
+</style>
+<div id="transparentLine"></div>
+<%-- Transparent Line Definition : End --%>
+
+<script language="Javascript" src="/console/GlobalUtils.js" type="text/javascript"></script>
+
<body id="portlets">
-<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>
+<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>
+
+</body>
+
+<script language="Javascript">
+ // we show the "Loading..." status in navigation.js
+ hideGlobalStatus();
+</script>
<script type="text/javascript">
if(parent){
@@ -34,6 +66,4 @@ limitations under the License.
parent.location.hash="#noxssPage=<c:out value="${hashOfCurrentPortalPage}"/>";
<!--window.parent.dojo.hash("#noxssPage=<c:out value='${hashOfCurrentPortalPage}'/>",true);-->
}
-</script>
-</body>
-
+</script>
\ No newline at end of file
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -23,38 +23,21 @@ limitations under the License.
<fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
<%@ page import="org.apache.geronimo.pluto.impl.PageConfig"%>
-<%-- 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;
+body {
+ padding:0;
+ margin:0;
+ height:100%;
+ scroll:no;
+ overflow:hidden;
}
</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>
+<script type="text/javascript">
//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.
@@ -90,62 +73,180 @@ function onHashChange(current_hash) {
//When there's hash in current page url, redirect the page with noxxsPage hash as the query string,
//the server side will get the real redirect target page based on the value of noxxsPage
if(document.location.hash!='') {
- var href = document.location.href;
- var newHref = href.substring(0,href.lastIndexOf("#"));
- if(newHref.indexOf("&noxssPage")>0){
- newHref = newHref.substring(0,href.indexOf("&noxssPage"));
- }
- document.location.href = newHref + "&noxssPage=" +document.location.hash.substr(11,document.location.hash.length);
+ var href = document.location.href;
+ var newHref = href.substring(0,href.lastIndexOf("#"));
+ if(newHref.indexOf("&noxssPage")>0){
+ newHref = newHref.substring(0,href.indexOf("&noxssPage"));
+ }
+ document.location.href = newHref + "&noxssPage=" +document.location.hash.substr(11,document.location.hash.length);
+}
+
+</script>
+
+<%-- 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 --%>
+
+<%-- Loading Message Definition: Start --%>
+<style type="text/css">
+#statusDiv {
+ position:fixed;
+ z-index:999;
+ width:100%;
+ top:0;
+ left:0;
+
+}
+#statusText {
+ -moz-border-radius-bottomleft: 6px;
+ -moz-border-radius-bottomright: 6px;
+ border-bottom-right-radius: 6px;
+ border-bottom-left-radius: 6px;
+ background-color: #FFC129;
+ font-size: 14px;
+ font-weight: bold;
+ text-align: center;
+ width: 100px;
+ padding: 3px;
+ margin-left: auto;
+ margin-right: auto;
+
+}
+</style>
+<div id="statusDiv" style="display:none;filter:alpha(opacity=100);opacity: 1;">
+ <div id="statusText"></div>
+</div>
+<script type="text/javascript">
+ var to;
+ function showStatus(txt){
+ var showTarget = document.getElementById("statusDiv");
+ if (to) {
+ clearTimeout(to);
+ setOpacity(showTarget, 1);
+ }
+ document.getElementById("statusText").innerHTML = txt;
+ showTarget.style.display='block';
+ }
+ function hideStatus(){
+ var hideTarget = document.getElementById("statusDiv");
+ if (hideTarget.style.display=='block'){
+ hideGradually(hideTarget);
+ }
+ }
+ function hideGradually(obj) {
+ var i = getOpacity(obj);
+ i = i - 0.05;
+ if(i<=0){
+ obj.style.display = "none";
+ setOpacity(obj, 1);
+ } else {
+ setOpacity(obj, i);
+ to = setTimeout(function(){hideGradually(obj)}, 50);
+ }
+ }
+ function getOpacity(obj){
+ if (obj.style.opacity) return obj.style.opacity;
+ if (obj.filters) return obj.filters.alpha.Opacity/100; //IE 8 and earlier
+ }
+ function setOpacity(obj, v) {
+ if (obj.style.opacity) obj.style.opacity = v;
+ if (obj.filters) obj.filters.alpha.Opacity = v*100; //IE 8 and earlier
+ }
+
+</script>
+<%-- Loading Message Definition: End --%>
+<%-- Calculate Size Definition: Start --%>
+<script type="text/javascript">
+ function getCombinedStyle(obj,attribute){
+ // IE 8 and earlier using obj.currentStyle
+ return obj.currentStyle?obj.currentStyle[attribute]:document.defaultView.getComputedStyle(obj,false)[attribute];
+ }
+ function px2num(px){
+ return Number(px.replace(/[p|P][x|X]/g,""));
+ }
+ // the init height and width values are in pluto.css
+ function calculateSize(){
+ try{
+ var header = document.getElementById("headerDiv");
+
+ var navigation = document.getElementById("navigationDiv");
+ var panel = document.getElementById("panelDiv");
+ var tree = document.getElementById("treeDiv");
+
+ var content = document.getElementById("contentDiv");
+
+ var contentHeight = Number(document.body.clientHeight) - px2num(getCombinedStyle(header,"height"));
+ var contentWidth = Number(document.body.clientWidth) - px2num(getCombinedStyle(navigation,"width"));
+ var treeHeight = contentHeight - px2num(getCombinedStyle(panel,"height"));
+
+ navigation.style.height = contentHeight+ "px";
+ tree.style.height = treeHeight+ "px";
+ content.style.height = contentHeight+ "px";
+ content.style.width = contentWidth+ "px";
+
+ }catch (ex){
+ window.status = ex.message;
+ }
+ }
+ window.onresize=calculateSize;
</script>
+<%-- Calculate Size Definition: End --%>
-<!-- start accessibility prolog -->
-<div class="skip"><a href="#left-nav" accesskey="1">Skip to navigation</a></div>
-<div class="skip"><a href="#content" accesskey="2">Skip to main content</a></div>
+<body id="admin-console" onload="calculateSize()">
+
+<%-- start accessibility prolog --%>
+<div class="skip"><a href="#navigationDiv" accesskey="1">Skip to navigation</a></div>
+<div class="skip"><a href="#contentDiv" accesskey="2">Skip to main content</a></div>
<div id="access-info">
- <p class="access" >The access keys for this page are:</p>
+ <p class="access">The access keys for this page are:</p>
<ul class="access">
<li>ALT plus 1 skips to navigation.</li>
<li>ALT plus 2 skips to main content.</li>
</ul>
</div>
-<!-- end accessibility prolog -->
+<%-- end accessibility prolog --%>
+
<!-- Header -->
-<jsp:include page="banner.jsp"/>
+<div id="headerDiv">
+ <jsp:include page="banner.jsp"/>
+</div>
-<p style="margin-top:5px;margin-bottom:5px"></p>
+<!-- Navigation -->
+<div id="navigationDiv" class="claro">
+ <jsp:include page="navigation.jsp"/>
+</div>
-<!-- Body -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <!-- Spacer -->
- <td class="Gutter"> </td>
-
- <!-- Navigation Column -->
- <td width="260px" class="Selection" valign="top">
- <div id="left-nav">
- <!-- Include Navigation.jsp here -->
- <jsp:include page="navigation.jsp"/>
- </div>
- </td>
-
- <!-- Spacer -->
- <td class="Gutter"> </td>
-
- <!-- Portlet Section -->
- <td valign="top">
- <iframe src="" id="portletsFrame" width="100%" height="100%" scrolling="no" frameborder="0">
- </iframe>
- </td>
-
- <!-- Spacer -->
- <td class="Gutter"> </td>
- </tr>
-</table>
+<!-- Content -->
+<div id="contentDiv">
+ <iframe src="" id="portletsFrame" name="portletsFrame" width="100%" height="100%" scrolling="yes" style="overflow-x:hidden;overflow-y:scroll" frameborder="0">
+ </iframe>
+</div>
</body>
+
<script type="text/javascript">
<%
PageConfig pc=(PageConfig)request.getAttribute("currentPage");
@@ -155,42 +256,4 @@ if(document.location.hash!='') {
var pageName = "<fmt:message key="<%=pageName%>"/>";
quickLaunchPortlets(pageName);
</script>
-<script type="text/javascript">
-
-function autoResizeIframe(){
- // reset the height of index page each time the new portlet is loaded
- document.body.height = 400;
-
- try{
- var iframe = document.getElementById("portletsFrame");
- var iframeDocument = iframe.contentWindow.document;
-
- var toHeight;
- toHeight = (iframeDocument.height) ? iframeDocument.height : iframeDocument.body.scrollHeight;
-
- iframe.height = toHeight;
-
- }catch (ex){
- window.status = ex.message;
- }
-
-
-}
-
-function autoCheckIframe(){
- var iFrameDocument=document.getElementById("portletsFrame").contentWindow.document;
- var LoginForm=iFrameDocument.getElementsByName('login');
- if(LoginForm.length!=0){
- window.location.reload();
- }
-}
-
-//Ensure the iframe height could be adjusted according to the content
-setInterval('autoResizeIframe()',500);
-
-//Ensure login page is not displayed in the iframe after the timeout
-setInterval('autoCheckIframe()',500);
-
-
-</script>
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_shutdown_16x16.gif
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_shutdown_16x16.gif?rev=1152478&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_shutdown_16x16.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/transparent_line.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/transparent_line.png?rev=1152478&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/transparent_line.png
------------------------------------------------------------------------------
svn:mime-type = image/png
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=1152478&r1=1152477&r2=1152478&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 Sat Jul 30 14:49:45 2011
@@ -16,91 +16,62 @@
//======================================================================
// $Rev: 753156 $ $Date: 2009-03-13 16:21:04 +0800 (Fri, 13 Mar 2009) $
- function createNavigationTree(treeStore1,listStore1,showMode) {
- treeModel = new dijit.tree.ForestStoreModel({
- store: treeStore1
- });
- if(showMode=="basic"){
- dojo.byId("navigationTreeAdvanced").style.display="none";
- dojo.byId("navigationTreeBasic").style.display="block";
- if(dijit.byId("navigationTreeBasic")==null){
- navigationTreeBasic = new dijit.Tree(
- { model: treeModel,
- showRoot: false,
- openOnClick: true,
- autoExpand: true,
- onClick: function(treeNodeItem,treeNode) {
-
- var anchorNode=treeNode.labelNode.childNodes[2];
-
- if(anchorNode)
- {
- displayPortlets(anchorNode.href,"navigationTreeBasic");
- }
- },
- _createTreeNode: function(args) {
- var tnode = new dijit._TreeNode(args);
- tnode.labelNode.innerHTML = args.label;
- return tnode;
- }
- },
- dojo.byId("navigationTreeBasic")
- );
- }
- }else{
- dojo.byId("navigationTreeBasic").style.display="none";
- dojo.byId("navigationTreeAdvanced").style.display="block";
- if(dijit.byId("navigationTreeAdvanced")==null){
- navigationTreeAdvanced = new dijit.Tree(
- { model: treeModel,
- showRoot: false,
- openOnClick: true,
- autoExpand: false,
- onClick: function(treeNodeItem,treeNode) {
- var anchorNode=treeNode.labelNode.childNodes[2];
- if(anchorNode){
- displayPortlets(anchorNode.href,"navigationTreeAdvanced");
- }
- },
- _createTreeNode: function(args) {
- var tnode = new dijit._TreeNode(args);
- tnode.labelNode.innerHTML = args.label;
- return tnode;
- }
- },
- dojo.byId("navigationTreeAdvanced")
- );
+ function createNavigationTree(treeStore1,listStore1,showMode) {
+ treeModel = new dijit.tree.ForestStoreModel({store: treeStore1});
+ if(showMode=="basic"){
+ dojo.byId("navigationTreeAdvanced").style.display="none";
+ dojo.byId("navigationTreeBasic").style.display="block";
+ if(dijit.byId("navigationTreeBasic")==null){
+ navigationTreeBasic = new dijit.Tree(
+ {
+ model: treeModel,
+ showRoot: false,
+ openOnClick: true,
+ autoExpand: true,
+ onClick: function(treeNodeItem,treeNode) {
+ //var anchorNode=treeNode.labelNode.childNodes[2];
+ var iframeHref = treeStore1.getValue(treeNodeItem, "href");
+ if(iframeHref){
+ displayPortlets(iframeHref,"navigationTreeBasic");
+ }
+ },
+ _createTreeNode: function(args) {
+ var tnode = new dijit._TreeNode(args);
+ tnode.labelNode.innerHTML = args.label;
+ return tnode;
+ }
+ },
+ dojo.byId("navigationTreeBasic")
+ );
}
- }
- if(showMode=="basic"){
- dojo.byId("tquickLauncher").style.display="none";
- return;
- }else{
- dojo.byId("tquickLauncher").style.display="block";
- }
- if(dijit.byId("quickLauncher")!=null){
- dijit.byId("quickLauncher").store=listStore1;
- }else{
- filterSelect = new dijit.form.FilteringSelect
- (
- {
- store: listStore1,
- searchAttr: "name",
- promptMessage: "type and press enter to quick launch",
- labelAttr: "label",
- labelType: "html",
- onKeyPress: function(event){
- if(event.charCode!=dojo.keys.ENTER) return;
- quickLaunchPortlets(this.value);
+ }else{
+ dojo.byId("navigationTreeBasic").style.display="none";
+ dojo.byId("navigationTreeAdvanced").style.display="block";
+ if(dijit.byId("navigationTreeAdvanced")==null){
+ navigationTreeAdvanced = new dijit.Tree(
+ {
+ model: treeModel,
+ showRoot: false,
+ openOnClick: true,
+ autoExpand: false,
+ onClick: function(treeNodeItem,treeNode) {
+ //var anchorNode=treeNode.labelNode.childNodes[2];
+ var iframeHref = treeStore1.getValue(treeNodeItem, "href");
+ if(iframeHref){
+ displayPortlets(iframeHref,"navigationTreeAdvanced");
+ }
+ },
+ _createTreeNode: function(args) {
+ var tnode = new dijit._TreeNode(args);
+ tnode.labelNode.innerHTML = args.label;
+ return tnode;
+ }
},
- onChange: function(event){
- quickLaunchPortlets(this.value);
- }
- },
- dojo.byId("quickLauncher")
- );
+ dojo.byId("navigationTreeAdvanced")
+ );
}
- }
+ }
+ }
function quickLaunchPortlets(portalPageName,navigationTree){
listStore.fetchItemByIdentity({identity:portalPageName,
@@ -115,58 +86,39 @@
}
function displayPortlets(iframeHref){
-
- //var iframeHref = anchor.href;
-
+ showStatus("Loading...");
if(document.location.href.indexOf(iframeHref)==0){
iframeHref=document.location.href.substring(0,document.location.href.indexOf("?"));
}
-
dojo.io.iframe.setSrc(document.getElementById("portletsFrame"), iframeHref+"?formId="+formID, true);
-
- try {
- //reset the height of iframe page each time the new portlet is loaded
- var iframe = document.getElementById("portletsFrame");
- iframe.height = 400;
- }catch(err){
- window.status = err.message;
- }
-
- setTimeout('returnToTop()', 30);
- }
-
- function returnToTop(){
- window.scrollTo(0,0);
- return false;
- }
+
+ }
+
function changeMode(){
var rmode=document.getElementsByName("mode");
if(rmode[0].checked){
- createNavigationTree(treeStoreBasic,listStoreBasic,"basic");
- return;
+ createNavigationTree(treeStoreBasic,listStoreBasic,"basic");
+ return;
}else{
createNavigationTree(treeStore,listStore,"advanced");
return;
}
}
- //scripts to expand and select tree node automatically when open menu item from quick launcher
+ //scripts to expand and select tree node automatically when open menu item from quick launcher
-function findAndSelect(key,navigationTree)
- {
+ function findAndSelect(key,navigationTree){
rootNode=dijit.byId(navigationTree).rootNode
var pathToExpandItems = [];
- if(findRecur(rootNode.item.children, key, pathToExpandItems))
- {
+ if(findRecur(rootNode.item.children, key, pathToExpandItems)){
select(pathToExpandItems,navigationTree);
}
}
-function findRecur(items, key, pathToExpandItems)
- {
+ function findRecur(items, key, pathToExpandItems) {
for (var child = 0; child < items.length; child++) {
pathToExpandItems.push(items[child]);
@@ -181,37 +133,33 @@ function findRecur(items, key, pathToExp
return false;
}
-function select(pathToExpandItems,navigationTree)
- {
-
- var navigationTree=dijit.byId(navigationTree);
+ function select(pathToExpandItems,navigationTree){
+ var navigationTree=dijit.byId(navigationTree);
var i;
- function expandParent(node)
- {
- if(node && !node.isExpanded)
- {
+ function expandParent(node) {
+ if(node && !node.isExpanded) {
expandParent(node.getParent());
navigationTree._expandNode(node);
}
}
//make sure the ancestor node expanded before
- var firstNode = getTreeNode(navigationTree,pathToExpandItems[0],treeStore);
- expandParent(firstNode.getParent());
+ var firstNode = getTreeNode(navigationTree,pathToExpandItems[0],treeStore);
+ expandParent(firstNode.getParent());
for (i = 0;;i++) {
node = getTreeNode(navigationTree,pathToExpandItems[i],treeStore);
- if(i < pathToExpandItems.length-1)
+ if(i < pathToExpandItems.length-1) {
navigationTree._expandNode(node);
- else
- {
+ } else {
navigationTree.focusNode(node);
return node;
}
}
}
- function getTreeNode(tree,item,treeStore){
-
+ function getTreeNode(tree,item,treeStore){
var wrapperNode =tree._itemNodesMap[treeStore.getIdentity(item)];
return wrapperNode[0];
- }
+ }
+
+