You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2007/06/15 13:12:05 UTC
svn commit: r547624 - in
/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean: ./ css/
images/desktop/loading/ resources/
Author: smilek
Date: Fri Jun 15 04:12:04 2007
New Revision: 547624
URL: http://svn.apache.org/viewvc?view=rev&rev=547624
Log:
Changes to address the following JIRA issues:
JS2-733 - Desktop: non-movable portlets are deletable
JS2-700 - Display loading in progress message from desktop
JS2-699 - When going back from view mode to edit mode, icon is not always updated on desktop
JS2-695 - The Desktop does NOT support the no-action layouts
JS2-694 - actionResponse.sendRedirect("some psml page.psml") fails on the desktop
Added:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loaddots.gif (with props)
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadleft.gif (with props)
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadmiddle.gif (with props)
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadright.gif (with props)
Removed:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_left.png
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_middle.png
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loading_right.png
Modified:
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm
portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css?view=diff&rev=547624&r1=547623&r2=547624
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/css/desktop.css Fri Jun 15 04:12:04 2007
@@ -77,14 +77,14 @@
height: 50px;
}
.js-showloading-left {
- background-image: url(../images/desktop/loading/loading_left.png);
+ background-image: url(../images/desktop/loading/loadleft.gif);
background-repeat: no-repeat;
background-position: 0 0;
width: 5px;
height: 50px;
}
.js-showloading-middle {
- background-image: url(../images/desktop/loading/loading_middle.png);
+ background-image: url(../images/desktop/loading/loadmiddle.gif);
background-repeat: repeat-x;
background-position: 0 0;
height: 50px;
@@ -93,7 +93,7 @@
font-weight: bold;
}
.js-showloading-right {
- background-image: url(../images/desktop/loading/loading_right.png);
+ background-image: url(../images/desktop/loading/loadright.gif);
background-repeat: no-repeat;
background-position: 0 0;
width: 5px;
@@ -101,6 +101,11 @@
}
.js-showloading-content {
padding: 0 25px;
+ font-size: small;
+}
+
+.js-showloading-animation {
+ padding-top: 4px;
}
/* end layout decorator blueocean embellishments */
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp?view=diff&rev=547624&r1=547623&r2=547624
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.jsp Fri Jun 15 04:12:04 2007
@@ -89,18 +89,22 @@
<p>
<img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
</p>
-<!-- uncomment for page level loading indicator (associated with layout decoration resource: desktop.action.loadpage)
-<div id="js-showloading" style="display: none">
- <table class="js-showloading">
- <tr>
- <td class="js-showloading-left"> </td>
- <td class="js-showloading-middle">
- <div class="js-showloading-content" id="js-showloading-content"><loading> ...</div>
- </td>
- <td class="js-showloading-right"> </td>
- </tr>
+<!-- page level loading indicator (associated with layout decoration resource: desktop.action.loadpage) -->
+<div id="js-showloading" class="js-showloading" style="display: none">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <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='<%= desktop.getLayoutBaseUrl("images/desktop/loading/loaddots.gif") %>' border="0"/></div>
+ </div>
+ </td>
+ <td class="js-showloading-right"></td>
+ </tr>
+ </tbody>
</table>
</div>
--->
</body>
</html>
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm?view=diff&rev=547624&r1=547623&r2=547624
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/desktop.vm Fri Jun 15 04:12:04 2007
@@ -75,18 +75,22 @@
<p>
<img src="$jetspeedDesktop.getLayoutBaseUrl('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
</p>
-<!-- uncomment for page level loading indicator (associated with layout decoration resource: desktop.action.loadpage)
-<div id="js-showloading" style="display: none">
- <table class="js-showloading">
- <tr>
- <td class="js-showloading-left"> </td>
- <td class="js-showloading-middle">
- <div class="js-showloading-content" id="js-showloading-content"><Loading> ...</div>
- </td>
- <td class="js-showloading-right"> </td>
- </tr>
+<!-- page level loading indicator (associated with layout decoration resource: desktop.action.loadpage) -->
+<div id="js-showloading" class="js-showloading" style="display: none">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <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>
+ </td>
+ <td class="js-showloading-right"></td>
+ </tr>
+ </tbody>
</table>
</div>
--->
</body>
</html>
Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loaddots.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loaddots.gif?view=auto&rev=547624
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loaddots.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadleft.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadleft.gif?view=auto&rev=547624
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadleft.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadmiddle.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadmiddle.gif?view=auto&rev=547624
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadmiddle.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadright.gif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadright.gif?view=auto&rev=547624
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/images/desktop/loading/loadright.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties?view=diff&rev=547624&r1=547623&r2=547624
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/decorations/layout/blueocean/resources/Messages.properties Fri Jun 15 04:12:04 2007
@@ -33,5 +33,8 @@
desktop.action.addportlet=Add Portlet
desktop.action.editpage=Edit Page
-# if not defined, HTMLNode id="js-showloading" will not get its inner element text changed during ajax calls
-desktop.action.loadpage=Loading ...
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during ajax calls
+desktop.action.loadpage=
+
+# if empty string, HTMLNode id="js-showloading" will not get its inner element text changed during loading of customizer
+desktop.action.loadpageeditor=Loading Page Editor ...
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org