Author: taylor
Date: Tue Mar 9 06:03:26 2010
New Revision: 920705
URL: http://svn.apache.org/viewvc?rev=920705&view=rev
Log:
JS2-1121 - cleanup of portal pipeline and decorators
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/profiler.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/profiler.psml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=920705&r1=920704&r2=920705&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Tue Mar 9 06:03:26 2010
@@ -143,7 +143,7 @@ var JETUI_YUI = {
<% if (ltb != null) { %><span style='position: absolute; left: 0px; top:
42px;' id='jstbLeftToggle' class='<%=leftToggleClass%>'></span><% } if (rtb !=
null) { %><span id='jstbRightToggle' class='<%=rightToggleClass%>'
style='position: absolute; right: 0px; top: 42px;'></span><% } %>
</div>
<%if (request.getUserPrincipal() != null) {%>
-<span class="layout-statusarea"><b><%=userNameGiven%> <%=userNameFamily%></b>
| Profile | Tasks (5) | Notifications (2) | <a
href="<%=request.getContextPath()%>/login/logout?org.apache.jetspeed.login.destination=<%=request.getContextPath()%>/ui">Log
out</a></span>
+<span class="layout-statusarea"><b><%=userNameGiven%> <%=userNameFamily%></b>
| <a
href="<%=request.getContextPath()%>/login/logout?org.apache.jetspeed.login.destination=<%=request.getContextPath()%>/ui">Log
out</a></span>
<% } %>
<!-- <span class="layout-search"><input type='text' size='14'/></span><span
class="layout-search2"><img height='18'
src="<%=request.getContextPath()%>/images/search.png"/></span> -->
</div> <!-- end header -->
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata?rev=920705&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/folder.metadata
Tue Mar 9 06:03:26 2010
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<folder
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd";>
+ <title>Administration</title>
+ <metadata name='space-owner' xml:lang='en'>admin</metadata>
+
+ <document-order>security</document-order>
+ <document-order>portal</document-order>
+
+ <menu name="page-navigations">
+ <options>/Administrative/portal-admin,/Administrative/security</options>
+ </menu>
+
+ <!-- temporary menu definitions for jscookmenu layout decorator; will be
standard -->
+ <menu name="additional-links" regexp="true" options="/*.link"/>
+
+ <security-constraints>
+ <security-constraints-ref>admin</security-constraints-ref>
+ </security-constraints>
+</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/folder.metadata?rev=920705&r1=920704&r2=920705&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/folder.metadata
Tue Mar 9 06:03:26 2010
@@ -24,12 +24,16 @@ limitations under the License.
<metadata name="title" xml:lang="zh">æ ¹æ件夹</metadata>
<metadata name="title" xml:lang="zh-TW">æ ¹æ件夾</metadata>
<metadata name="title" xml:lang="ko">ë£¨í¸ í´ë</metadata>
-
+ <metadata name='space-owner' xml:lang='en'>admin</metadata>
+
<defaults
layout-decorator="jetspeed"
portlet-decorator="jetspeed"
/>
+ <document-order>default-page.psml</document-order>
+ <document-order>about.psml</document-order>
+ <document-order>registration.psml</document-order>
<document-order>Jetspeed2.link</document-order>
<document-order>Jetspeed2Wiki.link</document-order>
<document-order>apache_portals.link</document-order>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm?rev=920705&r1=920704&r2=920705&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/greenearth/header.vm
Tue Mar 9 06:03:26 2010
@@ -76,7 +76,7 @@ var JETUI_YUI = {
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
-<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | Profile | Tasks (5) | Notifications (2) |
<a href="#BaseHref()login/logout">Log out</a></span>
+<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
#PageActionBar()
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm?rev=920705&r1=920704&r2=920705&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/jetspeed/header.vm
Tue Mar 9 06:03:26 2010
@@ -76,7 +76,7 @@ var JETUI_YUI = {
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
-<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | Profile | Tasks (5) | Notifications (2) |
<a href="#BaseHref()login/logout">Log out</a></span>
+<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
#PageActionBar()
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm?rev=920705&r1=920704&r2=920705&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/purpleplanet/header.vm
Tue Mar 9 06:03:26 2010
@@ -76,7 +76,7 @@ var JETUI_YUI = {
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
-<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | Profile | Tasks (5) | Notifications (2) |
<a href="#BaseHref()login/logout">Log out</a></span>
+<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
#PageActionBar()
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm?rev=920705&r1=920704&r2=920705&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/turbo/header.vm
Tue Mar 9 06:03:26 2010
@@ -76,7 +76,7 @@ var JETUI_YUI = {
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
<!-- Page Action Bar -->
#if ($request.getUserPrincipal())
-<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | Profile | Tasks (5) | Notifications (2) |
<a href="#BaseHref()login/logout">Log out</a></span>
+<span
class="layout-statusarea"><b>$jetspeed.getUserAttribute("user.name.given","")
$jetspeed.getUserAttribute("user.name.family",
${request.userPrincipal.name})</b> | <a href="#BaseHref()login/logout">Log
out</a></span>
#end
#if (!$jetspeed.isAjaxCustomizationEnabled())
#PageActionBar()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
