[HippoCMS-svn] [20634] hippo-collab: COLLAB-2

View: New views

1 Messages — Rating Filter: Alert me

[HippoCMS-svn] [20634] hippo-collab: COLLAB-2

by rbijlsma :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Revision: 20634
Author: dtaylor
Date: 2009-11-12 04:36:34 +0100 (Thu, 12 Nov 2009)
Log Message:
-----------
COLLAB-2
simplifying demo a bit

Modified Paths:
--------------
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/cmsconsole.psml
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/default-page.psml
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/folder.metadata
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Widgets/default-page.psml

Added Paths:
-----------
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/browser.psml
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Widgets/

Removed Paths:
-------------
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/cms.psml
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CRM/
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Documentation/
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/HumanResources/
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/InternalProcesses/
hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Maintenance/

Property changes on: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS
___________________________________________________________________
Added: svn:mergeinfo
+

Copied: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/browser.psml (from rev 20632, hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Maintenance/cms.psml)
===================================================================
--- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/browser.psml (rev 0)
+++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/browser.psml 2009-11-12 03:36:34 UTC (rev 20634)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<page id="/cms.psml" hidden="false">
+ <title>Doc Browser</title>
+ <short-title>CMS</short-title>
+ <fragment id="cms-1000" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="cms-1001" type="portlet" name="cms::WelcomeCollab">
+ <property layout="OneColumn" name="row" value="0" />
+ <property layout="OneColumn" name="column" value="0" />
+ </fragment>
+ <fragment id="cms-1002" type="portlet" name="wiki::DocumentBrowserPortlet">
+ <property layout="OneColumn" name="row" value="1"></property>
+ <property layout="OneColumn" name="column" value="0"></property>
+ </fragment>
+ </fragment>
+</page>
\ No newline at end of file

Property changes on: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/browser.psml
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native

Deleted: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/cms.psml
===================================================================
--- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Maintenance/cms.psml 2009-11-11 21:16:55 UTC (rev 20632)
+++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/cms.psml 2009-11-12 03:36:34 UTC (rev 20634)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<page id="/cms.psml" hidden="false">
- <security-constraints>
- <security-constraints-ref>users</security-constraints-ref>
- </security-constraints>
- <title>CMS</title>
- <short-title>CMS</short-title>
- <fragment id="cms" type="layout" name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="cms-cmsmain" type="portlet" name="cms::HippoCMSPortlet">
- <property name="row" value="0"></property>
- <property name="height" value="200.0"></property>
- <property name="column" value="0"></property>
- </fragment>
- </fragment>
-</page>
\ No newline at end of file

Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/cmsconsole.psml
===================================================================
--- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Maintenance/cmsconsole.psml 2009-11-11 21:16:55 UTC (rev 20632)
+++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/cmsconsole.psml 2009-11-12 03:36:34 UTC (rev 20634)
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<page id="/cmsconsole.psml" hidden="false">
- <security-constraints>
- <security-constraints-ref>users</security-constraints-ref>
- </security-constraints>
<title>CMS Console</title>
<short-title>CMS Console</short-title>
<fragment id="cms" type="layout" name="jetspeed-layouts::VelocityOneColumn">

Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/default-page.psml
===================================================================
--- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Maintenance/default-page.psml 2009-11-11 21:16:55 UTC (rev 20632)
+++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/default-page.psml 2009-11-12 03:36:34 UTC (rev 20634)
@@ -1,18 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<page hidden="false">
- <security-constraints>
- <security-constraints-ref>users</security-constraints-ref>
- </security-constraints>
- <title>CMS Home</title>
+ <title>CMS</title>
<short-title>CMS</short-title>
- <fragment id="cms-1000" type="layout" name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="cms-1001" type="portlet" name="cms::WelcomeCollab">
- <property layout="OneColumn" name="row" value="0" />
- <property layout="OneColumn" name="column" value="0" />
+ <fragment id="cms" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+ <fragment id="cms-cmsmain" type="portlet" name="cms::HippoCMSPortlet">
+ <property name="row" value="0"></property>
+ <property name="height" value="200.0"></property>
+ <property name="column" value="0"></property>
</fragment>
- <fragment id="cms-1002" type="portlet" name="wiki::DocumentBrowserPortlet">
- <property layout="OneColumn" name="row" value="1"></property>
- <property layout="OneColumn" name="column" value="0"></property>
- </fragment>
</fragment>
</page>
\ No newline at end of file

Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/folder.metadata
===================================================================
--- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Maintenance/folder.metadata 2009-11-11 21:16:55 UTC (rev 20632)
+++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/CMS/folder.metadata 2009-11-12 03:36:34 UTC (rev 20634)
@@ -18,7 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/folder-metadata.xsd">

- <title>CMS Home</title>
+ <title>CMS</title>
<metadata name='space-owner' xml:lang='en'>admin</metadata>
<security-constraints>
<security-constraints-ref>users</security-constraints-ref>

Property changes on: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Widgets
___________________________________________________________________
Added: svn:mergeinfo
+

Modified: hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Widgets/default-page.psml
===================================================================
--- hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Documentation/default-page.psml 2009-11-11 21:16:55 UTC (rev 20632)
+++ hippo-collab/trunk/portal/src/main/webapp/WEB-INF/pages/Widgets/default-page.psml 2009-11-12 03:36:34 UTC (rev 20634)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<page hidden="false">
- <title>Documentation</title>
- <short-title>Documentation</short-title>
+ <title>Widget Center</title>
+ <short-title>Widgets</short-title>
<fragment id="doc-1000" type="layout" name="jetspeed-layouts::VelocityOneColumn">
<fragment id="doc-1001" type="portlet" name="cms::WelcomeCollab">
<property layout="OneColumn" name="row" value="0" />

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@...
http://lists.hippo.nl/mailman/listinfo/hippocms-svn