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 ta...@apache.org on 2010/03/13 04:24:49 UTC
svn commit: r922475 - in
/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages:
desktop.psml template.tpsml
Author: taylor
Date: Sat Mar 13 03:24:48 2010
New Revision: 922475
URL: http://svn.apache.org/viewvc?rev=922475&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1121
provide a "desktop" sample of all detached portlets on a page
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml (with props)
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml
Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml?rev=922475&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml Sat Mar 13 03:24:48 2010
@@ -0,0 +1,116 @@
+<?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.
+-->
+<page id="desktop.psml" hidden="false"
+ 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/psml.xsd">
+ <title>Desktop</title>
+ <fragment id="jsdesktop-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="jsdesktop-12" type="portlet" name="j2-admin::LoginPortlet">
+ <property name="row" value="0"></property>
+ <property name="column" value="0"></property>
+ <property name="x" value="114.0"></property>
+ <property name="y" value="215.0"></property>
+ <property name="width" value="137.0"></property>
+ <property name="height" value="68.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-3" type="portlet" name="j2-admin::LocaleSelector">
+ <property name="row" value="0"></property>
+ <property name="column" value="1"></property>
+ <property name="x" value="82.0"></property>
+ <property name="y" value="965.1667"></property>
+ <property name="width" value="312.0"></property>
+ <property name="height" value="66.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-22" type="portlet" name="j2-admin::ForgottenPasswordPortlet">
+ <property name="row" value="1"></property>
+ <property name="column" value="0"></property>
+ <property name="x" value="489.0"></property>
+ <property name="y" value="956.0"></property>
+ <property name="width" value="677.0"></property>
+ <property name="height" value="87.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-23" type="portlet" name="j2-admin::UserRegistrationPortlet">
+ <property name="row" value="1"></property>
+ <property name="column" value="1"></property>
+ <property name="x" value="82.0"></property>
+ <property name="y" value="965.1667"></property>
+ <property name="width" value="385.0"></property>
+ <property name="height" value="364.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment-reference id="jsdesktop-24-wp-reference" refid="wp-definition">
+ <property name="row" value="2"></property>
+ <property name="column" value="0"></property>
+ <property name="x" value="75.0"></property>
+ <property name="y" value="716.1667"></property>
+ <property name="width" value="173.0"></property>
+ <property name="height" value="123.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment-reference>
+ <fragment id="jsdesktop-7" type="portlet" name="demo::PickANumberPortlet">
+ <property name="row" value="2"></property>
+ <property name="column" value="1"></property>
+ <property name="x" value="443.0"></property>
+ <property name="y" value="647.1667"></property>
+ <property name="width" value="244.0"></property>
+ <property name="height" value="136.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-16" type="portlet" name="demo::RoleSecurityTest">
+ <property name="row" value="3"></property>
+ <property name="column" value="0"></property>
+ <property name="x" value="257.0"></property>
+ <property name="y" value="237.0"></property>
+ <property name="width" value="289.0"></property>
+ <property name="height" value="167.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-17" type="portlet" name="demo::UserInfoTest">
+ <property name="row" value="3"></property>
+ <property name="column" value="1"></property>
+ <property name="x" value="189.0"></property>
+ <property name="y" value="1369.1666"></property>
+ <property name="width" value="310.0"></property>
+ <property name="height" value="213.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-18" type="portlet" name="demo::BookmarkPortlet">
+ <property name="row" value="4"></property>
+ <property name="column" value="0"></property>
+ <property name="x" value="277.0"></property>
+ <property name="y" value="710.0"></property>
+ <property name="width" value="228.0"></property>
+ <property name="height" value="117.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ <fragment id="jsdesktop-19" type="portlet" name="j2-admin::DateTimePortlet">
+ <property name="row" value="4"></property>
+ <property name="column" value="1"></property>
+ <property name="x" value="83.0"></property>
+ <property name="y" value="1520.1667"></property>
+ <property name="width" value="141.0"></property>
+ <property name="height" value="27.0"></property>
+ <property name="state" value="detach"></property>
+ </fragment>
+ </fragment>
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+</page>
\ No newline at end of file
Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/desktop.psml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml?rev=922475&r1=922474&r2=922475&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml Sat Mar 13 03:24:48 2010
@@ -46,12 +46,9 @@
<property name="state" value="normal"></property>
<property name="tool" value="true"></property>
</fragment>
- </fragment>
-
-<!--
- <fragment-reference id="page-template-wp-reference" refid="wp-definition">
+ </fragment>
+ <fragment-reference id="wp-reference" refid="wp-definition">
<property name="row" value="1"/>
</fragment-reference>
- -->
</fragment>
</page-template>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org