From 1807b0084a9a91d2a67ffd28706164d1709aa838 Mon Sep 17 00:00:00 2001 From: quasi Date: Wed, 20 Nov 2013 12:57:27 +0000 Subject: [PATCH] =?UTF-8?q?Fieldset=20Klasse=20hinzugef=C3=BCgt=20LinkProp?= =?UTF-8?q?ertyForm:=20um=20die=20Verwendung=20von=20Fieldset=20erweitert?= =?UTF-8?q?=20ImageLibraryComponent:=20Klasse=20f=C3=BCr=20den=20Upload-Li?= =?UTF-8?q?nk=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2439 8810af33-2d31-482b-a856-94f89814c4df --- .../ui/RelatedLinkPropertyForm.java | 23 ++++++------ .../cms/contenttypes/ui/LinkPropertyForm.java | 26 +++++++++----- .../cms/ui/ImageLibraryComponent.java | 1 + .../com/arsdigita/bebop/form/Fieldset.java | 35 +++++++++++++++++++ 4 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 ccm-core/src/com/arsdigita/bebop/form/Fieldset.java diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java index 215487762..7a63ca0d9 100755 --- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java +++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java @@ -55,6 +55,9 @@ public class RelatedLinkPropertyForm extends LinkPropertyForm { private static final Logger logger = Logger.getLogger( RelatedLinkPropertyForm.class); + private static boolean isHideNewTargetWindow = + RelatedLinkConfig.getInstance() + .isHideNewTargetWindow(); private static boolean isHideAdditionalResourceFields = RelatedLinkConfig.getInstance() .isHideAdditionalResourceFields(); @@ -91,16 +94,16 @@ public class RelatedLinkPropertyForm extends LinkPropertyForm { // NewTargetWindow option should be moved from CMS Link class to this // asset and made optional. Current HTML doesn't allow this option // anymore. - if (isHideAdditionalResourceFields) { -// /* Single option whether to open in new window, strongly discouraged!*/ -// Option m_selectWindow = new Option( -// Link.TARGET_WINDOW, -// new Label(GlobalizationUtil.globalize( -// "cms.contenttyes.link.ui.option.new_window"))); -// // "Open URL in new window"); -// m_URIOption = new CheckboxGroup("openOption"); -// m_URIOption.addOption(m_selectWindow); -// add(m_URIOption, ColumnPanel.FULL_WIDTH); + if (isHideNewTargetWindow) { +// /* Single option whether to open in new window, strongly discouraged!*/ +// Option m_selectWindow = new Option( +// Link.TARGET_WINDOW, +// new Label(RelatedLinkGlobalizationUtil.globalize( +// "cms.contenttyes.link.ui.option.new_window"))); +// // "Open URL in new window"); +// m_URIOption = new CheckboxGroup("openOption"); +// m_URIOption.addOption(m_selectWindow); +// add(m_URIOption, ColumnPanel.FULL_WIDTH); } if (isHideAdditionalResourceFields) { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java index af5b56df1..de4637221 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java @@ -25,6 +25,7 @@ import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SaveCancelSection; +import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.event.FormInitListener; @@ -36,6 +37,7 @@ import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.RadioGroup; import com.arsdigita.bebop.form.CheckboxGroup; +import com.arsdigita.bebop.form.Fieldset; import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.NotNullValidationListener; @@ -205,38 +207,44 @@ public class LinkPropertyForm extends FormSection m_linkType.addOption(m_external); m_linkType.addOption(m_internal); - m_linkType.setOptionSelected(m_external); + m_linkType.setOptionSelected(m_internal); m_linkType.addValidationListener(new NotNullValidationListener()); add(new Label(GlobalizationUtil.globalize( "cms.contenttyes.link.ui.option_group.link_type.label"))); add(m_linkType); /* External target */ + Fieldset externalFieldset = new Fieldset(GlobalizationUtil.globalize( + "cms.contenttyes.link.ui.target_uri")); m_targetURI = new TextField("targetURI"); m_targetURI.setOnFocus("toggle_link_fields(false)"); m_targetURI.setHint(GlobalizationUtil.globalize( "cms.contenttyes.link.ui.target_uri_hint")); - add(new Label(GlobalizationUtil.globalize( + externalFieldset.add(new Label(GlobalizationUtil.globalize( "cms.contenttyes.link.ui.target_uri"))); - add(m_targetURI); - + externalFieldset.add(m_targetURI); + add(externalFieldset); + /* Internal target */ - add(new Label(GlobalizationUtil.globalize( + Fieldset internalFieldset = new Fieldset(GlobalizationUtil.globalize( + "cms.contenttyes.link.ui.target_content_item")); + internalFieldset.add(new Label(GlobalizationUtil.globalize( "cms.contenttyes.link.ui.target_content_item") )); m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, m_contentType); m_itemSearch.getSearchButton().setOnFocus("toggle_link_fields(true)"); m_itemSearch.getClearButton().setOnFocus("toggle_link_fields(true)"); - add(m_itemSearch); + internalFieldset.add(m_itemSearch); /* Optional parameters for internal target */ - add(new Label(GlobalizationUtil.globalize( + internalFieldset.add(new Label(GlobalizationUtil.globalize( "cms.contenttyes.link.ui.target_parameters") )); m_itemParams = new TextField("itemParams"); m_itemParams.setOnFocus("toggle_link_fields(true)"); m_itemParams.setHint(GlobalizationUtil.globalize( "cms.contenttyes.link.ui.target_parameters_hint") ); - add(m_itemParams); - + internalFieldset.add(m_itemParams); + add(internalFieldset); + // TODO: // Move this option to contentasset related link for bacvkwards compatibility // because this option is no longer compatible with current HTML diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java index b78c852dd..5fb42e598 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageLibraryComponent.java @@ -197,6 +197,7 @@ public class ImageLibraryComponent extends SimpleContainer Label(GlobalizationUtil.globalize( "cms.ui.authoring.upload_a_new_image") )); upload.addActionListener(actionListener); + upload.setClassAttr("cmsContentViewMenu imageUploadLink"); add(upload, ColumnPanel.FULL_WIDTH); } } diff --git a/ccm-core/src/com/arsdigita/bebop/form/Fieldset.java b/ccm-core/src/com/arsdigita/bebop/form/Fieldset.java new file mode 100644 index 000000000..99d02aa3b --- /dev/null +++ b/ccm-core/src/com/arsdigita/bebop/form/Fieldset.java @@ -0,0 +1,35 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.arsdigita.bebop.form; + +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.SimpleContainer; +import com.arsdigita.globalization.GlobalizedMessage; +import com.arsdigita.xml.Element; + +/** + * A fieldset for form. + * + * @author Sören Bernstein + */ +public class Fieldset extends SimpleContainer { + + GlobalizedMessage m_title; + + public Fieldset(GlobalizedMessage title) { + super("bebop:fieldset", BEBOP_XML_NS); + m_title = title; + } + + @Override + public void generateXML(PageState state, Element p) { + if ( isVisible(state) ) { + Element parent = generateParent(p); + parent.addAttribute("legend", (String) m_title.localize()); + generateChildrenXML(state, parent); + } + } +}