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 sh...@apache.org on 2005/08/23 00:24:06 UTC
svn commit: r239262 [1/2] - in /portals/jetspeed-2/trunk:
applications/demo/src/webapp/WEB-INF/
applications/demo/src/webapp/WEB-INF/view/
applications/security/src/webapp/WEB-INF/
applications/security/src/webapp/WEB-INF/security/login/ etc/sql/ src/w...
Author: shinsuke
Date: Mon Aug 22 15:23:39 2005
New Revision: 239262
URL: http://svn.apache.org/viewcvs?rev=239262&view=rev
Log:
JS2-346: http://issues.apache.org/jira/browse/JS2-346
Added:
portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp (with props)
portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp (with props)
portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp (with props)
portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/jetspeed-logo.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/nw_maj_rond.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/close.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/customize.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/edit.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/help.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_error_sml.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_info_sml.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_success_sml.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_warning_sml.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info1.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/leftnavbg.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/maximized.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/minimized.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/nw_maj_rond.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/print.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/restore.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/sw_med_rond.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/view.gif (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout-help.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.properties (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/columns/layout.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.properties (with props)
portals/jetspeed-2/trunk/src/webapp/WEB-INF/templates/layout/xhtml-basic/maximized/layout.vm
Modified:
portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/etc/sql/populate-db-default.sql
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-top.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-top.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml Mon Aug 22 15:23:39 2005
@@ -69,6 +69,7 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>de</supported-locale>
+ <supported-locale>ja</supported-locale>
<resource-bundle>org.apache.portals.applications.desktop.resources.Bookmark</resource-bundle>
<portlet-preferences>
<preference>
@@ -86,6 +87,50 @@
</portlet-preferences>
</portlet>
+ <portlet>
+ <description>Bookmark Portlet for XHTML Basic</description>
+ <portlet-name>BookmarkPortletForXHTMLBasic</portlet-name>
+ <display-name>Bookmark Portlet for XHTML Basic</display-name>
+ <portlet-class>org.apache.portals.applications.desktop.BookmarkPortlet</portlet-class>
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/view/bookmark-view-xhtmlbasic.jsp</value>
+ </init-param>
+ <init-param>
+ <name>EditPage</name>
+ <value>/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp</value>
+ </init-param>
+ <init-param>
+ <name>HelpPage</name>
+ <value>/WEB-INF/view/bookmark-help-xhtmlbasic.jsp</value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>de</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <resource-bundle>org.apache.portals.applications.desktop.resources.Bookmark</resource-bundle>
+ <portlet-preferences>
+ <preference>
+ <name>Jetspeed-2 Site</name>
+ <value>http://portals.apache.org/jetspeed-2/</value>
+ </preference>
+ <preference>
+ <name>Bluesunrise Site</name>
+ <value>http://www.bluesunrise.com/</value>
+ </preference>
+ <preference>
+ <name>Apache Home</name>
+ <value>http://www.apache.org/</value>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+
<portlet id="PreferencePortlet">
<portlet-name>PreferencePortlet</portlet-name>
<display-name>PreferencePortlet</display-name>
Added: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp (added)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp Mon Aug 22 15:23:39 2005
@@ -0,0 +1,69 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+--%>
+<%@ page session="false" %>
+<%@ page import="javax.portlet.*"%>
+<%@ page import="java.util.*"%>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<portlet:actionURL portletMode="edit" var="myAction">
+<portlet:param name="add" value="add"/>
+</portlet:actionURL>
+<portlet:actionURL portletMode="view" var="myCancel"/>
+<jsp:useBean id="addUrl" scope="request" class="java.lang.String" />
+<jsp:useBean id="cancelUrl" scope="request" class="java.lang.String" />
+<portlet:defineObjects/>
+<%
+ResourceBundle myText = portletConfig.getResourceBundle(request.getLocale());
+%>
+<%=myText.getString("available_bookmarks")%><br/>
+<form action="<%=myAction%>" method="post">
+<table>
+ <tr>
+ <th abbr="<%=myText.getString("name")%>"><%=myText.getString("name")%></th>
+ <th abbr="<%=myText.getString("url")%>"><%=myText.getString("url")%></th>
+ <th abbr="<%=myText.getString("delete")%>"></th>
+ </tr>
+<%
+PortletPreferences prefs = renderRequest.getPreferences();
+Enumeration e = prefs.getNames();
+while (e.hasMoreElements())
+ {
+ String name = (String)e.nextElement();
+ String value = prefs.getValue(name,
+ "<" +
+ myText.getString("undefined")
+ +">");
+%>
+ <tr>
+ <td><%=name%></td>
+ <td><%=value%></td>
+<portlet:actionURL var="removeUrl"><portlet:param name="remove" value="<%=name%>"/></portlet:actionURL>
+ <td><a href="<%=removeUrl.toString()%>">[<%=myText.getString("delete")%>]</a></td>
+ </tr>
+<%
+ }
+%>
+ <tr>
+ <td><input name="name" type="text"/></td>
+ <td><input name="value" size='50' type="text"/></td>
+ <td><input name="add" type="submit" value="<%=myText.getString("add")%>"/></td>
+ </tr>
+</table>
+</form>
+<form action="<%=myCancel%>" method="post">
+<span>
+<input name="cancel" type="submit" value="<%=myText.getString("cancel")%>"/>
+</span>
+</form>
Propchange: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp (added)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp Mon Aug 22 15:23:39 2005
@@ -0,0 +1,31 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+--%>
+<%@ page session="false" %>
+<%@ page import="javax.portlet.*"%>
+<%@ page import="java.util.*"%>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<portlet:actionURL portletMode="view" var="myCancel"/>
+<portlet:defineObjects/>
+<%
+ResourceBundle myText = portletConfig.getResourceBundle(request.getLocale());
+%>
+<h2><%=myText.getString("help.title")%></h2>
+<p><%=myText.getString("help.text")%></p>
+<form action="<%=myCancel%>" method="post">
+<span>
+<input name="cancel" type="submit" value="<%=myText.getString("cancel")%>">
+</span>
+</form>
Propchange: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-help-xhtmlbasic.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp (added)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp Mon Aug 22 15:23:39 2005
@@ -0,0 +1,46 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+--%>
+<%@ page session="false" %>
+<%@ page import="javax.portlet.*"%>
+<%@ page import="java.util.Enumeration"%>
+<%@ page import="java.util.ResourceBundle"%>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<portlet:defineObjects/>
+<%
+ResourceBundle myText = portletConfig.getResourceBundle(renderRequest.getLocale());
+%>
+<br/><%=myText.getString("available_bookmarks")%><br/><br/>
+<%
+ PortletPreferences prefs = renderRequest.getPreferences();
+ Enumeration e = prefs.getNames();
+ if (!e.hasMoreElements()) // no bookmarks
+ {
+%>
+ <%=myText.getString("no_bookmarks")%><br/>
+<%
+ }
+ while (e.hasMoreElements())
+ {
+ String name = (String)e.nextElement();
+ String value = prefs.getValue
+ (name,"<"+
+ myText.getString("undefined")+">");
+%>
+ <a href="<%=value%>"><%=name%></a><br/>
+<%
+ }
+%>
+<br/>
Propchange: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/bookmark-view-xhtmlbasic.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml Mon Aug 22 15:23:39 2005
@@ -36,6 +36,27 @@
<short-title>Login</short-title>
</portlet-info>
</portlet>
+ <portlet id="LoginPortletForXHTMLBasic">
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/security/login/login-xhtmlbasic.jsp</value>
+ </init-param>
+ <portlet-name>LoginPortletForXHTMLBasic</portlet-name>
+ <display-name>Login for XHTML Basic</display-name>
+ <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
+ <portlet-info>
+ <title>Login</title>
+ <short-title>Login</short-title>
+ </portlet-info>
+ </portlet>
<!-- *********************** -->
<!-- Role Management Portlet -->
<!-- *********************** -->
Added: portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (added)
+++ portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp Mon Aug 22 15:23:39 2005
@@ -0,0 +1,60 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+--%>
+<%@page import="org.apache.jetspeed.login.LoginConstants"%>
+<%@page import="org.apache.jetspeed.request.RequestContext"%>
+<%@taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
+<fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.LoginResources" />
+<c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
+<c:choose>
+ <c:when test="${pageContext.request.userPrincipal != null}">
+ <fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br/>
+ <a href='<c:url context="${requestContext.request.contextPath}" value="/login/logout"/>'><fmt:message key="login.label.Logout"/></a>
+ <br/>
+ <a href='<c:url context="${requestContext.request.contextPath}" value="/portal/my-account.psml"/>'><fmt:message key="login.label.ChangePassword"/></a>
+ </c:when>
+ <c:otherwise>
+ <%-- backdoor access to the portal session to get the login error count --%>
+ <c_rt:set var="errorCode" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.ERRORCODE)%>"/>
+ <c:choose>
+ <c:when test="${not empty errorCode}">
+ <br/><fmt:message key="login.label.ErrorCode.${errorCode}"/><br/>
+ </c:when>
+ <c:otherwise>
+ <c_rt:set var="retryCount" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.RETRYCOUNT)%>"/>
+ <c:if test="${not empty retryCount}">
+ <br/>
+ <fmt:message key="login.label.InvalidUsernameOrPassword"><fmt:param value="${retryCount}"/></fmt:message><br/>
+ </c:if>
+ </c:otherwise>
+ </c:choose>
+ <form method="post" action='<c:url context="${requestContext.request.contextPath}" value="/login/proxy"/>'>
+ <div>
+ <fmt:message key="login.label.Username"/>
+ <c_rt:set var="userName" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.USERNAME)%>"/>
+ <input type="text" size="30" name="<%=LoginConstants.USERNAME%>" value="<c:out value="${userName}"/>"/>
+ </div>
+ <div>
+ <fmt:message key="login.label.Password"/>
+ <input type="password" size="30" name="<%=LoginConstants.PASSWORD%>"/>
+ </div>
+ <div>
+ <input type="submit" value="<fmt:message key="login.label.Login"/>"/>
+ </div>
+ </form>
+ </c:otherwise>
+</c:choose>
Propchange: portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/etc/sql/populate-db-default.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/populate-db-default.sql?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/populate-db-default.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/populate-db-default.sql Mon Aug 22 15:23:39 2005
@@ -89,6 +89,7 @@
INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(3,'text/vxml');
INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(4,'text/xml');
INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(5,'text/xhtml');
+INSERT INTO MIMETYPE (MIMETYPE_ID, NAME) VALUES(6,'application/xhtml+xml');
----------------------------------------------------------------------------
-- Supported clients
@@ -109,31 +110,31 @@
VALUES(5, 8, 'nokia_generic','Nokia.*','Nokia','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(6, 9, 'up','UP.*|.*UP\.Browser.*','United Planet','Generic','',2);
+VALUES(6, 10, 'up','UP.*|.*UP\.Browser.*','United Planet','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(7, 10, 'sonyericsson','Ercis.*|SonyE.*','SonyEricsson','Generic','',2);
+VALUES(7, 11, 'sonyericsson','Ercis.*|SonyE.*','SonyEricsson','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(8, 11, 'wapalizer','Wapalizer.*','Wapalizer','Generic','',2);
+VALUES(8, 12, 'wapalizer','Wapalizer.*','Wapalizer','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(9, 12, 'klondike','Klondike.*','Klondike','Generic','',2);
+VALUES(9, 13, 'klondike','Klondike.*','Klondike','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(10, 13, 'wml_generic','.*WML.*|.*WAP.*|.*Wap.*|.*wml.*','Generic','Generic','',2);
+VALUES(10, 14, 'wml_generic','.*WML.*|.*WAP.*|.*Wap.*|.*wml.*','Generic','Generic','',2);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(11, 14, 'vxml_generic','.*VoiceXML.*','Generic','Generic','',3);
+VALUES(11, 15, 'vxml_generic','.*VoiceXML.*','Generic','Generic','',3);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(12, 15, 'nuance','Nuance.*','Nuance','Generic','',3);
+VALUES(12, 16, 'nuance','Nuance.*','Nuance','Generic','',3);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(13, 16, 'agentxml','agentxml/1.0.*','Unknown','Generic','',4);
+VALUES(13, 17, 'agentxml','agentxml/1.0.*','Unknown','Generic','',4);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
-VALUES(14, 17, 'opera7','.*Opera/7.*','Opera','Opera7','7.x',1);
+VALUES(14, 18, 'opera7','.*Opera/7.*','Opera','Opera7','7.x',1);
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
VALUES(15, 1, 'ie5mac','.*MSIE 5.*Mac.*','Microsoft','None','5.*',1);
@@ -144,6 +145,9 @@
INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
VALUES(17, 3,'ie6','.*MSIE 6.*','Microsoft','None','6.0',1);
+INSERT INTO CLIENT (CLIENT_ID,EVAL_ORDER,NAME, USER_AGENT_PATTERN,MANUFACTURER,MODEL ,VERSION, PREFERRED_MIMETYPE_ID)
+VALUES(18, 9, 'xhtml-basic','DoCoMo/2.0.*|KDDI-.*UP\.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*','WAP','Generic','',6);
+
----------------------------------------------------------------------------------------
@@ -161,6 +165,9 @@
INSERT INTO MEDIA_TYPE (MEDIATYPE_ID,NAME, CHARACTER_SET, TITLE, DESCRIPTION)
VALUES(4,'xml','','XML','XML 1.0');
+INSERT INTO MEDIA_TYPE (MEDIATYPE_ID,NAME, CHARACTER_SET, TITLE, DESCRIPTION)
+VALUES(5,'xhtml-basic','UTF-8','XHTML','XHTML Basic');
+
------------------------------------------------------
-- Client association
------------------------------------------------------
@@ -325,6 +332,8 @@
INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(17,4);
INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(17,5);
+INSERT INTO CLIENT_TO_MIMETYPE(CLIENT_ID ,MIMETYPE_ID)VALUES(18,6);
+
----------------------------------------------------
-- Media Type association
----------------------------------------------------
@@ -337,6 +346,7 @@
INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(2,2);
INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(3,3);
INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(4,4);
+INSERT INTO MEDIATYPE_TO_MIMETYPE(MEDIATYPE_ID ,MIMETYPE_ID)VALUES(5,6);
-----------------------
-- Profiler
@@ -381,9 +391,10 @@
insert into PROFILING_RULE values ('j2',
'org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule',
- 'The default profiling rule for users minus mediatype, language and country.');
+ 'The default profiling rule for users and mediatype minus language and country.');
insert into RULE_CRITERION values (18, 'j2', 0, 'path.session', 'page', 'default-page', 0);
insert into RULE_CRITERION values (19, 'j2', 1, 'group.role.user', 'user', null, 0);
+insert into RULE_CRITERION values (20, 'j2', 2, 'mediatype', 'mediatype', null, 0);
insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'j2' );
insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'page', 'role-fallback' );
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/ja/tigris/decorator-top.vm Mon Aug 22 15:23:39 2005
@@ -27,7 +27,8 @@
<meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
<meta http-equiv="Content-style-type" content="text/css" />
- #includeHeaderResource()
+#includeJavaScriptForHead()
+#includeHeaderResource()
<title>$jetspeed.page.getTitle($preferedLocale)</title>
<meta name="version" content="/* $Id$" />
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jetspeed/decorator-top.vm Mon Aug 22 15:23:39 2005
@@ -24,7 +24,8 @@
<head>
<meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
<title>$jetspeed.page.getTitle($preferedLocale)</title>
- #includeHeaderResource()
+#includeJavaScriptForHead()
+#includeHeaderResource()
</head>
<body class="${_layoutBaseCssClass}">
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-top.vm?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-top.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-top.vm Mon Aug 22 15:23:39 2005
@@ -60,7 +60,8 @@
<meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
<meta http-equiv="Content-style-type" content="text/css" />
- #includeHeaderResource()
+#includeJavaScriptForHead()
+#includeHeaderResource()
<title>$jetspeed.page.getTitle($preferedLocale)</title>
<meta name="version" content="/* $Id$" />
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-top.vm?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-top.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/simple/decorator-top.vm Mon Aug 22 15:23:39 2005
@@ -27,7 +27,8 @@
<meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
<meta http-equiv="Content-style-type" content="text/css" />
- #includeHeaderResource()
+#includeJavaScriptForHead()
+#includeHeaderResource()
<title>$jetspeed.page.getTitle($preferedLocale)</title>
<meta name="version" content="/* $Id: decorator-top.vm,v 1.5 2004/12/03 09:10:18 taylor Exp $" />
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm Mon Aug 22 15:23:39 2005
@@ -24,7 +24,8 @@
<meta http-equiv="Content-type" content="text/html#if($response.characterEncoding); charset=$response.characterEncoding#end" />
<meta http-equiv="Content-style-type" content="text/css" />
- #includeHeaderResource()
+#includeJavaScriptForHead()
+#includeHeaderResource()
<title>$jetspeed.page.getTitle($preferedLocale)</title>
<meta name="version" content="/* $Id$" />
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css Mon Aug 22 15:23:39 2005
@@ -0,0 +1,165 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*/
+
+body{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+background: #fff;
+color: #000;
+margin: 0;
+padding: 0;
+}
+
+a:link, a:visited{
+color: blue;
+}
+
+a:hover{
+color: #f30 !important;
+}
+
+.Link
+{
+}
+
+.LinkFolder
+{
+}
+
+.LinkPage
+{
+}
+
+.layout-simple #logo{
+text-align: center;
+}
+
+.layout-simple #logo img{
+border:0px;
+}
+
+.layout-simple .tabs {
+margin:3px;
+}
+
+.layout-simple #tabs .tab{
+border:1px;
+padding: 0px;
+margin:0px;
+font-size: x-small;
+vertical-align: middle;
+text-align: left;
+}
+
+.layout-simple #tabs .tab a{
+padding: 0px;
+margin:0px;
+font-size: x-small;
+vertical-align: middle;
+text-align: left;
+color: blue;
+}
+
+.layout-simple #breadcrumbs {
+margin:3px;
+voice-family: inherit;
+font-size: x-small;
+background: #efefef;
+}
+
+.layout-simple #breadcrumbs a{
+text-decoration: none;
+}
+
+.layout-simple #breadcrumbs .FolderList .pagetitle{
+border-bottom: 1px solid #666;
+border-right: 1px solid #666;
+background: #ddd;
+color: #555;
+padding: 4px;
+font-weight: bold;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple #breadcrumbs .FolderList div{
+padding-bottom: .3em;
+padding-left: 4px;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple #navcolumn{
+font-size: x-small;
+}
+
+.layout-simple #navcolumn a:visited{
+color: blue;
+}
+
+.layout-simple .toolgroup{
+margin:3px;
+background: #efefef;
+margin-bottom: 6px;
+}
+
+.layout-simple .toolgroup .label{
+padding: 4px;
+border-bottom: 1px solid #666;
+border-right: 1px solid #666;
+background: #ddd;
+color: #555;
+font-weight: bold;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple .toolgroup .body{
+border-right: 1px solid #aaa;
+border-bottom: 1px solid #aaa;
+padding: 4px 4px 4px 0;
+}
+
+.layout-simple .toolgroup .body div {
+padding-bottom: .3em;
+padding-left: 0;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple .toolgroup .body div div {
+padding-left: .5em;
+}
+
+.layout-simple .toolgroup .pagetitle{
+font-weight: bold;
+padding-left: .5em;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.layout-simple .toolgroup .body div p {
+margin-top: .0;
+padding-bottom: 0;
+padding-left: 0;
+margin-top: .0;
+margin-bottom: .0;
+}
+
+.layout-simple .noborder{
+border:0px;
+}
+
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/css/styles.css
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-bottom.vm Mon Aug 22 15:23:39 2005
@@ -0,0 +1,24 @@
+#*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*#
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+<div id="navcolumn">
+#includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+</div>
+#end
+<p>Powered by Jetspeed</p>
+</div>
+</body></html>
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-macros.vm Mon Aug 22 15:23:39 2005
@@ -0,0 +1,194 @@
+#* define navigation constants *#
+#macro (defineNavigationConstants)
+## Constants for layout orientation
+#set($LEFT_TO_RIGHT = "LeftToRight")
+#set($RIGHT_TO_LEFT = "RightToLeft")
+#set($TOP_TO_BOTTOM = "TopToBottom")
+#set($BOTTOM_TO_TOP = "BottomToTop")
+#set($TITLE_FIRST = "TitleFirst")
+#set($TITLE_LAST = "TitleLast")
+#set($BREADCRUMBS_STYLE = "BreadcrumbsStyle")
+#end
+
+#* include tabs navigation component *#
+#macro (includeTabsNavigation $_menu $_orientation)
+#foreach($element in $_menu.elements.iterator())
+#if($element.elementType == "option")
+#set($tabTitle = $element.getTitle($preferedLocale)) #set($tabName = $element.getShortTitle($preferedLocale))
+#set($_tag="span")
+#if($_orientation == $TOP_TO_BOTTOM)
+#set($_tag="div")
+#end## if($_orientation == $TOP_TO_BOTTOM)
+#if($element.isSelected($site))
+<$_tag class="tab" title="$!tabTitle">${tabName}</$_tag>
+#else
+#set($tabUrl = $jetspeed.getAbsoluteUrl($element.url))
+<$_tag class="tab" title="$!tabTitle"><a href="$tabUrl">${tabName}</a></$_tag>
+#end## if($element.isSelected($site))
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+#end
+
+#* include links navigation component *#
+#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter)
+#if(!$_delimiter || $_delimiter == "")
+#if($_style != $BREADCRUMBS_STYLE)
+#set($_delimiter = " ")
+#else
+#set($_delimiter = " >> ")
+#end## if($_style != $BREADCRUMBS_STYLE)
+#end## if(!$_delimiter || $_delimiter == "")
+#set($menuTitle = $_menu.getTitle($preferedLocale))
+#set($menuName = $_menu.getShortTitle($preferedLocale))
+<div class="FolderList">
+#if($_title == $TITLE_FIRST)
+#if($_orientation == $LEFT_TO_RIGHT)
+<span title="$!menuTitle">${menuName} </span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+<div class="pagetitle" title="$!menuTitle">${menuName}</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($_title == $TITLE_FIRST)
+#foreach($element in $_menu.elements.iterator())
+#if($element.elementType == "option")
+#set($linkTitle = $element.getTitle($preferedLocale))
+#set($linkName = $element.getShortTitle($preferedLocale))
+#set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+#if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+#if($_orientation == $LEFT_TO_RIGHT)
+<span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+<div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#if($element.type == "page")
+<a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a>
+#elseif($element.type == "link")
+<a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a>
+#elseif($element.type == "folder")
+<a href="$linkUrl" class="LinkFolder" title="$!linkTitle">${linkName}</a>
+#else
+<a href="$linkUrl" title="$!linkTitle">${linkName}</a>
+#end## if($element.type == "page")
+#if($_orientation == $LEFT_TO_RIGHT)
+${_delimiter}</span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#else
+#if($_orientation == $LEFT_TO_RIGHT)
+<span title="$!linkTitle">${linkName} </span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+<div title="$!linkTitle">${linkName}</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size())
+#elseif($element.elementType == "separator")
+#set($separatorTitle = $element.getTitle($preferedLocale)) #set($separatorText = $element.getText($preferedLocale))
+#if($_orientation == $LEFT_TO_RIGHT)
+<span title="$!separatorTitle">${separatorText}${_delimiter}</span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+#if($_title == $TITLE_LAST)
+#if($_orientation == $LEFT_TO_RIGHT)
+<span title="$!menuTitle">${menuName} </span>
+#elseif($_orientation == $TOP_TO_BOTTOM)
+<div class="pagetitle" title="$!menuTitle">${menuName}</div>
+#end## if($_orientation == $LEFT_TO_RIGHT)
+#end## if($_title == $TITLE_LAST)
+</div>
+#end
+
+#* include nested menu links navigation component *#
+#macro (includeNestedLinksWithIconNavigation $_menu $_orientation)
+#set($menuTitle = $_menu.getTitle($preferedLocale))
+#set($menuName = $_menu.getShortTitle($preferedLocale))
+#if($menuName)
+<div class="pagetitle" title="$!menuTitle">${menuName}</div>
+#end## if($menuName)
+<div>
+#foreach($element in $_menu.elements.iterator())
+#if($element.elementType == "option")
+#set($linkTitle = $element.getTitle($preferedLocale))
+#set($linkName = $element.getShortTitle($preferedLocale))
+#set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+#if($element.type == "page")
+<div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+#elseif($element.type == "link")
+<div><a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a></div>
+#elseif($element.type == "folder")
+<div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+#end## if($element.type == "page")
+#elseif($element.elementType == "menu")
+#includeNestedLinksWithIconNavigation($element $_orientation)
+#elseif($element.elementType == "separator")
+#set($separatorTitle = $element.getTitle($preferedLocale))
+#set($separatorText = $element.getText($preferedLocale))
+<div class="pagetitle" title="$!separatorTitle">${separatorText}</div>
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+</div>
+#end
+
+#* include top level menu links navigation component *#
+#macro (includeLinksWithIconNavigation $_menu $_orientation)
+#set($rowStarted = false)
+#set($elementsStarted = false)
+#foreach($element in $_menu.elements.iterator())
+#if($element.elementType == "option")
+#if(!$rowStarted)
+<div class="toolgroup">
+<div class="body">
+<div class="FolderList">
+#elseif(!$elementsStarted)
+<div class="body">
+<div class="FolderList">
+#end## if(!$rowStarted)
+#set($linkTitle = $element.getTitle($preferedLocale))
+#set($linkName = $element.getShortTitle($preferedLocale))
+#set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
+#if($element.type == "page")
+<div><a href="$linkUrl" class="LinkPage" title="$!linkTitle">${linkName}</a></div>
+#elseif($element.type == "link")
+<div><a href="$linkUrl" class="Link" title="$!linkTitle">${linkName}</a></div>
+#elseif($element.type == "folder")
+<div><a href="$linkUrl" class="LinkFolder" title="$!linkTitle">$linkName</a></div>
+#end## if($element.type == "page")
+#set($rowStarted = true)
+#set($elementsStarted = true)
+#elseif($element.elementType == "menu")
+#if(!$rowStarted)
+<div class="toolgroup">
+<div class="body">
+<div class="FolderList">
+#elseif(!$elementsStarted)
+<div class="body">
+<div class="FolderList">
+#end## if(!$rowStarted)
+#includeNestedLinksWithIconNavigation($element $_orientation)
+#set($rowStarted = true)
+#set($elementsStarted = true)
+#elseif($element.elementType == "separator")
+#if(!$rowStarted)
+<div class="toolgroup">
+#elseif($elementsStarted)
+</div>
+</div>
+</div>
+<div class="toolgroup">
+#end## if(!$rowStarted)
+#set($separatorTitle = $element.getTitle($preferedLocale))
+#set($separatorText = $element.getText($preferedLocale))
+<div class="label">${separatorText}</div>
+#set($rowStarted = true)
+#set($elementsStarted = false)
+#end## if($element.elementType == "option")
+#end## foreach($element in $_menu.elements.iterator())
+#if($elementsStarted)
+</div>
+</div>
+#end## if($elementsStarted)
+#if($rowStarted)
+</div>
+#end## if($rowStarted)
+#end
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator-top.vm Mon Aug 22 15:23:39 2005
@@ -0,0 +1,43 @@
+## Copyright 2004 The Apache Software Foundation
+##
+## Licensed 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.
+#set($defaultEnc="UTF-8")<?xml version="1.0" encoding="#if($response.characterEncoding)$response.characterEncoding#else$defaultEnc#end"?>
+#defineNavigationConstants()##
+#defineLayoutObjects()##
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="$response.contentType"/>
+#includeHeaderResource()
+<title>$jetspeed.page.getTitle($preferedLocale)</title>
+</head>
+<body>
+<div class="layout-simple">
+<div id="logo"><img src="$response.encodeURL('content/images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" /></div>
+## Top Tabs Menu
+#set($myF = $jetspeed.currentFragment)
+#set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext"))
+#set($pagesStandardMenu = $site.getMenu("pages"))
+#if(!$pagesStandardMenu.empty)
+<div id="tabs">
+#includeTabsNavigation($pagesStandardMenu $TOP_TO_BOTTOM)
+</div>
+#end
+## Breadcrumbs Back Navigation
+<div id="breadcrumbs">
+#set($breadcrumbsStandardMenu = $site.getMenu("breadcrumbs"))
+#if(!$breadcrumbsStandardMenu.empty)
+#includeLinksNavigation($breadcrumbsStandardMenu $TOP_TO_BOTTOM $TITLE_FIRST $BREADCRUMBS_STYLE "")
+#end
+</div>
+## Content Table Data
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties Mon Aug 22 15:23:39 2005
@@ -0,0 +1,20 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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.
+
+id=simple
+template.type=velocity
+template.extension=.vm
+template.macros=-macros
+decorates=layout
+base.css.class=layout-simple
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/decorator.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/jetspeed-logo.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/jetspeed-logo.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/jetspeed-logo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/nw_maj_rond.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/layout/xhtml-basic/simple/images/nw_maj_rond.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css Mon Aug 22 15:23:39 2005
@@ -0,0 +1,439 @@
+/*
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+*/
+
+
+.portlet-simple .PTitle
+{
+padding: 2px;
+border: 1px solid #999999;
+color: #990000;
+background-color: #dddddd;
+}
+
+.portlet-simple .PTitleContent
+{
+margin-top:3px;
+margin-left:3px;
+margin-right:3px;
+margin-bottom:0px;
+background-color: #dddddd;
+border: 1px solid #999999;
+font-weight:bold;
+}
+
+.portlet-simple .PContent
+{
+margin-top:0px;
+margin-left:3px;
+margin-right:3px;
+margin-bottom:3px;
+padding:3px;
+border: 1px solid #999999;
+}
+
+/* font */
+.portlet-simple .PTitle,
+.portlet-simple .PTitleContent,
+.portlet-simple .PContent,
+{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .noborder{
+border:0px;
+}
+
+
+/* --------------------------------- */
+/* PLT.C.1 Links (Anchor) */
+/* --------------------------------- */
+
+.portlet-simple A:link,
+.portlet-simple A:visited {
+text-decoration: none;
+}
+
+.portlet-simple A:hover,
+.portlet-simple A:active {
+text-decoration: underline;
+}
+
+/* font */
+.portlet-simple A:link,
+.portlet-simple A:visited,
+.portlet-simple A:hover,
+.portlet-simple A:active
+{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+
+/* --------------------------------- */
+/* PLT.C.2 Fonts */
+/* --------------------------------- */
+
+.portlet-simple .portlet-font {
+color: black;
+}
+.portlet-simple .portlet-font-dim {
+color: gray;
+}
+
+/* font */
+.portlet-simple .portlet-font,
+.portlet-simple .portlet-font-dim
+{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+
+
+/* --------------------------------- */
+/* PLT.C.3 Messages */
+/* --------------------------------- */
+.portlet-simple .portlet-msg-status {
+background: url(content/simple/images/icon_status_sml.gif);
+background-repeat: no-repeat;
+padding-left: 20px;
+min-height: 15px;
+}
+
+.portlet-simple .portlet-msg-info {
+background: url(content/simple/images/icon_info_sml.gif);
+background-repeat: no-repeat;
+padding-left: 20px;
+min-height: 15px;
+}
+
+.portlet-simple .portlet-msg-error {
+background: url(content/simple/images/icon_error_sml.gif);
+background-repeat: no-repeat;
+padding-left: 20px;
+min-height: 15px;
+}
+
+.portlet-simple .portlet-msg-alert {
+background: url(content/simple/images/icon_warning_sml.gif);
+background-repeat: no-repeat;
+padding-left: 20px;
+min-height: 15px;
+}
+
+.portlet-simple .portlet-msg-success {
+background: url(content/simple/images/icon_success_sml.gif);
+background-repeat: no-repeat;
+padding-left: 20px;
+min-height: 15px;
+}
+
+/* font */
+.portlet-simple .portlet-msg-status,
+.portlet-simple .portlet-msg-info,
+.portlet-simple .portlet-msg-error,
+.portlet-simple .portlet-msg-alert,
+.portlet-simple .portlet-msg-success
+{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+
+/* --------------------------------- */
+/* PLT.C.4 Sections */
+/* --------------------------------- */
+.portlet-simple .portlet-section-header {
+background-image: url(content/simple/images/nw_maj_rond.gif);
+background-repeat: no-repeat;
+color: #fff;
+background-color: #036;
+padding: 5px;
+margin-right: 2px;
+margin-left: 2px;
+clear: both;
+}
+
+.portlet-simple .portlet-section-body {
+background: #efefef;
+border: none;
+padding: 2px 3px;
+text-align: left;
+vertical-align: top;
+text-align: left;
+}
+
+.portlet-simple .portlet-section-alternate {
+background: #ddd;
+border: none;
+padding: 2px 3px;
+text-align: left;
+vertical-align: top;
+text-align: left;
+}
+
+.portlet-simple .portlet-section-selected {
+background: #ffe;
+border: none;
+padding: 2px 3px;
+text-align: left;
+vertical-align: top;
+text-align: left;
+font-weight:bold;
+}
+
+.portlet-simple .portlet-section-subheader {
+background-image: url(content/simple/images/nw_maj_rond.gif);
+background-repeat: no-repeat;
+color: #fff;
+background-color: #888;
+padding: 5px;
+margin-right: 2px;
+margin-left: 2px;
+clear: both;
+}
+
+.portlet-simple .portlet-section-footer {
+background-repeat: no-repeat;
+background-position: bottom left;
+background-color: #ddd;
+background-image: url(content/simple/images/sw_med_rond.gif);
+color: #000;
+padding: 5px;
+margin: .67em 2px;
+margin-top: 0;
+}
+
+.portlet-simple .portlet-section-text {
+padding: 1em;
+padding-bottom: .3em;
+padding-left: 1em;
+}
+
+/* font */
+.portlet-simple .portlet-section-header,
+.portlet-simple .portlet-section-body,
+.portlet-simple .portlet-section-alternate,
+.portlet-simple .portlet-section-selected,
+.portlet-simple .portlet-section-subheader,
+.portlet-simple .portlet-section-footer,
+.portlet-simple .portlet-section-text
+{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+
+/* --------------------------------- */
+/* PLT.C.5 Forms */
+/* --------------------------------- */
+.portlet-simple .portlet-form-label {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .portlet-form-input-field {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .portlet-form-button {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .portlet-icon-label {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .portlet-dlg-icon-label {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .portlet-form-field-label {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+.portlet-simple .portlet-form-field {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+
+/* --------------------------------- */
+/* PLT.C.6 Menus */
+/* --------------------------------- */
+.portlet-simple .portlet-menu {
+background: #efefef;
+margin-bottom: 6px;
+border-right: 1px solid #aaa;
+border-bottom: 1px solid #aaa;
+padding: 4px 4px 4px 0;
+padding-bottom: .3em;
+padding-left: 1em;
+}
+
+.portlet-simple .portlet-menu-item {
+text-decoration: none;
+color: blue;
+}
+
+.portlet-simple .portlet-menu-item-selected {
+text-decoration: none;
+color: #555 !important;
+}
+
+.portlet-simple .portlet-menu-item-hover {
+text-decoration: none;
+color: #f30 !important;
+}
+
+.portlet-simple .portlet-menu-item-hover-selected {
+text-decoration: none;
+color: #555 !important;
+font-weight: bold;
+}
+
+.portlet-simple .portlet-menu-cascade-item {
+text-decoration: none;
+margin-top: .3em;
+padding-bottom: 0;
+color: blue;
+}
+
+.portlet-simple .portlet-menu-cascade-item-selected {
+text-decoration: none;
+color: #555 !important;
+font-weight: bold;
+}
+
+.portlet-simple .portlet-menu-description {
+}
+
+.portlet-simple .portlet-menu-caption {
+border-bottom: 1px solid #666;
+border-right: 1px solid #666;
+background: #ddd;
+color: #555;
+padding: 4px;
+}
+
+/* font */
+.portlet-simple .portlet-menu,
+.portlet-simple .portlet-menu-item,
+.portlet-simple .portlet-menu-item-selected,
+.portlet-simple .portlet-menu-item-hover,
+.portlet-simple .portlet-menu-item-hover-selected,
+.portlet-simple .portlet-menu-cascade-item,
+.portlet-simple .portlet-menu-cascade-item-selected,
+.portlet-simple .portlet-menu-description,
+.portlet-simple .portlet-menu-caption
+{
+font-family: Verdana, Helvetica, Arial, sans-serif;
+voice-family: inherit;
+font-size: x-small;
+}
+
+/* --------------------------------- */
+/* WSRP (10.6.5 Tables) */
+/* --------------------------------- */
+.portlet-simple .portlet-table-header,
+.portlet-simple .portlet-table-body,
+.portlet-simple .portlet-table-alternate,
+.portlet-simple .portlet-table-selected,
+.portlet-simple .portlet-table-subheader,
+.portlet-simple .portlet-table-footer,
+.portlet-simple .portlet-table-text,
+.portlet-simple th,
+.portlet-simple td,
+.portlet-simple input {
+font-family: Verdana, Helvetica, Arial, sans-serif;
+font-size: small;
+}
+
+.portlet-simple table,
+.portlet-simple th,
+.portlet-simple td {
+vertical-align: top;
+border: none;
+}
+
+.portlet-simple .portlet-table-header {
+background-color: #bbb;
+border: 0.75px solid #fff;
+padding: 2px 3px;
+text-align: left;
+}
+
+.portlet-simple .portlet-table-subheader {
+background-color: #ccc;
+border: 0.75px solid #fff;
+padding: 2px 3px;
+text-align: left;
+}
+
+.portlet-simple .portlet-table-footer {
+font-size: x-small;
+padding: 5px;
+margin: .67em 2px;
+margin-top: 0;
+background-color: #ddd;
+background-image: url(content/simple/images/sw_med_rond.gif);
+background-repeat: no-repeat;
+background-position: bottom left;
+}
+
+
+.portlet-simple .portlet-table-body,
+.portlet-simple .portlet-table-body td {
+font-size: small;
+background: #ddd;
+border-bottom: 1px solid #fff;
+}
+
+## Others
+
+.portlet-simple .portlet-table-alternate,
+.portlet-simple .portlet-table-alternate td {
+font-size: small;
+background: #efefef;
+border-bottom: 1px solid #fff;
+}
+
+.portlet-simple .portlet-table-selected,
+.portlet-simple .portlet-table-selected td {
+font-size: small;
+background: #ffe;
+border-bottom: 1px solid #fff;
+}
+
+
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/css/styles.css
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties Mon Aug 22 15:23:39 2005
@@ -0,0 +1,18 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed 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.
+
+id=simple
+template.type=velocity
+template.extension=.vm
+decorates=portlet
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/decorator.vm Mon Aug 22 15:23:39 2005
@@ -0,0 +1,49 @@
+## Copyright 2004 The Apache Software Foundation
+##
+## Licensed 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.
+#set($myPage = $jetspeed.page)
+#set($myF = $jetspeed.currentFragment)
+#set($myPE = $jetspeed.currentPortletEntity)
+#set($actions = $jetspeed.DecoratorActions)
+## Begin portlet/html/simple/decorator.vm
+<div id="${myF.id}" class="portlet-simple">
+##
+## Portlet Title Bar
+##
+<div class="PTitleContent">$jetspeed.getTitle($myPE, $myF)
+#foreach ($action in $actions)
+<a href="${action.Action}" title="${action.Name}"><img src="${action.Link}" alt="${action.Alt}" class="noborder"/></a>
+#end
+</div>
+##
+## Portlet Content
+##
+#if ($jetspeed.errors)
+#set($portletErrors = $jetspeed.errors)
+#end ## if ($jetspeed.errors)
+#if (!$jetspeed.isHidden($myF) || $jetspeed.WindowState != "minimized")
+<div class="PContent">
+#if($portletErrors && $portletErrors.size() > 0)
+The following errors ocurred:<br />
+#foreach($errorMsg in $portletErrors)
+<p class="portlet-msg-error">$errorMsg</p>
+#end ## foreach($errorMsg in $portletErrors)
+#end ## if($portletErrors && $portletErrors.size() > 0)
+$myF.renderedContent
+</div>
+#end ## if (!$jetspeed.isHidden($myF) || $jetspeed.WindowState != "minimized")
+##
+## Portlet Bottom
+##
+</div>
+## portlet/html/simple/decorator.vm
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/close.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/close.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/close.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/customize.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/customize.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/customize.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/edit.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/edit.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/edit.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/help.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/help.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/help.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_error_sml.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_error_sml.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_error_sml.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_info_sml.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_info_sml.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_info_sml.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_success_sml.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_success_sml.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_success_sml.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_warning_sml.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_warning_sml.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/icon_warning_sml.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info1.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info1.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/info1.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/leftnavbg.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/leftnavbg.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/leftnavbg.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/maximized.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/maximized.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/maximized.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/minimized.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/minimized.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/minimized.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/nw_maj_rond.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/nw_maj_rond.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/nw_maj_rond.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/print.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/print.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/print.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/restore.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/restore.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/restore.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/sw_med_rond.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/sw_med_rond.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/sw_med_rond.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/view.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/view.gif?rev=239262&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/trunk/src/webapp/WEB-INF/decorations/portlet/xhtml-basic/simple/images/view.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm?rev=239262&r1=239261&r2=239262&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/jetspeed_macros.vm Mon Aug 22 15:23:39 2005
@@ -5,16 +5,20 @@
#set($preferedLocale = $JS2RequestContext.locale)
#end
-#* Adds link for all style sheets required by the layout and portlet decorations *#
-#macro (includeHeaderResource)
- <script type="text/javascript">
+#* Adds javascript for PortletSelector on HTML *#
+#macro (includeJavaScriptForHead)
+ <script type="text/javascript"><!--
function openWindow(pipeline)
{
var vWinUsers = window.open(pipeline, 'PortletSelector', 'status=no,resizable=yes,width=500,height=600,scrollbars=yes');
vWinUsers.opener = self;
vWinUsers.focus();
}
- </script>
+ //--></script>
+#end
+
+#* Adds link for all style sheets required by the layout and portlet decorations *#
+#macro (includeHeaderResource)
#set($resourceHeaderFactory = $jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
#set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
$resourceHeader
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/default-page.psml Mon Aug 22 15:23:39 2005
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+<page>
+ <defaults
+ skin="orange"
+ layout-decorator="simple"
+ portlet-decorator="simple"
+ />
+ <title>Welcome to Jetspeed 2</title>
+ <metadata name="title" xml:lang="ja">Jetspeed 2 ã¸ãããã</metadata>
+
+ <fragment id="dp-xhtml-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="dp-xhtml-basic-11" type="portlet" name="security::LoginPortletForXHTMLBasic">
+ <property layout="OneColumn" name="row" value="0" />
+ </fragment>
+ <fragment id="dp-xhtml-basic-12" type="portlet" name="demo::BookmarkPortletForXHTMLBasic">
+ <property layout="OneColumn" name="row" value="1" />
+ </fragment>
+ </fragment>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</page>
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/admin/_mediatype/xhtml-basic/folder.metadata Mon Aug 22 15:23:39 2005
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<folder>
+ <title>Root Folder</title>
+ <metadata name="title" xml:lang="fr">Répertoire racine</metadata>
+ <metadata name="title" xml:lang="ja">ã«ã¼ããã©ã«ã</metadata>
+ <metadata name="title" xml:lang="es">Carpeta raiz</metadata>
+
+ <document-order>Jetspeed2.link</document-order>
+ <document-order>Jetspeed2Wiki.link</document-order>
+ <document-order>apache_portals.link</document-order>
+ <document-order>apache.link</document-order>
+
+ <menu name="page-navigations">
+ <separator>
+ <text>Top Pages</text>
+ <metadata name="text" xml:lang="fr">Page haut</metadata>
+ <metadata name="text" xml:lang="ja">ããããã¼ã¸</metadata>
+ <metadata name="text" xml:lang="es">Páginas más populares</metadata>
+ </separator>
+ <options>/Administrative</options>
+ </menu>
+
+ <!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+ <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
+ <menu name="additional-links" regexp="true" options="/*.link"/>
+
+ <security-constraints>
+ <security-constraints-ref>manager</security-constraints-ref>
+ </security-constraints>
+</folder>
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml Mon Aug 22 15:23:39 2005
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+<page>
+ <defaults
+ skin="orange"
+ layout-decorator="simple"
+ portlet-decorator="simple"
+ />
+ <title>Welcome to Jetspeed 2</title>
+ <metadata name="title" xml:lang="ja">Jetspeed 2 ã¸ãããã</metadata>
+
+ <fragment id="dp-xhtml-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="dp-xhtml-basic-11" type="portlet" name="security::LoginPortletForXHTMLBasic">
+ <property layout="OneColumn" name="row" value="0" />
+ </fragment>
+ <fragment id="dp-xhtml-basic-12" type="portlet" name="demo::BookmarkPortletForXHTMLBasic">
+ <property layout="OneColumn" name="row" value="1" />
+ </fragment>
+ </fragment>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</page>
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata?rev=239262&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/folder.metadata Mon Aug 22 15:23:39 2005
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<folder>
+ <title>Root Folder</title>
+ <metadata name="title" xml:lang="fr">Répertoire racine</metadata>
+ <metadata name="title" xml:lang="ja">ã«ã¼ããã©ã«ã</metadata>
+ <metadata name="title" xml:lang="es">Carpeta raiz</metadata>
+
+ <document-order>Jetspeed2.link</document-order>
+ <document-order>Jetspeed2Wiki.link</document-order>
+ <document-order>apache_portals.link</document-order>
+ <document-order>apache.link</document-order>
+
+ <menu name="page-navigations">
+ <separator>
+ <text>Top Pages</text>
+ <metadata name="text" xml:lang="fr">Page haut</metadata>
+ <metadata name="text" xml:lang="ja">ããããã¼ã¸</metadata>
+ <metadata name="text" xml:lang="es">Páginas más populares</metadata>
+ </separator>
+ <options>/Administrative</options>
+ </menu>
+
+ <!-- temporary menu definitions for jscookmenu layout decorator; will be standard -->
+ <menu name="site-navigations" regexp="true" options="/*/,/*.psml" depth="-1"/>
+ <menu name="additional-links" regexp="true" options="/*.link"/>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</folder>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org