mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Heinous merge from HEAD. Seems to basically work. Be on guard however.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
<cm:email></cm:email>
|
||||
<cm:organizationId></cm:organizationId>
|
||||
<cm:homeFolder>/${spaces.company_home.childname}</cm:homeFolder>
|
||||
<cm:homeFolderProvider>bootstrapHomeFolderProvider</cm:homeFolderProvider>
|
||||
</cm:person>
|
||||
<!-- Guest needs to read their own person information -->
|
||||
<cm:person view:childName="cm:person">
|
||||
@@ -39,10 +40,11 @@
|
||||
<cm:email></cm:email>
|
||||
<cm:organizationId></cm:organizationId>
|
||||
<cm:homeFolder>/${spaces.company_home.childname}/${spaces.guest_home.childname}</cm:homeFolder>
|
||||
<cm:homeFolderProvider>bootstrapHomeFolderProvider</cm:homeFolderProvider>
|
||||
</cm:person>
|
||||
</sys:children>
|
||||
</sys:container>
|
||||
<cm:folder view:childName="${system.workflow_container.childname}"/>
|
||||
<sys:container view:childName="${system.workflow_container.childname}"/>
|
||||
</sys:children>
|
||||
</sys:container>
|
||||
|
||||
|
@@ -2,24 +2,12 @@
|
||||
xmlns:cm="http://www.alfresco.org/model/content/1.0"
|
||||
xmlns:app="http://www.alfresco.org/model/application/1.0">
|
||||
|
||||
<!--
|
||||
<cm:folder>
|
||||
<app:uifacets />
|
||||
<cm:name>${tutorial.space.name}</cm:name>
|
||||
<cm:description>${tutorial.space.description}</cm:description>
|
||||
<app:icon>space-icon-doc</app:icon>
|
||||
<cm:contains>
|
||||
-->
|
||||
<cm:content>
|
||||
<app:uifacets />
|
||||
<cm:name>${tutorial.document.name}</cm:name>
|
||||
<cm:title>${tutorial.document.title}</cm:title>
|
||||
<cm:description>${tutorial.document.description}</cm:description>
|
||||
<cm:content>contentUrl=classpath:alfresco/bootstrap/${tutorial.document.name}|mimetype=application/pdf|size=|encoding=</cm:content>
|
||||
</cm:content>
|
||||
<!--
|
||||
</cm:contains>
|
||||
</cm:folder>
|
||||
-->
|
||||
<cm:content>
|
||||
<app:uifacets />
|
||||
<cm:name>${tutorial.document.name}</cm:name>
|
||||
<cm:title>${tutorial.document.title}</cm:title>
|
||||
<cm:description>${tutorial.document.description}</cm:description>
|
||||
<cm:content>contentUrl=classpath:alfresco/bootstrap/Alfresco-Tutorial.pdf|mimetype=application/pdf|size=|encoding=</cm:content>
|
||||
</cm:content>
|
||||
|
||||
</view:view>
|
||||
|
Reference in New Issue
Block a user