Author: taylor
Date: Thu Oct 29 04:22:21 2009
New Revision: 830840
URL: http://svn.apache.org/viewvc?rev=830840&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1057
Implement 'One Click Theme Selection' from Toolbox and Spaces Manager
Added support to decorators for localized decorator names (layouts) and icon
properties for UI tooling
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/images/greenearth.png
(with props)
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/images/jetspeed-theme.png
(with props)
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/images/purpleplanet.png
(with props)
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/images/turbo.png
(with props)
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/images/page-themes.png
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/images/themes/
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/decorator.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages_en.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages_en.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/decorator.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/decorator.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages_en.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/decorator.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages_en.properties
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/decorator.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/decorator.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/decorator.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/decorator.properties
Thu Oct 29 04:22:21 2009
@@ -18,6 +18,8 @@
template.macros=-macros
decorates=layout
base.css.class=layout-greenearth
+icon = images/greenearth.png
+compatibility=2.2.1
#: BEGIN comment for JSP
template.type=velocity
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/images/greenearth.png
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/images/greenearth.png?rev=830840&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/images/greenearth.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages.properties
Thu Oct 29 04:22:21 2009
@@ -35,6 +35,9 @@
# if empty string, portlet title bar will not change during ajax calls for
portlet render
desktop.action.labels.loadportletrender=Loading…
+title=Green Earth
+
+
# if empty string, portlet title bar will not change during ajax calls for
portlet action submits
desktop.action.labels.loadportletaction=Updating…
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages_en.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages_en.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages_en.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/resources/Messages_en.properties
Thu Oct 29 04:22:21 2009
@@ -22,3 +22,5 @@
desktop.action.removeportlet=Delete Portlet
desktop.action.addportlet=Add Portlet
desktop.action.editpage=Edit Page
+
+title=Green Earth
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/decorator.properties
Thu Oct 29 04:22:21 2009
@@ -18,6 +18,8 @@
template.macros=-macros
decorates=layout
base.css.class=layout-jetspeed
+icon = images/jetspeed-theme.png
+compatibility=2.2.1
#: BEGIN comment for JSP
template.type=velocity
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/images/jetspeed-theme.png
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/images/jetspeed-theme.png?rev=830840&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/images/jetspeed-theme.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages.properties
Thu Oct 29 04:22:21 2009
@@ -86,3 +86,5 @@
desktop.pageeditor.dialog.labels.cancel=Cancel
desktop.pageeditor.dialog.labels.yes=Yes
desktop.pageeditor.dialog.labels.no=No
+
+title=Jetspeed
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages_en.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages_en.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages_en.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/resources/Messages_en.properties
Thu Oct 29 04:22:21 2009
@@ -22,3 +22,4 @@
desktop.action.removeportlet=Delete Portlet
desktop.action.addportlet=Add Portlet
desktop.action.editpage=Edit Page
+title=Jetspeed
\ No newline at end of file
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/decorator.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/decorator.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/decorator.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/oldstyle/decorator.properties
Thu Oct 29 04:22:21 2009
@@ -18,6 +18,7 @@
template.macros=-macros
decorates=layout
base.css.class=layout-oldstyle
+compatibility=2.1.3
#: BEGIN comment for JSP
template.type=velocity
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/decorator.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/decorator.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/decorator.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/decorator.properties
Thu Oct 29 04:22:21 2009
@@ -18,6 +18,8 @@
template.macros=-macros
decorates=layout
base.css.class=layout-purpleplanet
+icon = images/purpleplanet.png
+compatibility=2.2.1
#: BEGIN comment for JSP
template.type=velocity
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/images/purpleplanet.png
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/images/purpleplanet.png?rev=830840&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/images/purpleplanet.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages.properties
Thu Oct 29 04:22:21 2009
@@ -86,3 +86,5 @@
desktop.pageeditor.dialog.labels.cancel=Cancel
desktop.pageeditor.dialog.labels.yes=Yes
desktop.pageeditor.dialog.labels.no=No
+title=Purple Planet
+
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages_en.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages_en.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages_en.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/resources/Messages_en.properties
Thu Oct 29 04:22:21 2009
@@ -22,3 +22,4 @@
desktop.action.removeportlet=Delete Portlet
desktop.action.addportlet=Add Portlet
desktop.action.editpage=Edit Page
+title=Purple Planet
\ No newline at end of file
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/decorator.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/decorator.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/decorator.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/decorator.properties
Thu Oct 29 04:22:21 2009
@@ -18,6 +18,8 @@
template.macros=-macros
decorates=layout
base.css.class=layout-turbo
+icon = images/turbo.png
+compatibility=2.2.1
#: BEGIN comment for JSP
template.type=velocity
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/images/turbo.png
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/images/turbo.png?rev=830840&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/images/turbo.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages.properties
Thu Oct 29 04:22:21 2009
@@ -86,3 +86,5 @@
desktop.pageeditor.dialog.labels.cancel=Cancel
desktop.pageeditor.dialog.labels.yes=Yes
desktop.pageeditor.dialog.labels.no=No
+
+title=Turbo
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages_en.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages_en.properties?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages_en.properties
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/resources/Messages_en.properties
Thu Oct 29 04:22:21 2009
@@ -22,3 +22,4 @@
desktop.action.removeportlet=Delete Portlet
desktop.action.addportlet=Add Portlet
desktop.action.editpage=Edit Page
+title=Turbo
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp?rev=830840&r1=830839&r2=830840&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/index.jsp
Thu Oct 29 04:22:21 2009
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<% response.sendRedirect(response.encodeRedirectURL("portal/")); %>
+<% response.sendRedirect(response.encodeRedirectURL("ui/")); %>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
