LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjusted to r2062. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2063 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2013-02-09 14:58:15 +00:00
parent bbff4ab565
commit 1454ccd01f
7 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-bundle/bundles/base/cfg/project.xml
View File

@ -80,10 +80,12 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Content Assets --> <!-- Content Assets -->
<!--
<ccm:application name="ccm-cms-assets-fileattachment"/> <ccm:application name="ccm-cms-assets-fileattachment"/>
<ccm:application name="ccm-cms-assets-imagestep"/> <ccm:application name="ccm-cms-assets-imagestep"/>
<ccm:application name="ccm-cms-assets-notes"/> <ccm:application name="ccm-cms-assets-notes"/>
<ccm:application name="ccm-cms-assets-relatedlink"/> <ccm:application name="ccm-cms-assets-relatedlink"/>
-->
<!-- CMS Content Types --> <!-- CMS Content Types -->
<!-- <!--
@ -125,7 +127,9 @@
--> -->
<!-- <!--
<ccm:application name="ccm-portalserver"/> <ccm:application name="ccm-portalserver"/>
-->
<ccm:application name="ccm-portalworkspace-homepage"/> <ccm:application name="ccm-portalworkspace-homepage"/>
<!--
<ccm:application name="ccm-weblog"/> <ccm:application name="ccm-weblog"/>
<ccm:application name="ccm-webpage"/> <ccm:application name="ccm-webpage"/>
--> -->

4
ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
View File

@ -4,7 +4,9 @@
xmlns:show="/WEB-INF/bebop-show.tld" xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2"> version="1.2">
<!-- JSP template to use a portal page as index page in navigation --> <!-- JSP template to use a portal page as index page in navigation
Currently the same as gen-portal.jsp, may change in future to
support special features of a site's start page (home page) -->
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/> <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.navigation.Navigation"/> <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>

0
ccm-bundle/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl → ccm-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
View File

0
ccm-ldn-aplaws/web/themes/static/aplaws/portal-workspace-portal-admin.xsl → ccm-ldn-aplaws/web/themes/static/aplaws/portal-workspace-admin.xsl
View File

8
ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/HomepageWorkspace.java
View File

@ -24,12 +24,12 @@ import com.arsdigita.portalworkspace.ui.PersistentPortal;
import com.arsdigita.portalworkspace.Workspace; import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party; import com.arsdigita.kernel.Party;
import com.arsdigita.portalworkspace.WorkspacePage;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -55,7 +55,7 @@ public class HomepageWorkspace extends SimpleContainer {
private String m_name; private String m_name;
public HomepageWorkspace() { public HomepageWorkspace() {
super("portal:homepageWorkspace", PortalConstants.PORTAL_XML_NS); super("portal:homepageWorkspace", WorkspacePage.PORTAL_XML_NS);
m_customizable = false; m_customizable = false;
if (s_log.isDebugEnabled()) { if (s_log.isDebugEnabled()) {
@ -93,10 +93,10 @@ public class HomepageWorkspace extends SimpleContainer {
m_browser = new PersistentPortal(m_model, m_browser = new PersistentPortal(m_model,
m_name, m_name,
PortalConstants.MODE_DISPLAY); WorkspacePage.MODE_DISPLAY);
m_editor = new PersistentPortal(m_model, m_editor = new PersistentPortal(m_model,
m_name, m_name,
PortalConstants.MODE_EDITOR); WorkspacePage.MODE_EDITOR);
m_edit.addActionListener(new ActionListener() { m_edit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

11
ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/custom.jsp
View File

@ -1,7 +1,7 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:define="/WEB-INF/bebop-define.tld" xmlns:define="/WEB-INF/bebop-define.tld"
xmlns:show="/WEB-INF/bebop-show.tld" xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2"> version="1.2">
<jsp:directive.page <jsp:directive.page
import="com.arsdigita.dispatcher.DispatcherHelper, import="com.arsdigita.dispatcher.DispatcherHelper,
@ -11,7 +11,8 @@
DispatcherHelper.cacheDisable(response); DispatcherHelper.cacheDisable(response);
</jsp:scriptlet> </jsp:scriptlet>
<define:page name="itemPage" application="portal" title="OpenCCM" cache="true"> <define:page name="itemPage" application="portal"
title="OpenCCM" cache="true">
<define:component name="left" <define:component name="left"
classname="com.arsdigita.portalworkspace.ui.homepage.HomepageWorkspace" /> classname="com.arsdigita.portalworkspace.ui.homepage.HomepageWorkspace" />

6
ccm-portalworkspace-homepage/web/templates/ccm-portalworkspace/portal/index.jsp
View File

@ -1,7 +1,7 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:define="/WEB-INF/bebop-define.tld" xmlns:define="/WEB-INF/bebop-define.tld"
xmlns:show="/WEB-INF/bebop-show.tld" xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2"> version="1.2">
<jsp:directive.page <jsp:directive.page
import="com.arsdigita.dispatcher.DispatcherHelper, import="com.arsdigita.dispatcher.DispatcherHelper,