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

Fehlerbereinigung zu r2195. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2200 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2013-06-10 09:25:35 +00:00
parent 8fd07ec451
commit 20f5c173c7
8 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml
View File

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<!-- NOTE: This file is read only once during load step. Later modification
require to dreate (load) the database again (or manually modify the
affected database tables). -->
<ctd:content-type label="FAQ Item"
description="An FAQ item type"
objectType="com.arsdigita.cms.contenttypes.FAQItem"
classname="com.arsdigita.cms.contenttypes.FAQItem">
<!-- Overwrite the standard pageCreate class to customize and include
additional content type specific widgets. -->
<ctd:authoring-kit
createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
<!--
<ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
-->
<ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
-->
<ctd:authoring-step
labelKey="cms.contenttypes.shared.basic_properties.title"

8
ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/FAQItemPropertyForm.java
View File

@ -19,7 +19,7 @@
package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.cms.contenttypes.FAQItem;
import com.arsdigita.cms.contenttypes.util.InlinesiteGlobalizationUtil;
import com.arsdigita.cms.contenttypes.util.FAQGlobalizationUtil;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener;
@ -85,7 +85,7 @@ public class FAQItemPropertyForm extends BasicPageForm
protected void addWidgets() {
super.addWidgets();
add( new Label(InlinesiteGlobalizationUtil
add( new Label(FAQGlobalizationUtil
.globalize("cms.contenttypes.ui.faq.question")) );
ParameterModel questionParam
= new StringParameter( QUESTION );
@ -96,7 +96,7 @@ public class FAQItemPropertyForm extends BasicPageForm
question.setRows( 5 );
add( question );
add( new Label(InlinesiteGlobalizationUtil
add( new Label(FAQGlobalizationUtil
.globalize("cms.contenttypes.ui.faq.answer")) );
ParameterModel answerParam = new StringParameter( ANSWER );
answerParam
@ -106,7 +106,7 @@ public class FAQItemPropertyForm extends BasicPageForm
answer.setRows( 5 );
add( answer );
add( new Label(InlinesiteGlobalizationUtil
add( new Label(FAQGlobalizationUtil
.globalize("cms.contenttypes.ui.faq.sectionName")) );
ParameterModel sectionNameParam = new StringParameter( SECTION_NAME );
TextField sectionName = new TextField(sectionNameParam);

24
ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java
View File

@ -18,13 +18,6 @@
*/
package com.arsdigita.cms.contenttypes.ui.authoring;
import com.arsdigita.cms.contenttypes.FAQItem;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.ui.authoring.PageCreate;
import com.arsdigita.cms.ui.authoring.CreationSelector;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.event.FormSectionEvent;
@ -32,11 +25,20 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.PageState;
import com.arsdigita.cms.contenttypes.util.InlinesiteGlobalizationUtil;
import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.contenttypes.FAQItem;
import com.arsdigita.cms.contenttypes.util.FAQGlobalizationUtil;
import com.arsdigita.cms.Folder;
import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.ui.authoring.PageCreate;
import com.arsdigita.cms.ui.authoring.CreationSelector;
/**
* A page that will create a new FAQItem.
* A page that will create a new FAQItem. It overwrites the default PageCreate
* class to to customize the creation screen, and include 2 additional widgets
* (question and answer).
*
* @author Dirk Gomez
* @see com.arsdigita.intranet.cms.FAQItem
@ -75,7 +77,7 @@ public class FAQItemCreate extends PageCreate {
question.setCols(40);
question.setRows(5);
add(new Label(InlinesiteGlobalizationUtil
add(new Label(FAQGlobalizationUtil
.globalize("cms.contenttypes.ui.faq.question")));
add(question);
@ -84,7 +86,7 @@ public class FAQItemCreate extends PageCreate {
answer.setCols(40);
answer.setRows(5);
add(new Label(InlinesiteGlobalizationUtil
add(new Label(FAQGlobalizationUtil
.globalize("cms.contenttypes.ui.faq.answer")));
add(answer);
}

5
ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java
View File

@ -40,8 +40,8 @@ import org.apache.log4j.Logger;
* A form which will create a new ContentPage or one of its subclasses.
*
* Used to create a new document / content item. Creates widgets to select the
* workflow, type of content item, and language. Super class adds additional
* widgets (title and name/url) to complete the form.
* workflow, and language. It displays the type of document as well. Super class
* adds additional widgets (title and name/url) to complete the form.
*
* It's a pane which is part of a more complex page, additionally containing
* folder structure, content items in the folder, permissions, etc.
@ -104,6 +104,7 @@ public class PageCreate extends BasicPageForm
/* language selection */
add(new Label(GlobalizationUtil.globalize("cms.ui.language.field")));
add(new LanguageWidget(LANGUAGE));
/* Additional widgets from super type: title and name (url) */
super.addWidgets();
}

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

@ -196,6 +196,8 @@ public class Label extends BlockStylable implements Cloneable {
*
* @param label The new label text; will be used as a key into the current
* ResourceBundle if possible, or displayed literally.
* @deprecated refactor to use
* @see setLabel(GlobalizedMessage) instead!
*/
public void setLabel(String label) {
setLabel(label, null);

16
ccm-core/src/com/arsdigita/bebop/Table.java
View File

@ -41,10 +41,10 @@ import javax.servlet.ServletException;
import org.apache.log4j.Logger;
/**
* Displays statically or
* dynamically generated data in tabular form. The data is retrieved
* from a <code>TableModel</code>. <p>
* Displays statically or dynamically generated data in tabular form.
* The data is retrieved from a <code>TableModel</code>.
*
* <p>
* This class is similar to the {@link List} class, but it has two dimensions.
* The table consists of a {@link TableModelBuilder}, a {@link TableColumnModel},
* a {@link TableHeader} and a {@link TableCellRenderer} for each column.
@ -803,11 +803,11 @@ public class Table extends BlockStylable implements BebopConstants {
}
/**
* An internal class
* that creates a table model around a set of data given as a
* <code>Object[][]</code>. The table models produced by this
* builder use row numbers, converted to strings, as the key for
* each column of a row. */
* An internal class that creates a table model around a set of data given
* as a <code>Object[][]</code>. The table models produced by this builder
* use row numbers, converted to strings, as the key for each column of a
* row.
*/
public static class MatrixTableModelBuilder
extends AbstractTableModelBuilder {

9
ccm-core/src/com/arsdigita/bebop/table/TableHeader.java
View File

@ -34,10 +34,11 @@ import com.arsdigita.util.Assert;
import com.arsdigita.xml.Element;
/**
* This class is used by {@link Table} in order to maintain its
* headers. <code>TableHeader</code> is responsible for setting
* the control event in order to notify the {@link Table} when one
* of the column headers is clicked.
* This class is used by {@link Table} in order to maintain its headers.
*
* <code>TableHeader</code> is responsible for setting the control event
* in order to notify the {@link Table} when one of the column headers
* is clicked.
*
* @author David Lutterkort
* @version $Id: TableHeader.java 1638 2007-09-17 11:48:34Z chrisg23 $