Author: taylor
Date: Mon Feb 22 17:50:06 2010
New Revision: 914985
URL: http://svn.apache.org/viewvc?rev=914985&view=rev
Log:
postpone nested layouts until next phase of development
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml
(with props)
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/default-page.psml
Added:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml?rev=914985&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml
(added)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml
Mon Feb 22 17:50:06 2010
@@ -0,0 +1,40 @@
+<?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="default-page"
+ 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>About Jetspeed</title>
+
+ <fragment id="jsabout-10" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="jsabout-11" type="portlet"
name="j2-admin::WelcomeToJetspeed">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="0" />
+ </fragment>
+ <fragment id="jsbout-12" type="portlet" name="j2-admin::AboutJetspeed">
+ <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="column" value="1" />
+ </fragment>
+ </fragment>
+
+ <security-constraints>
+ <security-constraints-ref>public-view</security-constraints-ref>
+ </security-constraints>
+
+</page>
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/about.psml
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/default-page.psml?rev=914985&r1=914984&r2=914985&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/default-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/default-page.psml
Mon Feb 22 17:50:06 2010
@@ -29,33 +29,20 @@
<metadata name="title" xml:lang="zh-TW">æ¡è¿ä¾å°Jetspeed 2</metadata>
<metadata name="title" xml:lang="ko">Jetspeed 2 ì ì¤ì ê²ì
íìí©ëë¤</metadata>
-<fragment id="jsmin-1" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
<fragment id="jsmin-2" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="jsmin-3" type="portlet" name="j2-admin::LoginPortlet">
- <property layout="ThreeColumns" name="row" value="1" />
- <property layout="ThreeColumns" name="column" value="0" />
+ <property name="row" value="0" />
+ <property name="column" value="0" />
</fragment>
<fragment id="jsmin-4" type="portlet" name="j2-admin::LocaleSelector">
- <property layout="ThreeColumns" name="row" value="0" />
- <property layout="ThreeColumns" name="column" value="0" />
+ <property name="row" value="0" />
+ <property name="column" value="1" />
</fragment>
<fragment id="jsmin-5" type="portlet"
name="j2-admin::ForgottenPasswordPortlet">
- <property layout="ThreeColumns" name="row" value="0" />
- <property layout="ThreeColumns" name="column" value="2" />
- </fragment>
+ <property name="row" value="1" />
+ <property name="column" value="1" />
+ </fragment>
</fragment>
- <fragment id="jsmin-10" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
- <fragment id="jsmin-11" type="portlet"
name="j2-admin::WelcomeToJetspeed">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="0" />
- </fragment>
- <fragment id="jsmin-12" type="portlet" name="j2-admin::AboutJetspeed">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
- </fragment>
- </fragment>
-
<security-constraints>
<security-constraints-ref>public-view</security-constraints-ref>
</security-constraints>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
