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

Anpassung und Vervollständigung ResourceBundles sowie Sprachumschaltung abgeschlossen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2191 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2013-06-09 17:37:19 +00:00
parent 259f4dbc59
commit 1fff55e55e
2 changed files with 99 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertiesStep.java
View File

@ -48,6 +48,7 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.BasicPageForm;
import com.arsdigita.cms.ui.authoring.SimpleEditStep; import com.arsdigita.cms.ui.authoring.SimpleEditStep;
import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.globalization.GlobalizationHelper;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -74,7 +75,8 @@ public class ImagePropertiesStep extends SimpleEditStep {
private final String UPLOAD = "upload"; private final String UPLOAD = "upload";
private ImageUploadComponent uploadSheet; private ImageUploadComponent uploadSheet;
public ImagePropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) { public ImagePropertiesStep(ItemSelectionModel itemModel,
AuthoringKitWizard parent) {
super(itemModel, parent); super(itemModel, parent);
setDefaultEditKey(EDIT_SHEET_NAME); setDefaultEditKey(EDIT_SHEET_NAME);
@ -122,10 +124,12 @@ public class ImagePropertiesStep extends SimpleEditStep {
DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel); DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.name"), Image.NAME); sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.title"), Image.TITLE);
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.title"), Image.TITLE); sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.name"),
Image.NAME);
if (!ContentSection.getConfig().getHideLaunchDate()) { if (!ContentSection.getConfig().getHideLaunchDate()) {
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.launch_date"), sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.launch_date"),
ContentPage.LAUNCH_DATE, ContentPage.LAUNCH_DATE,
new DomainObjectPropertySheet.AttributeFormatter() { new DomainObjectPropertySheet.AttributeFormatter() {
@ -137,19 +141,28 @@ public class ImagePropertiesStep extends SimpleEditStep {
if (page.getLaunchDate() != null) { if (page.getLaunchDate() != null) {
return DateFormat.getDateInstance(DateFormat.LONG).format(page.getLaunchDate()); return DateFormat.getDateInstance(DateFormat.LONG).format(page.getLaunchDate());
} else { } else {
return (String) ImageGlobalizationUtil.globalize("cms.ui.unknown").localize(); return (String) GlobalizationUtil
.globalize("cms.ui.unknown")
.localize();
} }
} }
}); });
} }
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.width"), Image.WIDTH); sheet.add(ImageGlobalizationUtil
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.height"), Image.HEIGHT); .globalize("cms.contenttypes.ui.image.width"), Image.WIDTH);
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.caption"), Image.CAPTION); sheet.add(ImageGlobalizationUtil
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.description"), Image.DESCRIPTION); .globalize("cms.contenttypes.ui.image.height"), Image.HEIGHT);
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.artist"), Image.ARTIST); sheet.add(ImageGlobalizationUtil
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.publishDate"), Image.PUBLISHDATE, .globalize("cms.contenttypes.ui.image.caption"), Image.CAPTION);
new DomainObjectPropertySheet.AttributeFormatter() { sheet.add(GlobalizationUtil
.globalize("cms.contenttypes.ui.description"), Image.DESCRIPTION);
sheet.add(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.artist"), Image.ARTIST);
sheet.add(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.publishDate"),
Image.PUBLISHDATE,
new DomainObjectPropertySheet.AttributeFormatter() {
@Override @Override
public String format(DomainObject item, String attribute, PageState state) { public String format(DomainObject item, String attribute, PageState state) {
@ -173,19 +186,39 @@ public class ImagePropertiesStep extends SimpleEditStep {
return DateFormat.getDateInstance(DateFormat.LONG).format(image.getPublishDate()); return DateFormat.getDateInstance(DateFormat.LONG).format(image.getPublishDate());
} }
} else { } else {
return (String) ImageGlobalizationUtil.globalize("cms.ui.unknown").localize(); return (String) GlobalizationUtil
.globalize("cms.ui.unknown")
.localize();
} }
} }
}); });
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.source"), Image.SOURCE); sheet.add(ImageGlobalizationUtil.globalize(
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.media"), Image.MEDIA); "cms.contenttypes.ui.image.source"),
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.copyright"), Image.COPYRIGHT); Image.SOURCE);
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.site"), Image.SITE); sheet.add(ImageGlobalizationUtil.globalize(
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.license"), Image.LICENSE); "cms.contenttypes.ui.image.media"),
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.material"), Image.MATERIAL); Image.MEDIA);
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.technique"), Image.TECHNIQUE); sheet.add(ImageGlobalizationUtil.globalize(
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.origin"), Image.ORIGIN); "cms.contenttypes.ui.image.copyright"),
sheet.add(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.origSize"), Image.ORIGSIZE); Image.COPYRIGHT);
sheet.add(ImageGlobalizationUtil.globalize(
"cms.contenttypes.ui.image.site"),
Image.SITE);
sheet.add(ImageGlobalizationUtil.globalize(
"cms.contenttypes.ui.image.license"),
Image.LICENSE);
sheet.add(ImageGlobalizationUtil.globalize(
"cms.contenttypes.ui.image.material"),
Image.MATERIAL);
sheet.add(ImageGlobalizationUtil.globalize(
"cms.contenttypes.ui.image.technique"),
Image.TECHNIQUE);
sheet.add(ImageGlobalizationUtil.globalize(
"cms.contenttypes.ui.image.origin"),
Image.ORIGIN);
sheet.add(ImageGlobalizationUtil.globalize(
"cms.contenttypes.ui.image.origSize"),
Image.ORIGSIZE);
container.add(sheet); container.add(sheet);
@ -218,7 +251,9 @@ public class ImagePropertiesStep extends SimpleEditStep {
} }
// save only if save button was pressed // save only if save button was pressed
if (image != null && uploadSheet.getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) { if (image != null
&& uploadSheet.getSaveCancelSection()
.getSaveButton().isSelected(fse.getPageState())) {
image.setImage(imageAsset); image.setImage(imageAsset);
} }
@ -255,8 +290,11 @@ public class ImagePropertiesStep extends SimpleEditStep {
setEncType("multipart/form-data"); setEncType("multipart/form-data");
// Ignoring deprecated constructor. // Ignoring deprecated constructor.
m_imageFile = new FileUploadSection("Image Type", "image", ImageAsset.MIME_JPEG); m_imageFile = new FileUploadSection("Image Type",
m_imageFile.getFileUploadWidget().addValidationListener(new NotNullValidationListener()); "image",
ImageAsset.MIME_JPEG);
m_imageFile.getFileUploadWidget().addValidationListener(
new NotNullValidationListener());
add(m_imageFile, ColumnPanel.FULL_WIDTH); add(m_imageFile, ColumnPanel.FULL_WIDTH);

48
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertyForm.java
View File

@ -41,6 +41,7 @@ import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Image; import com.arsdigita.cms.contenttypes.Image;
import com.arsdigita.cms.contenttypes.util.ImageGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ImageGlobalizationUtil;
import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.BasicPageForm;
import com.arsdigita.cms.util.GlobalizationUtil;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
@ -86,13 +87,18 @@ public class ImagePropertyForm
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.caption"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.caption")));
ParameterModel captionParam = new StringParameter(Image.CAPTION); ParameterModel captionParam = new StringParameter(Image.CAPTION);
captionParam.addParameterListener(new StringInRangeValidationListener(0, 400)); captionParam.addParameterListener(new StringInRangeValidationListener(0, 400));
TextField caption = new TextField(captionParam); TextField caption = new TextField(captionParam);
add(caption); add(caption);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.description"))); /* Image doesn't use the description property part of the basic
properties and persisted in cms-pages, but it's part of the type
specific basic properties. */
add(new Label(GlobalizationUtil
.globalize("cms.contenttypes.ui.description")));
ParameterModel descriptionParam = new StringParameter(Image.DESCRIPTION); ParameterModel descriptionParam = new StringParameter(Image.DESCRIPTION);
descriptionParam.addParameterListener(new StringInRangeValidationListener(0, 1000)); descriptionParam.addParameterListener(new StringInRangeValidationListener(0, 1000));
TextArea description = new TextArea(descriptionParam); TextArea description = new TextArea(descriptionParam);
@ -100,7 +106,8 @@ public class ImagePropertyForm
description.setCols(60); description.setCols(60);
add(description); add(description);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.artist"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.artist")));
ParameterModel artistParam = new StringParameter(Image.ARTIST); ParameterModel artistParam = new StringParameter(Image.ARTIST);
artistParam.addParameterListener(new StringInRangeValidationListener(0, 200)); artistParam.addParameterListener(new StringInRangeValidationListener(0, 200));
TextField artist = new TextField(artistParam); TextField artist = new TextField(artistParam);
@ -114,7 +121,8 @@ public class ImagePropertyForm
Hidden skipMonth = new Hidden(skipMonthParam); Hidden skipMonth = new Hidden(skipMonthParam);
add(skipMonth); add(skipMonth);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.publishDate"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.publishDate")));
IncompleteDateParameter publishDateParam = new IncompleteDateParameter(Image.PUBLISHDATE); IncompleteDateParameter publishDateParam = new IncompleteDateParameter(Image.PUBLISHDATE);
publishDateParam.allowSkipDay(true); publishDateParam.allowSkipDay(true);
publishDateParam.allowSkipMonth(true); publishDateParam.allowSkipMonth(true);
@ -123,55 +131,64 @@ public class ImagePropertyForm
GregorianCalendar.getInstance().get(Calendar.YEAR) + Image.getConfig().getEndYearDelta()); GregorianCalendar.getInstance().get(Calendar.YEAR) + Image.getConfig().getEndYearDelta());
add(publishDate); add(publishDate);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.source"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.source")));
ParameterModel sourceParam = new StringParameter(Image.SOURCE); ParameterModel sourceParam = new StringParameter(Image.SOURCE);
sourceParam.addParameterListener(new StringInRangeValidationListener(0, 600)); sourceParam.addParameterListener(new StringInRangeValidationListener(0, 600));
TextField source = new TextField(sourceParam); TextField source = new TextField(sourceParam);
add(source); add(source);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.media"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.media")));
ParameterModel mediaParam = new StringParameter(Image.MEDIA); ParameterModel mediaParam = new StringParameter(Image.MEDIA);
mediaParam.addParameterListener(new StringInRangeValidationListener(0, 300)); mediaParam.addParameterListener(new StringInRangeValidationListener(0, 300));
TextField media = new TextField(mediaParam); TextField media = new TextField(mediaParam);
add(media); add(media);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.copyright"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.copyright")));
ParameterModel copyrightParam = new StringParameter(Image.COPYRIGHT); ParameterModel copyrightParam = new StringParameter(Image.COPYRIGHT);
copyrightParam.addParameterListener(new StringInRangeValidationListener(0, 400)); copyrightParam.addParameterListener(new StringInRangeValidationListener(0, 400));
TextField copyright = new TextField(copyrightParam); TextField copyright = new TextField(copyrightParam);
add(copyright); add(copyright);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.site"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.site")));
ParameterModel siteParam = new StringParameter(Image.SITE); ParameterModel siteParam = new StringParameter(Image.SITE);
siteParam.addParameterListener(new StringInRangeValidationListener(0, 500)); siteParam.addParameterListener(new StringInRangeValidationListener(0, 500));
TextField site = new TextField(siteParam); TextField site = new TextField(siteParam);
add(site); add(site);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.license"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.license")));
ParameterModel licenseParam = new StringParameter(Image.LICENSE); ParameterModel licenseParam = new StringParameter(Image.LICENSE);
licenseParam.addParameterListener(new StringInRangeValidationListener(0, 300)); licenseParam.addParameterListener(new StringInRangeValidationListener(0, 300));
TextField license = new TextField(licenseParam); TextField license = new TextField(licenseParam);
add(license); add(license);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.material"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.material")));
ParameterModel materialParam = new StringParameter(Image.MATERIAL); ParameterModel materialParam = new StringParameter(Image.MATERIAL);
materialParam.addParameterListener(new StringInRangeValidationListener(0, 200)); materialParam.addParameterListener(new StringInRangeValidationListener(0, 200));
TextField material = new TextField(materialParam); TextField material = new TextField(materialParam);
add(material); add(material);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.technique"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.technique")));
ParameterModel techniqueParam = new StringParameter(Image.TECHNIQUE); ParameterModel techniqueParam = new StringParameter(Image.TECHNIQUE);
techniqueParam.addParameterListener(new StringInRangeValidationListener(0, 200)); techniqueParam.addParameterListener(new StringInRangeValidationListener(0, 200));
TextField technique = new TextField(techniqueParam); TextField technique = new TextField(techniqueParam);
add(technique); add(technique);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.origin"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.origin")));
ParameterModel originParam = new StringParameter(Image.ORIGIN); ParameterModel originParam = new StringParameter(Image.ORIGIN);
originParam.addParameterListener(new StringInRangeValidationListener(0, 200)); originParam.addParameterListener(new StringInRangeValidationListener(0, 200));
TextField origin = new TextField(originParam); TextField origin = new TextField(originParam);
add(origin); add(origin);
add(new Label(ImageGlobalizationUtil.globalize("cms.contenttypes.ui.image.origSize"))); add(new Label(ImageGlobalizationUtil
.globalize("cms.contenttypes.ui.image.origSize")));
ParameterModel origSizeParam = new StringParameter(Image.ORIGSIZE); ParameterModel origSizeParam = new StringParameter(Image.ORIGSIZE);
origSizeParam.addParameterListener(new StringInRangeValidationListener(0, 100)); origSizeParam.addParameterListener(new StringInRangeValidationListener(0, 100));
TextField origSize = new TextField(origSizeParam); TextField origSize = new TextField(origSizeParam);
@ -204,6 +221,11 @@ public class ImagePropertyForm
data.put(Image.ORIGSIZE, image.getOriginalSize()); data.put(Image.ORIGSIZE, image.getOriginalSize());
} }
/**
*
* @param e
* @throws FormProcessException
*/
@Override @Override
public void validate(FormSectionEvent e) throws FormProcessException { public void validate(FormSectionEvent e) throws FormProcessException {
super.validate(e); super.validate(e);