Author: smilek Date: Sat Dec 8 01:31:59 2007 New Revision: 602387 URL: http://svn.apache.org/viewvc?rev=602387&view=rev Log: The following revision comments are from branches/JETSPEED-2.1.3 revisions which were not individually checked-in to trunk === ---------------------------------------------------------------- === [ from branches/JETSPEED-2.1.3 r588409 ] | smilek | 2007-10-25 18:00:53 -0600 (Thu, 25 Oct 2007) | 1 line
changes for loading indicator content === ---------------------------------------------------------------- === [ from branches/JETSPEED-2.1.3 r578921 ] | smilek | 2007-09-24 13:18:23 -0600 (Mon, 24 Sep 2007) | 1 line desktop overhaul === ---------------------------------------------------------------- === Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/desktop.vm Modified: portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/desktop.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/desktop.vm?rev=602387&r1=602386&r2=602387&view=diff ============================================================================== --- portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/desktop.vm (original) +++ portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/decorations/layout/blueocean/desktop.vm Sat Dec 8 01:31:59 2007 @@ -24,12 +24,6 @@ #desktopIncludeHeaderContent() -<script language="JavaScript" type="text/javascript"> - function notifyRetrieveAllMenusFinished() - { - } - dojo.event.connect( jetspeed, "notifyRetrieveAllMenusFinished", "notifyRetrieveAllMenusFinished" ); -</script> </head> <body class="layout-${jetspeedDesktop.getLayoutDecorationName()}"> @@ -75,6 +69,7 @@ <img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" /> </p> <!-- page level loading indicator (associated with layout decoration resource: desktop.action.loadpage) --> +<!-- js-showloading-img is controlled by desktop.loading.img* properties, but src still needs to be set in content due to IE quirks --> <div id="js-showloading" class="js-showloading" style="display: none"> <table cellpadding="0" cellspacing="0" border="0"> <tbody> @@ -82,8 +77,8 @@ <td class="js-showloading-left"></td> <td class="js-showloading-middle"> <div> - <div class="js-showloading-content" id="js-showloading-content">Loading ...</div> - <div class="js-showloading-animation"><img src="$jetspeedDesktop.getLayoutBaseUrl('images/desktop/loading/loaddots.gif')" border="0" /></div> + <div class="js-showloading-content" id="js-showloading-content">Loading…</div> + <div class="js-showloading-imgcontainer"><img id="js-showloading-img" src="$jetspeedDesktop.getLayoutBaseUrl('images/desktop/loading/loaddots.gif')" border="0" /></div> </div> </td> <td class="js-showloading-right"></td> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]