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

Bild-Caption verlängern (#1786) 

Sowohl die Caption, als auch Title und Description sind nun per Parameter in cms config in der Länge einstellelbar. Dabei wird die jeweilige Länge auf die Länge des DB Feldes begrenzt (hart kodiert).

Parameter: com.arsdigita.cms.image_browser.{caption,title,description}_size

git-svn-id: https://svn.libreccm.org/ccm/trunk@2392 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2013-10-29 06:41:24 +00:00
parent e917176d17
commit 80c13748e8
3 changed files with 1208 additions and 1161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
ccm-cms/src/com/arsdigita/cms/CMSConfig.java
View File

@ -84,15 +84,15 @@ public final class CMSConfig extends AbstractConfig {
return s_config; return s_config;
} }
/** /**
* Storage (map) for method getAssetStepsToSkip(ContentType type) to store * Storage (map) for method getAssetStepsToSkip(ContentType type) to
* mapping of steps that are deemed irrelevant for the passid in type. * store mapping of steps that are deemed irrelevant for the passid in
* type.
*/ */
private static Map s_skipAssetSteps = null; private static Map s_skipAssetSteps = null;
/** /**
* Item category add form specifies Subclass of ItemCategoryForm to use for * Item category add form specifies Subclass of ItemCategoryForm to use
* the assign categories step. Used in * for the assign categories step. Used in
* c.ad.cms.ui.authoring.ItemCategoryStep * c.ad.cms.ui.authoring.ItemCategoryStep
*/ */
private final Parameter m_categoryAuthoringAddForm = private final Parameter m_categoryAuthoringAddForm =
@ -102,8 +102,8 @@ public final class CMSConfig extends AbstractConfig {
ItemCategoryForm.class, ItemCategoryForm.class,
SimpleComponent.class); SimpleComponent.class);
/** /**
* Path for the default item template. Path is relative to the Template Root * Path for the default item template. Path is relative to the Template
* path. * Root path.
*/ */
private final Parameter m_defaultItemTemplatePath = private final Parameter m_defaultItemTemplatePath =
new StringParameter( new StringParameter(
@ -111,8 +111,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.REQUIRED, Parameter.REQUIRED,
"/default/item.jsp"); "/default/item.jsp");
/** /**
* Path for the default folder template. Path is relative to the Template * Path for the default folder template. Path is relative to the
* Root path. * Template Root path.
*/ */
private final Parameter m_defaultFolderTemplatePath = private final Parameter m_defaultFolderTemplatePath =
new StringParameter( new StringParameter(
@ -120,8 +120,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.REQUIRED, Parameter.REQUIRED,
"/default/folder.jsp"); "/default/folder.jsp");
/** /**
* Path or the root folter for template folders. Path is relative to webapp * Path or the root folter for template folders. Path is relative to
* root. Modify with care! Usually modified by developers only! * webapp root. Modify with care! Usually modified by developers only!
*/ */
private final Parameter m_templateRootPath = private final Parameter m_templateRootPath =
new StringParameter( new StringParameter(
@ -152,16 +152,16 @@ public final class CMSConfig extends AbstractConfig {
"/WEB-INF/resources/cms-item-adapters.xml"); "/WEB-INF/resources/cms-item-adapters.xml");
// URL resource: protocol handler removal: END // URL resource: protocol handler removal: END
/** /**
* Use streamlined content creation: upon item creation, automatically open * Use streamlined content creation: upon item creation, automatically
* authoring steps and forward to the next step * open authoring steps and forward to the next step
*/ */
private final Parameter m_useStreamlinedCreation = new BooleanParameter( private final Parameter m_useStreamlinedCreation = new BooleanParameter(
"com.arsdigita.cms.use_streamlined_creation", "com.arsdigita.cms.use_streamlined_creation",
Parameter.REQUIRED, Parameter.REQUIRED,
Boolean.TRUE); Boolean.TRUE);
/** /**
* DHTML Editor Configuration for use in CMS module, lists the config object * DHTML Editor Configuration for use in CMS module, lists the config
* name and Javascript source location for its definition. * object name and Javascript source location for its definition.
*/ */
private final Parameter m_dhtmlEditorConfig = private final Parameter m_dhtmlEditorConfig =
new DHTMLEditorConfigParameter( new DHTMLEditorConfigParameter(
@ -188,8 +188,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
null); null);
/** /**
* Prevent undesirable functions from being made available, eg images should * Prevent undesirable functions from being made available, eg images
* only be added through the cms methods. * should only be added through the cms methods.
*/ */
private final Parameter m_dhtmlEditorHiddenButtons = private final Parameter m_dhtmlEditorHiddenButtons =
new StringArrayParameter( new StringArrayParameter(
@ -262,8 +262,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
PublishLifecycleListener.class.getName()); PublishLifecycleListener.class.getName());
/** /**
* Wether the Wysiwyg editor should clear the text of MSWord tags, everytime * Wether the Wysiwyg editor should clear the text of MSWord tags,
* the user clicks on 'Save' * everytime the user clicks on 'Save'
*/ */
private final Parameter m_saveTextCleansWordTags = new BooleanParameter( private final Parameter m_saveTextCleansWordTags = new BooleanParameter(
"com.arsdigita.cms.save_text_cleans_word_tags", "com.arsdigita.cms.save_text_cleans_word_tags",
@ -287,16 +287,16 @@ public final class CMSConfig extends AbstractConfig {
Parameter.REQUIRED, Parameter.REQUIRED,
Boolean.TRUE); Boolean.TRUE);
/** /**
* Defines the number of days ahead that are covered in the 'Soon Expired' * Defines the number of days ahead that are covered in the 'Soon
* tab * Expired' tab
*/ */
private final Parameter m_soonExpiredTimespanDays = new IntegerParameter( private final Parameter m_soonExpiredTimespanDays = new IntegerParameter(
"com.arsdigita.cms.soon_expired_timespan_days", "com.arsdigita.cms.soon_expired_timespan_days",
Parameter.REQUIRED, Parameter.REQUIRED,
new Integer(14)); new Integer(14));
/** /**
* Defines the number of months ahead that are covered in the 'Soon Expired' * Defines the number of months ahead that are covered in the 'Soon
* tab * Expired' tab
*/ */
private final Parameter m_soonExpiredTimespanMonths = new IntegerParameter( private final Parameter m_soonExpiredTimespanMonths = new IntegerParameter(
"com.arsdigita.cms.soon_expired_timespan_months", "com.arsdigita.cms.soon_expired_timespan_months",
@ -310,8 +310,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.REQUIRED, Parameter.REQUIRED,
Boolean.TRUE); Boolean.TRUE);
/** /**
* Links created through browse interfaces should only be within the same * Links created through browse interfaces should only be within the
* subsite * same subsite
*/ */
private final Parameter m_linksOnlyInSameSubsite = new BooleanParameter( private final Parameter m_linksOnlyInSameSubsite = new BooleanParameter(
"com.arsdigita.cms.browse_links_in_same_subsite_only", "com.arsdigita.cms.browse_links_in_same_subsite_only",
@ -328,8 +328,8 @@ public final class CMSConfig extends AbstractConfig {
ItemCategoryExtension.class, ItemCategoryExtension.class,
ItemCategoryExtension.class); ItemCategoryExtension.class);
/** /**
* Link available to reset lifecycle on republish. If false don't display * Link available to reset lifecycle on republish. If false don't
* the link otherwise display. * display the link otherwise display.
*/ */
private final Parameter m_hideResetLifecycleLink = new BooleanParameter( private final Parameter m_hideResetLifecycleLink = new BooleanParameter(
"com.arsdigita.cms.hide_reset_lifecycle_link", "com.arsdigita.cms.hide_reset_lifecycle_link",
@ -345,8 +345,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
Boolean.FALSE); Boolean.FALSE);
/** /**
* Title Weight, the relative weight given to title element within cms:item * Title Weight, the relative weight given to title element within
* when ranking search results (only used by interMedia) * cms:item when ranking search results (only used by interMedia)
*/ */
private final Parameter m_titleWeight = new IntegerParameter( private final Parameter m_titleWeight = new IntegerParameter(
"com.arsdigita.cms.search.intermedia.title_weight", "com.arsdigita.cms.search.intermedia.title_weight",
@ -372,10 +372,11 @@ public final class CMSConfig extends AbstractConfig {
Boolean.TRUE); Boolean.TRUE);
/** /**
* Asset steps to skip, specify asset steps that are not relevant for * Asset steps to skip, specify asset steps that are not relevant for
* specific content types. Each entry in the list is a : separated pair. The * specific content types. Each entry in the list is a : separated pair.
* first string is the className for the type (refer to classname column in * The first string is the className for the type (refer to classname
* contenttypes table eg com.arsdigita.cms.contenttypes.MultiPartArticle * column in contenttypes table eg
* Second string is the name of the bebop step component eg * com.arsdigita.cms.contenttypes.MultiPartArticle Second string is the
* name of the bebop step component eg
* com.arsdigita.cms.contenttypes.ui.ImageStep * com.arsdigita.cms.contenttypes.ui.ImageStep
*/ */
private final Parameter m_skipAssetSteps = new StringArrayParameter( private final Parameter m_skipAssetSteps = new StringArrayParameter(
@ -383,16 +384,16 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
null); null);
/** /**
* Mandatory Descriptions Content types may refer to this to decide whether * Mandatory Descriptions Content types may refer to this to decide
* to validate against empty descriptions * whether to validate against empty descriptions
*/ */
private final Parameter m_mandatoryDescriptions = new BooleanParameter( private final Parameter m_mandatoryDescriptions = new BooleanParameter(
"com.arsdigita.cms.mandatory_descriptions", "com.arsdigita.cms.mandatory_descriptions",
Parameter.OPTIONAL, Parameter.OPTIONAL,
Boolean.FALSE); Boolean.FALSE);
/** /**
* Delete Finished Lifecycles. Decide whether lifecycles and their phases * Delete Finished Lifecycles. Decide whether lifecycles and their
* should be deleted from the system when finished. * phases should be deleted from the system when finished.
*/ */
private final Parameter m_deleteLifecycleWhenComplete = private final Parameter m_deleteLifecycleWhenComplete =
new BooleanParameter( new BooleanParameter(
@ -400,18 +401,18 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
Boolean.FALSE); Boolean.FALSE);
/** /**
* Contacts for content items. Allows you to add a Contact authoring step to * Contacts for content items. Allows you to add a Contact authoring
* all items * step to all items
*/ */
private final Parameter m_hasContactsAuthoringStep = new BooleanParameter( private final Parameter m_hasContactsAuthoringStep = new BooleanParameter(
"com.arsdigita.cms.has_contacts_authoring_step", "com.arsdigita.cms.has_contacts_authoring_step",
Parameter.REQUIRED, Parameter.REQUIRED,
Boolean.FALSE); Boolean.FALSE);
/** /**
* Ordering for nodes in assign category tree. Decide whether entries should * Ordering for nodes in assign category tree. Decide whether entries
* be ordered alphabetically or according to sort key (maintained in * should be ordered alphabetically or according to sort key (maintained
* category admin tab in content centre) SortKey|Alphabetical is initialized * in category admin tab in content centre) SortKey|Alphabetical is
* in constructor! See below. * initialized in constructor! See below.
*/ */
private final Parameter m_categoryTreeOrdering = private final Parameter m_categoryTreeOrdering =
new EnumerationParameter( new EnumerationParameter(
@ -419,12 +420,12 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
Category.SORT_KEY); Category.SORT_KEY);
/** /**
* Allow creation of a new Use Context in category tab of content sections. * Allow creation of a new Use Context in category tab of content
* "Use Context" is the construct to constitute a category hierarchy * sections. "Use Context" is the construct to constitute a category
* implementet in core. It is superseded by the construct "Category Domain" * hierarchy implementet in core. It is superseded by the construct
* in Terms (ccm-ldn-terms). * "Category Domain" in Terms (ccm-ldn-terms). Global parameter for all
* Global parameter for all content sections. Default is false because all * content sections. Default is false because all installation bundles
* installation bundles use Terms. * use Terms.
*/ */
private final Parameter m_allowCategoryCreateUseContext = private final Parameter m_allowCategoryCreateUseContext =
new BooleanParameter( new BooleanParameter(
@ -442,10 +443,10 @@ public final class CMSConfig extends AbstractConfig {
Parameter.REQUIRED, Parameter.REQUIRED,
Boolean.TRUE); Boolean.TRUE);
/** /**
* Hide the legacy public site link in Workspace (content center) section * Hide the legacy public site link in Workspace (content center)
* listing. Legacy public site display is replaced by navigation based * section listing. Legacy public site display is replaced by navigation
* presentation (or by portlets) and should be hidden in the admin ui by * based presentation (or by portlets) and should be hidden in the admin
* default now. * ui by default now.
*/ */
private final Parameter m_hideLegacyPublicSiteLink = private final Parameter m_hideLegacyPublicSiteLink =
new BooleanParameter( new BooleanParameter(
@ -474,8 +475,8 @@ public final class CMSConfig extends AbstractConfig {
Parameter.OPTIONAL, Parameter.OPTIONAL,
Boolean.FALSE); Boolean.FALSE);
/** /**
* Amount of time (in hours) before the expiration of a content item that * Amount of time (in hours) before the expiration of a content item
* users in the Alert Recipient role are alerted via email * that users in the Alert Recipient role are alerted via email
*/ */
private final Parameter m_defaultNotificationTime = new IntegerParameter( private final Parameter m_defaultNotificationTime = new IntegerParameter(
"com.arsdigita.cms.default_notification_time", "com.arsdigita.cms.default_notification_time",
@ -595,6 +596,18 @@ public final class CMSConfig extends AbstractConfig {
"com.arsdigita.cms.image_browser.thumbnail_max_height", "com.arsdigita.cms.image_browser.thumbnail_max_height",
Parameter.REQUIRED, Parameter.REQUIRED,
50); 50);
private final Parameter m_imageBrowserCaptionSize = new IntegerParameter(
"com.arsdigita.cms.image_browser.caption_size",
Parameter.REQUIRED,
100);
private final Parameter m_imageBrowserDescriptionSize = new IntegerParameter(
"com.arsdigita.cms.image_browser.description_size",
Parameter.REQUIRED,
400);
private final Parameter m_imageBrowserTitleSize = new IntegerParameter(
"com.arsdigita.cms.image_browser.title_size",
Parameter.REQUIRED,
200);
///////////////////////////////////////////////// /////////////////////////////////////////////////
// ImageCache Parameter // ImageCache Parameter
///////////////////////////////////////////////// /////////////////////////////////////////////////
@ -621,12 +634,10 @@ public final class CMSConfig extends AbstractConfig {
"com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step", "com.arsdigita.cms.contenttypes.genericperson.attach_person_orgaunits_step",
Parameter.REQUIRED, Parameter.REQUIRED,
Boolean.TRUE); Boolean.TRUE);
private final Parameter m_personOrgaUnitsStepSortKey = new BooleanParameter( private final Parameter m_personOrgaUnitsStepSortKey = new BooleanParameter(
"com.arsdigita.cms.contenttypes.genericperson.person_orgaunits_step_sortkey", "com.arsdigita.cms.contenttypes.genericperson.person_orgaunits_step_sortkey",
Parameter.REQUIRED, Parameter.REQUIRED,
20); 20);
/** /**
* Enable or disable the XML cache in {@link SimpleXMLGenerator} * Enable or disable the XML cache in {@link SimpleXMLGenerator}
*/ */
@ -741,6 +752,9 @@ public final class CMSConfig extends AbstractConfig {
// ImageBrowser // ImageBrowser
register(m_imageBrowserThumbnailMaxWidth); register(m_imageBrowserThumbnailMaxWidth);
register(m_imageBrowserThumbnailMaxHeight); register(m_imageBrowserThumbnailMaxHeight);
register(m_imageBrowserCaptionSize);
register(m_imageBrowserDescriptionSize);
register(m_imageBrowserTitleSize);
// ImageCache Parameter // ImageCache Parameter
register(m_imageCacheEnabled); register(m_imageCacheEnabled);
@ -767,8 +781,8 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* Retrieve path of the root folter for template folders. Path is relative * Retrieve path of the root folter for template folders. Path is
* to webapp root. * relative to webapp root.
*/ */
public final String getTemplateRoot() { public final String getTemplateRoot() {
return (String) get(m_templateRootPath); return (String) get(m_templateRootPath);
@ -809,7 +823,8 @@ public final class CMSConfig extends AbstractConfig {
/** /**
* *
* @deprecated use * @deprecated use
* com.arsdigita.cms.ContentSection.getDefaultSection().getName() instead * com.arsdigita.cms.ContentSection.getDefaultSection().getName()
* instead
*/ */
public final String getDefaultContentSection() { public final String getDefaultContentSection() {
// return (String) get(m_defaultSection); // return (String) get(m_defaultSection);
@ -920,8 +935,8 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* Fetch the file name contaning XML Mapping of the content center tabs to * Fetch the file name contaning XML Mapping of the content center tabs
* URLs * to URLs
* *
* @return String containig file name including path component. * @return String containig file name including path component.
*/ */
@ -931,15 +946,17 @@ public final class CMSConfig extends AbstractConfig {
/** /**
* Internal class representing a DHTMLEditor configuration parameter. It * Internal class representing a DHTMLEditor configuration parameter. It
* creates a new DHMTLEditor Config object (internal class in DHTMLEditor). * creates a new DHMTLEditor Config object (internal class in
* DHTMLEditor).
* *
* XXX Method unmarshal is broken and currently does not work correctly. It * XXX Method unmarshal is broken and currently does not work correctly.
* does not process default values provided by using * It does not process default values provided by using
* DHTMLEditor.Config.Standard (see parameter m_dhtmlEditorConfig above). * DHTMLEditor.Config.Standard (see parameter m_dhtmlEditorConfig
* May be a similiar problem as with ResourceParameter and default value, * above). May be a similiar problem as with ResourceParameter and
* see patch provided by pbrucha. Best solution may be to remove this * default value, see patch provided by pbrucha. Best solution may be to
* special parameter class and use a string parameter instead to directly * remove this special parameter class and use a string parameter
* create a DHTMLEditor.Config object. (pboy, 2010-09-02) * instead to directly create a DHTMLEditor.Config object. (pboy,
* 2010-09-02)
*/ */
private class DHTMLEditorConfigParameter extends StringParameter { private class DHTMLEditorConfigParameter extends StringParameter {
@ -950,7 +967,8 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* WARNING: Does not correctly process default values, see above! * WARNING: Does not correctly process default values, see
* above!
* *
* @param value * @param value
* @param errors * @param errors
@ -960,7 +978,6 @@ public final class CMSConfig extends AbstractConfig {
protected Object unmarshal(String value, ErrorList errors) { protected Object unmarshal(String value, ErrorList errors) {
return DHTMLEditor.Config.valueOf(value); return DHTMLEditor.Config.valueOf(value);
} }
} }
protected static HashMap extraXMLGenerators = new HashMap(); protected static HashMap extraXMLGenerators = new HashMap();
@ -993,8 +1010,8 @@ public final class CMSConfig extends AbstractConfig {
/** /**
* The relative weight given to the dcKeywords element within dublinCore * The relative weight given to the dcKeywords element within dublinCore
* element within cms:item element when ranking search results Only used by * element within cms:item element when ranking search results Only used
* the interMedia query engine. * by the interMedia query engine.
* *
*/ */
public Integer getKeywordSearchWeight() { public Integer getKeywordSearchWeight() {
@ -1006,8 +1023,8 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* The relative weight given to title element within cms:item element when * The relative weight given to title element within cms:item element
* ranking search results Only used by the interMedia query engine. * when ranking search results Only used by the interMedia query engine.
* *
*/ */
public Integer getTitleSearchWeight() { public Integer getTitleSearchWeight() {
@ -1028,8 +1045,8 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* for the given content type, returns a collection of steps that are deemed * for the given content type, returns a collection of steps that are
* irrelevant for the type. * deemed irrelevant for the type.
* *
* If no irrelevant steps, an empty set is returned. * If no irrelevant steps, an empty set is returned.
* *
@ -1088,11 +1105,11 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* Used to decide whether lifecycles (and all asociated phases) should be * Used to decide whether lifecycles (and all asociated phases) should
* deleted from the system when complete * be deleted from the system when complete
* *
* (Deleting lifecycle means that you lose a bit of historical information * (Deleting lifecycle means that you lose a bit of historical
* eg when was this item unpublished) * information eg when was this item unpublished)
*/ */
public boolean deleteFinishedLifecycles() { public boolean deleteFinishedLifecycles() {
return ((Boolean) get(m_deleteLifecycleWhenComplete)).booleanValue(); return ((Boolean) get(m_deleteLifecycleWhenComplete)).booleanValue();
@ -1102,8 +1119,8 @@ public final class CMSConfig extends AbstractConfig {
* Used to decide whether to delete old notification records for expiry * Used to decide whether to delete old notification records for expiry
* notifications. * notifications.
* *
* If true, notifications and messages are deleted if the notification is * If true, notifications and messages are deleted if the notification
* successfully sent. Any send failures are retained * is successfully sent. Any send failures are retained
* *
*/ */
public boolean deleteExpiryNotifications() { public boolean deleteExpiryNotifications() {
@ -1111,11 +1128,11 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* Used to decide whether to delete old notification records for workflow * Used to decide whether to delete old notification records for
* notifications. * workflow notifications.
* *
* If true, notifications and messages are deleted if the notification is * If true, notifications and messages are deleted if the notification
* successfully sent. Any send failures are retained * is successfully sent. Any send failures are retained
* *
*/ */
public boolean deleteWorkflowNotifications() { public boolean deleteWorkflowNotifications() {
@ -1130,10 +1147,11 @@ public final class CMSConfig extends AbstractConfig {
/** /**
* I'am not sure for what this method is. I found it here when I tried * I'am not sure for what this method is. I found it here when I tried
* figure out how add multiple parts to an ContentType, like * figure out how add multiple parts to an ContentType, like
* ccm-cms-types-contact and the Multipart article do. I think this method * ccm-cms-types-contact and the Multipart article do. I think this
* should not be here because it is only needed by one specific contenttype. * method should not be here because it is only needed by one specific
* Because of this, I think that this method and the contact are violating * contenttype. Because of this, I think that this method and the
* many rules of modern software design. Jens Pelzetter, 2009-06-02. * contact are violating many rules of modern software design. Jens
* Pelzetter, 2009-06-02.
* *
* @return * @return
*/ */
@ -1146,12 +1164,13 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* Retrieve whether to allow creation of a new Use Context in category tab * Retrieve whether to allow creation of a new Use Context in category
* of content sections. "Use Context" is used to constitute a category * tab of content sections. "Use Context" is used to constitute a
* hierarchy in core. It is superseded by the construct "Category Domain" * category hierarchy in core. It is superseded by the construct
* in Terms (ccm-ldn-terms). * "Category Domain" in Terms (ccm-ldn-terms). Global parameter for all
* Global parameter for all content sections. Default is false because all * content sections. Default is false because all installation bundles
* installation bundles use Terms. * use Terms.
*
* @return TRUE if creation is allowed, otherwise FALSE (default) * @return TRUE if creation is allowed, otherwise FALSE (default)
*/ */
public final boolean getAllowCategoryCreateUseContext() { public final boolean getAllowCategoryCreateUseContext() {
@ -1165,8 +1184,8 @@ public final class CMSConfig extends AbstractConfig {
} }
/** /**
* Hide the (no longer used) legacy public site link in Workspace (content * Hide the (no longer used) legacy public site link in Workspace
* center) section listing, true by default. * (content center) section listing, true by default.
*/ */
public final boolean getHideLegacyPublicSiteLink() { public final boolean getHideLegacyPublicSiteLink() {
return ((Boolean) get(m_hideLegacyPublicSiteLink)).booleanValue(); return ((Boolean) get(m_hideLegacyPublicSiteLink)).booleanValue();
@ -1208,6 +1227,18 @@ public final class CMSConfig extends AbstractConfig {
return (Integer) get(m_imageBrowserThumbnailMaxHeight); return (Integer) get(m_imageBrowserThumbnailMaxHeight);
} }
public int getImageBrowserCaptionSize() {
return Math.min(((Integer) get(m_imageBrowserCaptionSize)).intValue(), 100);
}
public int getImageBrowserDescriptionSize() {
return Math.min(((Integer) get(m_imageBrowserDescriptionSize)).intValue(), 400);
}
public int getImageBrowserTitleSize() {
return Math.min(((Integer) get(m_imageBrowserTitleSize)).intValue(), 200);
}
public Boolean getImageCacheEnabled() { public Boolean getImageCacheEnabled() {
return (Boolean) get(m_imageCacheEnabled); return (Boolean) get(m_imageCacheEnabled);
} }
@ -1250,5 +1281,4 @@ public final class CMSConfig extends AbstractConfig {
public Integer getXmlCacheAge() { public Integer getXmlCacheAge() {
return (Integer) get(m_xmlCacheAge); return (Integer) get(m_xmlCacheAge);
} }
} }

16
ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
View File

@ -295,6 +295,22 @@ com.arsdigita.cms.image_browser.thumbnail_max_height.purpose=Set the maximum hei
com.arsdigita.cms.image_browser.thumbnail_max_height.example=150 com.arsdigita.cms.image_browser.thumbnail_max_height.example=150
com.arsdigita.cms.image_browser.thumbnail_max_height.format=[integer] com.arsdigita.cms.image_browser.thumbnail_max_height.format=[integer]
com.arsdigita.cms.image_browser.caption_size.title = Max size for image caption (must be < 100)
com.arsdigita.cms.image_browser.caption_size.purpose = Set the ValidationListener for image caption to a smaller size than the db field
com.arsdigita.cms.image_browser.caption_size.example = 100
com.arsdigita.cms.image_browser.caption_size.format = [Integer]
com.arsdigita.cms.image_browser.description_size.title = Max size for image description (must be < 400)
com.arsdigita.cms.image_browser.description_size.purpose = Set the ValidationListener for image description to a smaller size than the db field
com.arsdigita.cms.image_browser.description_size.example = 400
com.arsdigita.cms.image_browser.description_size.format = [Integer]
com.arsdigita.cms.image_browser.title_size.title = Max size for image title (must be < 200)
com.arsdigita.cms.image_browser.title_size.purpose = Set the ValidationListener for image title to a smaller size than the db field
com.arsdigita.cms.image_browser.title_size.example = 200
com.arsdigita.cms.image_browser.title_size.format = [Integer]
com.arsdigita.cms.image_cache.enable.title=Enable server-side image cache com.arsdigita.cms.image_cache.enable.title=Enable server-side image cache
com.arsdigita.cms.image_cache.enable.purpose=Enable server-side coherent image cache, which will speed up server-side image resizing com.arsdigita.cms.image_cache.enable.purpose=Enable server-side coherent image cache, which will speed up server-side image resizing
com.arsdigita.cms.image_cache.enable.example=true|false com.arsdigita.cms.image_cache.enable.example=true|false

7
ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java
View File

@ -18,6 +18,7 @@ import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.ReusableImageAsset; import com.arsdigita.cms.ReusableImageAsset;
@ -101,12 +102,12 @@ public class ImageLibraryComponent extends SimpleContainer
m_form.add(new Label(GlobalizationUtil m_form.add(new Label(GlobalizationUtil
.globalize("cms.contentasset.image.ui.caption"))); .globalize("cms.contentasset.image.ui.caption")));
m_caption.addValidationListener(new NotNullValidationListener()); m_caption.addValidationListener(new NotNullValidationListener());
m_caption.setSize(40); m_caption.setSize(CMS.getConfig().getImageBrowserCaptionSize());
m_form.add(m_caption); m_form.add(m_caption);
m_description.addValidationListener(new NotNullValidationListener()); m_description.addValidationListener(new NotNullValidationListener());
m_description.setSize(40); m_description.setSize(CMS.getConfig().getImageBrowserCaptionSize());
m_title.addValidationListener(new NotNullValidationListener()); m_title.addValidationListener(new NotNullValidationListener());
m_title.setSize(40); m_title.setSize(CMS.getConfig().getImageBrowserCaptionSize());
// Only show the title and description fields where these have // Only show the title and description fields where these have
// been explicitly requested. // been explicitly requested.
/* /*