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

Diverse kleine Anpassungen / Ergaenzungen, Folge der Ueberarbeitung von Forum. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@532 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2010-09-13 10:36:06 +00:00
parent cf586f9cd0
commit afaff626c9
12 changed files with 108 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms/web/assets/Xinha/plugins/CCMInsertImage/placeholder.txt 100644
View File

@ -0,0 +1 @@
Directory for the CCMInsertImage plugin.

1
ccm-cms/web/assets/Xinha/plugins/CCMInsertLink/placeholder.txt 100644
View File

@ -0,0 +1 @@
Directory for the CCMInsertLink plugin.

2
ccm-core/src/com/arsdigita/bebop/form/Option.java
View File

@ -49,7 +49,7 @@ public class Option extends BlockStylable {
/**
* This creates an Option whose component is a lable consisting of the
* This creates an Option whose component is a label consisting of the
* string that is passed in.
*/
public Option(String value, String label) {

3
ccm-core/src/com/arsdigita/bebop/form/OptionGroup.java
View File

@ -37,8 +37,7 @@ import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.log4j.Logger;
/**
* A class
* representing any widget that contains a list options.
* A class representing any widget that contains a list options.
*
* @author Karl Goldstein
* @author Uday Mathur

2
ccm-core/src/com/arsdigita/globalization/GlobalizedMessage.java
View File

@ -162,7 +162,6 @@ public class GlobalizedMessage {
/**
* <p>
* <br>
* Localize this message. If no message is found the key is returned as
* the message. This is done so that developers or translators can see the
* messages that still need localization.
@ -185,7 +184,6 @@ public class GlobalizedMessage {
/**
* <p>
* <br>
* Localize this message according the specified request. If no message is
* found the key is returned as the message. This is done so that
* developers or translators can see the messages that still need

6
ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java
View File

@ -37,7 +37,7 @@ import java.util.Map;
* @author Oumi Mehrotra
* @version 1.0
* @version $Id: PrivilegeDescriptor.java 1311 2006-09-04 10:30:53Z sskracic $
**/
*/
public class PrivilegeDescriptor {
private static final String ADMIN_NAME = "admin";
@ -50,7 +50,8 @@ public class PrivilegeDescriptor {
/**
* The PrivilegeDescriptor corresponding to the primitive admin privilege
*/
public static final PrivilegeDescriptor ADMIN = new PrivilegeDescriptor(ADMIN_NAME);
public static final PrivilegeDescriptor ADMIN =
new PrivilegeDescriptor(ADMIN_NAME);
/**
* The PrivilegeDescriptor corresponding to the read and write privilege
@ -80,6 +81,7 @@ public class PrivilegeDescriptor {
* The PrivilegeDescriptor corresponding to the primitive delete privilege
*/
public static final PrivilegeDescriptor DELETE =
// new PrivilegeDescriptor(DELETE_NAME);
new PrivilegeDescriptor(DELETE_NAME);
private String m_displayName;

24
ccm-forum-categorised/src/com/arsdigita/forum/categorised/AssignCategoryView.java
View File

@ -1,8 +1,20 @@
/*
* Created on 09-Feb-06
* Copyright (C) 2006 Chris Gilbert. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* To change the template for this generated file go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*/
package com.arsdigita.forum.categorised;
@ -25,10 +37,10 @@ import com.arsdigita.forum.ui.Constants;
import com.arsdigita.web.RedirectSignal;
/**
* To change the template for this generated type comment go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments.
*
* @author cgyg9330
*
*
* @author Chris Gilbert
* @version $Id: $
*/
public class AssignCategoryView extends SimpleContainer implements Constants {

29
ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedForumComponent.java
View File

@ -1,8 +1,20 @@
/*
* Created on 09-Feb-06
* Copyright (C) 2006 Chris Gilbert. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* To change the template for this generated file go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*/
package com.arsdigita.forum.categorised;
@ -11,7 +23,7 @@ package com.arsdigita.forum.categorised;
import com.arsdigita.bebop.PageState;
import com.arsdigita.forum.Forum;
import com.arsdigita.forum.ForumContext;
import com.arsdigita.forum.ui.ForumComponent;
import com.arsdigita.forum.ui.ForumUserCompactView;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
@ -21,13 +33,13 @@ import com.arsdigita.kernel.security.UserContext;
import com.arsdigita.xml.Element;
/**
* To change the template for this generated type comment go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*
* @author cgyg9330
*
*
* @author Chris Gilbert
* @version $Id: $
*/
public class CategorisedForumComponent extends ForumComponent {
public class CategorisedForumComponent extends ForumUserCompactView {
public static final String MODE_CATEGORIES = "categories";
@ -41,7 +53,6 @@ public class CategorisedForumComponent extends ForumComponent {
m_categoryView = new AssignCategoryView();
add(m_categoryView);
// TODO Auto-generated constructor stub
}
protected void setVisible(

4
ccm-forum-categorised/src/com/arsdigita/forum/categorised/CategorisedForumPageBuilder.java
View File

@ -11,7 +11,7 @@ import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.forum.Forum;
import com.arsdigita.forum.ForumContext;
import com.arsdigita.forum.ForumPageBuilder;
import com.arsdigita.forum.ui.ForumComponent;
import com.arsdigita.forum.ui.ForumUserCompactView;
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.london.navigation.ui.category.Menu;
import com.arsdigita.london.navigation.ui.category.Path;
@ -36,7 +36,7 @@ public class CategorisedForumPageBuilder extends ForumPageBuilder {
}
protected ForumComponent getForumComponent() {
protected ForumUserCompactView getForumComponent() {
return new CategorisedForumComponent();
}

22
ccm-forum-categorised/src/com/arsdigita/forum/categorised/ForumCategorySummary.java
View File

@ -1,8 +1,20 @@
/*
* Created on 22-Feb-06
* Copyright (C) 2006 Chris Gilbert. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* To change the template for this generated file go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*/
package com.arsdigita.forum.categorised;
@ -16,10 +28,10 @@ import com.arsdigita.forum.ui.Constants;
import com.arsdigita.kernel.ACSObject;
/**
* @author cgyg9330
*
* To change the template for this generated type comment go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*
* @author Chris Gilbert (cgyg9330)
*/
public class ForumCategorySummary extends ACSObjectCategorySummary implements Constants {

25
ccm-forum-categorised/src/com/arsdigita/forum/categorised/ForumNavigationModel.java
View File

@ -1,8 +1,20 @@
/*
* Created on 04-Aug-05
* Copyright (C) 2006 Chris Gilbert. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* To change the template for this generated file go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*/
package com.arsdigita.forum.categorised;
@ -26,10 +38,11 @@ import com.arsdigita.london.terms.Util;
import com.arsdigita.web.Application;
/**
* @author cgyg9330
* Navigation model that retrieves the path to one navigation category that the
* forum is allocated to if there is no cookie available
*
* Navigation model that retrieves the path to one navigation category that the forum is allocated to
* if there is no cookie available
* @author Chris Gilbert (cgyg9330)
* @version $Id: $
*/
public class ForumNavigationModel extends CookieNavigationModel {

27
ccm-forum-categorised/src/com/arsdigita/forum/categorised/Initializer.java
View File

@ -17,10 +17,10 @@
*
*/
package com.arsdigita.forum.categorised;
import com.arsdigita.db.DbHelper;
import com.arsdigita.bebop.RequestLocal;
// import com.arsdigita.db.DbHelper;
// import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.domain.xml.TraversalHandler;
// import com.arsdigita.domain.xml.TraversalHandler;
import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.pdl.NameFilter;
@ -62,7 +62,7 @@ import com.arsdigita.web.ui.ApplicationConfigFormSection;
import org.apache.log4j.Logger;
/**
* The forum initializer.
* The forum-categorized initializer.
*
* @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: Initializer.java,v 1.1 2006/03/03 10:54:45 cgyg9330 Exp $
@ -71,14 +71,21 @@ public class Initializer extends CompoundInitializer {
private static final Logger s_log = Logger.getLogger(Initializer.class);
public void init(LegacyInitEvent e) {
super.init(e);
ForumPageFactory.registerPageBuilder(ForumPageFactory.FORUM_PAGE, new CategorisedForumPageBuilder());
ForumPageFactory.registerPageBuilder(ForumPageFactory.THREAD_PAGE, new CategorisedThreadPageBuilder());
ForumPageFactory.registerPageBuilder("load-cat.jsp", new CategorySubtreePageBuilder());
URLService.registerFinder(Forum.BASE_DATA_OBJECT_TYPE, new ForumURLFinder());
ForumPageFactory.registerPageBuilder(
ForumPageFactory.FORUM_PAGE,
new CategorisedForumPageBuilder());
ForumPageFactory.registerPageBuilder(
ForumPageFactory.THREAD_PAGE,
new CategorisedThreadPageBuilder());
ForumPageFactory.registerPageBuilder(
"load-cat.jsp",
new CategorySubtreePageBuilder());
URLService.registerFinder(
Forum.BASE_DATA_OBJECT_TYPE,
new ForumURLFinder());
}