[FEATURE]

(i) Einem Externen Link kann nun der Hinweistext hinzugefügt werden, der optional angezweigt werden soll, wenn der Link angeklickt wird. Das optionale Anzeigen wird über eine Checkbox realisiert, die unter dem Hinweistext im Bearbeiten-Menü zu finden ist. Des weiteren wurde eine Checkbox dem Bearbeiten-Menü hinzugefügt, um von vornherein festlegen zu können, den Link in einem neuen Fenster zu öffnen. (ii) Die Datenbankattribute wurden entsprechen den genannten Feldern erweitert. Somit wird der Hinweistext und die Option den Hinweistext anzeigen zu lassen, sowie die Option den Link in einem neuen Fenster zu öffnen in der Datenbank gespeichert.

[UPDATE]
(i) Die Namen der Pateke ExternalLink und Webpage in einem Dropdown-Menü angepasst, durch Hinzufügen/Umbenennen eines entsprechenden Eintrags in den Properties.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3280 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-types-externallink/pdl/com/arsdigita/cms/contenttypes/ExternalLink.pdl

@@ -22,7 +22,9 @@ import com.arsdigita.cms.ContentPage;
 
 object type ExternalLink extends ContentPage {
     String [0..1] url           = ct_extLinks.url VARCHAR(2000);
-    String [0..1] description = ct_extLinks.description;
+    String [0..1] comment       = ct_extLinks.comment VARCHAR(4000);
+    String [0..1] showComment   = ct_extLinks.show_comment VARCHAR(50);
+    String [0..1] targetWindow  = ct_extLinks.target_window VARCHAR(50);
 
     reference key (ct_extLinks.extLink_id);
 }

ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLink.java

@@ -38,11 +38,14 @@ import java.math.BigDecimal;
  */
 public class ExternalLink extends ContentPage {
 
-    /**
+    /** PDL property url */
-     * PDL property name for definition
-     */
     public static final String URL = "url";
-    public static final String DESCRIPTION = "description";
+    /** PDL property comment */
+    public static final String COMMENT = "comment";
+    /** PDL property showComment */
+    public static final String SHOW_COMMENT = "showComment";
+    /** PDL property targetWindow */
+    public static final String TARGET_WINDOW = "targetWindow";
 
     /**
      * Data object type for this domain object
@@ -127,24 +130,56 @@ public class ExternalLink extends ContentPage {
     }
 
     /**
-     * Retrieve the description for the resource the URL is pointing to.
+     * Retrieve the comment for this ExternalLink object.
      *
-     * @return Description about the URL this ExternalLink is redirecting to.
+     * @return The COMMENT shown when opening this link.
      */
-    @Override
+    public String getComment() {
-    public String getDescription() {
+        return (String) get(COMMENT);
-        return (String) get(DESCRIPTION);
     }
 
     /**
-     * Set the description for the resource the URL is pointing to.
+     * Set the Comment for this ExternalLink object. 
      * 
-     * @param description The description about the URL this ExternalLink 
+     * @param comment The COMMENT shown when opening this Link.
-     *                    is redirecting to.
      */
-    @Override
+    public void setComment(final String comment) {
-    public void setDescription(final String description) {
+        set(COMMENT, comment);
-        set(DESCRIPTION, description);
     }
     
+    /**
+     * Retrieve the value weather the comment will be shown.
+     *
+     * @return the value weather the comment will be shown
+     */
+    public String getShowComment() {
+        return (String) get(SHOW_COMMENT);
+    }
+
+    /**
+     * Set the value weather the comment should be shown. 
+     * 
+     * @param showComment The value weather the comment should be shown.
+     */
+    public void setShowComment(final String show) {
+        set(SHOW_COMMENT, show);
+    }
+    
+    /**
+     * Returns the target Window of this <code>ExternalLink</code>
+     *
+     * @return The Target Window
+     */
+    public String getTargetWindow() {
+        return (String) get(TARGET_WINDOW);
+    }
+
+    /**
+     * Sets the target Window of this <code>ExternalLink</code>
+     *
+     * @param window The Target Window
+     */
+    public void setTargetWindow(String window) {
+        set(TARGET_WINDOW, window);
+    }
 }

ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources.properties

@@ -1,10 +1,16 @@
 # ExternalLinkResources.properties
 
 cms.contenttypes.ui.edit=Edit
-cms.contenttypes.ExternalLink.name=Name(URL stub):
+cms.contenttypes.externallink.name=Name(URL stub):
-cms.contenttypes.ExternalLink.title=Title:
+cms.contenttypes.externallink.title=Title:
-cms.contenttypes.ExternalLink.location=Location (remote URL):
+cms.contenttypes.externallink.location=Location (remote URL):
-cms.contenttypes.ExternalLink.description=Description:
+cms.contenttypes.externallink.description=Description:
-cms.contenttypes.ExternalLink.type_label=ExternalLink
+cms.contenttypes.externallink.type_label=ExternalLink
-cms.contenttypes.ExternalLink.location_hint=The adress to an internetsite outside this safe environement. Through this contenttyp it is possible to use that external internetsite as a source or shortcut/link in other contenttypes.
+cms.contenttypes.externallink.location_hint=The adress to an internetsite outside this safe environement. Through this contenttyp it is possible to use that external internetsite as a source or shortcut/link in other contenttypes.
-cms.contenttypes.ExternalLink.description_hint=A short characterization  of this item. You should limit the text to 2-3 senentces. By default the description is displayed along with the title in every item list.
+cms.contenttypes.externallink.description_hint=A short characterization  of this item. You should limit the text to 2-3 senentces. By default the description is displayed along with the title in every item list.
+cms.contenttypes.externallink.comment=Comment:
+cms.contenttypes.externallink.comment_hint=A short comment about the link. E.g. "You're about to leave the safe environement...". This can be show optionally, if the link is pressed.
+cms.contenttypes.externallink.show_comment=Show the comment in a pop-up window
+cms.contenttypes.externallink.target_window=Open the external Link in a new window
+cms.contenttypes.externallink.yes=Yes
+cms.contenttypes.externallink.no=No

ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_de.properties

@@ -1,10 +1,16 @@
 # ExternalLinkResources_de.properties
 
 cms.contenttypes.ui.edit=Bearbeiten
-cms.contenttypes.ExternalLink.name=Name(als Teil-URL):
+cms.contenttypes.externallink.name=Name(als Teil-URL):
-cms.contenttypes.ExternalLink.title=Titel:
+cms.contenttypes.externallink.title=Titel:
-cms.contenttypes.ExternalLink.location=Ort (Ziel URL):
+cms.contenttypes.externallink.location=Ort (Ziel URL):
-cms.contenttypes.ExternalLink.description=Beschreibung:
+cms.contenttypes.externallink.description=Beschreibung:
-cms.contenttypes.ExternalLink.type_label=ExternalLink
+cms.contenttypes.externallink.type_label=ExternalLink
-cms.contenttypes.ExternalLink.location_hint=Die Adresse zu einer Internetseite, die au\u00dferhalb dieses gesichten Bereichs liegt. Dieses Dokument erm\u00f6glich es diese externe Internetseite als Quelle oder Verkn\u00fcpfung anderen Dokumenten hinzuzuf\u00fcgen.
+cms.contenttypes.externallink.location_hint=Die Adresse zu einer Internetseite, die au\u00dferhalb dieses gesichten Bereichs liegt. Dieses Dokument erm\u00f6glich es diese externe Internetseite als Quelle oder Verkn\u00fcpfung anderen Dokumenten hinzuzuf\u00fcgen.
-cms.contenttypes.ExternalLink.description_hint=Eine kurze Charakterisierung des Dokumentes, nach M\u00f6glichkeit nicht l\u00e4nger als 2-3 S\u00e4tze. Standardm\u00e4\u00dfig wird die Beschreibung zusammen mit dem Titel in allen Dokumentenliste angezeigt, um so Seiten mit hohem Informationsgehalt zu erzeugen.
+cms.contenttypes.externallink.description_hint=Eine kurze Charakterisierung des Dokumentes, nach M\u00f6glichkeit nicht l\u00e4nger als 2-3 S\u00e4tze. Standardm\u00e4\u00dfig wird die Beschreibung zusammen mit dem Titel in allen Dokumentenliste angezeigt, um so Seiten mit hohem Informationsgehalt zu erzeugen.
+cms.contenttypes.externallink.comment=Hinweistext:
+cms.contenttypes.externallink.comment_hint=Ein kurzer Hinweistext zum Link. Z.B. "Sie verlassen den gesicherten Bereich...". Dieser kann wahlweise angezeigt werden, wenn der Link angeklickt wird.
+cms.contenttypes.externallink.show_comment=Zeige den Hinweistext in einem pop-up Fenster
+cms.contenttypes.externallink.target_window=\u00d6ffne den externen Link in einem neuen Fenster
+cms.contenttypes.externallink.yes=Ja
+cms.contenttypes.externallink.no=Nein

ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_en.properties

@@ -1,10 +1,16 @@
 # ExternalLinkResources_en.properties
 
 cms.contenttypes.ui.edit=Edit
-cms.contenttypes.ExternalLink.name=Name(URL stub):
+cms.contenttypes.externallink.name=Name(URL stub):
-cms.contenttypes.ExternalLink.title=Title:
+cms.contenttypes.externallink.title=Title:
-cms.contenttypes.ExternalLink.location=Location (remote URL):
+cms.contenttypes.externallink.location=Location (remote URL):
-cms.contenttypes.ExternalLink.description=Description:
+cms.contenttypes.externallink.description=Description:
-cms.contenttypes.ExternalLink.type_label=ExternalLink
+cms.contenttypes.externallink.type_label=ExternalLink
-cms.contenttypes.ExternalLink.location_hint=The adress to an internetsite outside this safe environement. Through this contenttyp it is possible to use that external internetsite as a source or shortcut/link in other contenttypes.
+cms.contenttypes.externallink.location_hint=The adress to an internetsite outside this safe environement. Through this contenttyp it is possible to use that external internetsite as a source or shortcut/link in other contenttypes.
-cms.contenttypes.ExternalLink.description_hint=A short characterization  of this item. You should limit the text to 2-3 senentces. By default the description is displayed along with the title in every item list.
+cms.contenttypes.externallink.description_hint=A short characterization  of this item. You should limit the text to 2-3 senentces. By default the description is displayed along with the title in every item list.
+cms.contenttypes.externallink.comment=Comment:
+cms.contenttypes.externallink.comment_hint=A short comment about the link. E.g. "You're about to leave the safe environement...". This can be show optionally, if the link is pressed.
+cms.contenttypes.externallink.show_comment=Show the comment in a pop-up window
+cms.contenttypes.externallink.target_window=Open the external Link in a new window
+cms.contenttypes.externallink.yes=Yes
+cms.contenttypes.externallink.no=No

ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ui/ExternalLinkPropertiesStep.java

@@ -79,13 +79,19 @@ public class ExternalLinkPropertiesStep extends SimpleEditStep {
         final DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
 
         sheet.add(ExternalLinkGlobalizationUtil.globalize(
-                "cms.contenttypes.ExternalLink.name"), ExternalLink.NAME);
+                "cms.contenttypes.externallink.name"), ExternalLink.NAME);
         sheet.add(ExternalLinkGlobalizationUtil.globalize(
-                "cms.contenttypes.ExternalLink.title"), ExternalLink.TITLE);
+                "cms.contenttypes.externallink.title"), ExternalLink.TITLE);
         sheet.add(ExternalLinkGlobalizationUtil.globalize(
-                "cms.contenttypes.ExternalLink.location"), ExternalLink.URL);
+                "cms.contenttypes.externallink.description"), ExternalLink.DESCRIPTION);
         sheet.add(ExternalLinkGlobalizationUtil.globalize(
-                "cms.contenttypes.ExternalLink.description"), ExternalLink.DESCRIPTION);
+                "cms.contenttypes.externallink.location"), ExternalLink.URL);
+        sheet.add(ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.comment"), ExternalLink.COMMENT);
+        //sheet.add(ExternalLinkGlobalizationUtil.globalize(
+        //        "cms.contenttypes.externallink.show_comment"), ExternalLink.SHOW_COMMENT);
+        //sheet.add(ExternalLinkGlobalizationUtil.globalize(
+        //        "cms.contenttypes.externallink.target_window"), ExternalLink.TARGET_WINDOW);
 
         return sheet;
     }

ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ui/ExternalLinkPropertyForm.java

@@ -23,9 +23,12 @@ import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.FormInitListener;
 import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
+import com.arsdigita.bebop.form.CheckboxGroup;
+import com.arsdigita.bebop.form.Option;
 import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.TrimmedStringParameter;
+import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.contenttypes.ExternalLink;
 import com.arsdigita.cms.contenttypes.util.ExternalLinkGlobalizationUtil;
 import com.arsdigita.cms.ItemSelectionModel;
@@ -50,8 +53,10 @@ public class ExternalLinkPropertyForm extends BasicPageForm
     public static final String ID = "externallinkform_edit";  
     // formerly "externalLinkEdit"
 
-    private TextField url;
     private TextArea description;
+    private TextField url;
+    private TextArea comment;
+    private CheckboxGroup showCommentCheckBox, targetWindowCheckBox;
 
     /**
      * Creates a new form to edit the ExternalLink object specified by the 
@@ -71,20 +76,47 @@ public class ExternalLinkPropertyForm extends BasicPageForm
     protected void addWidgets() {
         super.addWidgets();
 
-        final TextField urlWidget = new TextField(new TrimmedStringParameter(ExternalLink.URL));
+        description = new TextArea(new TrimmedStringParameter(
-        urlWidget.setLabel(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.location"));
+                ContentPage.DESCRIPTION), 5, 40, TextArea.SOFT);
-        urlWidget.setHint(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.location_hint"));
+        description.setLabel(ExternalLinkGlobalizationUtil.globalize(
-        add(urlWidget);
+                "cms.contenttypes.externallink.description"));
-        url = new TextField(ExternalLink.URL);
+        description.setHint(ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.description_hint"));
+        add(description);
+        
+        
+        url = new TextField(new TrimmedStringParameter(ExternalLink.URL));
+        url.setLabel(ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.location"));
+        url.setHint(ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.location_hint"));
         url.setSize(40);
         add(url);
         
-        final TextField descriptionWidget = new TextField(new TrimmedStringParameter(ExternalLink.DESCRIPTION));
+        
-        descriptionWidget.setLabel(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.description"));
+        comment = new TextArea(new TrimmedStringParameter(
-        descriptionWidget.setHint(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.description_hint"));
+                ExternalLink.COMMENT), 5, 40, TextArea.SOFT);
-        add(descriptionWidget);
+        comment.setLabel(ExternalLinkGlobalizationUtil.globalize(
-        description = new TextArea(ExternalLink.DESCRIPTION, 5, 40, TextArea.SOFT);
+                "cms.contenttypes.externallink.comment"));
-        add(description);
+        comment.setHint(ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.comment_hint"));
+        add(comment);
+        
+        
+        Option showComment = new Option(ExternalLink.SHOW_COMMENT, 
+                new Label(ExternalLinkGlobalizationUtil.globalize(
+                        "cms.contenttypes.externallink.show_comment")));
+        showCommentCheckBox = new CheckboxGroup("showCommentCheckBox");
+        showCommentCheckBox.addOption(showComment);
+        add(showCommentCheckBox);
+        
+        
+        Option targetWindow = new Option(ExternalLink.TARGET_WINDOW,
+                new Label(ExternalLinkGlobalizationUtil.globalize(
+                        "cms.contenttypes.externallink.target_window")));
+        targetWindowCheckBox = new CheckboxGroup("targetWindowCheckBox");
+        targetWindowCheckBox.addOption(targetWindow);
+        add(targetWindowCheckBox);
     }
 
     /**
@@ -97,8 +129,19 @@ public class ExternalLinkPropertyForm extends BasicPageForm
         final ExternalLink extLink = (ExternalLink) super.initBasicWidgets(fse);
 
         final PageState state = fse.getPageState();
-        url.setValue(state, extLink.getURL());
         description.setValue(state, extLink.getDescription());
+        url.setValue(state, extLink.getURL());
+        comment.setValue(state, extLink.getComment());
+        String showComment = ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.yes").localize().equals(
+                        extLink.getShowComment()) ? 
+                extLink.SHOW_COMMENT : null;
+        showCommentCheckBox.setValue(state, showComment);
+        String newWindow = ExternalLinkGlobalizationUtil.globalize(
+                "cms.contenttypes.externallink.yes").localize().equals(
+                        extLink.getTargetWindow()) ?
+                extLink.TARGET_WINDOW : null;
+        targetWindowCheckBox.setValue(state, newWindow);
     }
 
     /**
@@ -108,15 +151,42 @@ public class ExternalLinkPropertyForm extends BasicPageForm
      */
     @Override
     public void process(final FormSectionEvent fse) {
-        final ExternalLink site = (ExternalLink) super.processBasicWidgets(fse);
+        final ExternalLink extLink = (ExternalLink) super.processBasicWidgets(fse);
 
         final PageState state = fse.getPageState();
         // save only if save button was pressed
-        if (site != null
+        if (extLink != null && 
-            && getSaveCancelSection().getSaveButton().isSelected(state)) {
+                getSaveCancelSection().getSaveButton().isSelected(state)) {
-            site.setURL((String) url.getValue(state));
+            extLink.setDescription((String) description.getValue(state));
-            site.setDescription((String) description.getValue(state));
+            extLink.setURL((String) url.getValue(state));
+            extLink.setComment((String) comment.getValue(state));
+            // Process whether a comment will be shown
+            boolean showComment = false;
+            String[] value = (String[]) showCommentCheckBox.getValue(state);
+            if (value != null) {
+                showComment = extLink.SHOW_COMMENT.equals(value[0]);
+            }
+            if (showComment) {
+                extLink.setShowComment((String) ExternalLinkGlobalizationUtil.globalize(
+                        "cms.contenttypes.externallink.yes").localize());
+            } else {
+                extLink.setShowComment((String) ExternalLinkGlobalizationUtil.globalize(
+                        "cms.contenttypes.externallink.no").localize());
+            }
+            // Process whether the external link will be opened in a new 
+            // window
+            boolean newWindow  = false;
+            value = (String[]) targetWindowCheckBox.getValue(state);
+            if (value != null) {
+                newWindow = extLink.TARGET_WINDOW.equals(value[0]);
+            }
+            if (newWindow) {
+                extLink.setTargetWindow((String) ExternalLinkGlobalizationUtil.globalize(
+                        "cms.contenttypes.externallink.yes").localize());
+            } else {
+                extLink.setTargetWindow((String) ExternalLinkGlobalizationUtil.globalize(
+                        "cms.contenttypes.externallink.no").localize());
+            }
         }
     }
-
 }

ccm-webpage/src/com/arsdigita/cms/webpage/WebpageResources.properties

@@ -7,3 +7,4 @@ webpage.ui.no_such_contentsection=no such content section.
 webpage.ui.illegal_portlet=Illegal portlet ID
 webpage.ui.illegal_webpage_portlet=Illegal Webpage Portlet ID
 webpage.ui.no_permission_edit=You do not have permission to edit this item.
+cms.webpage.webpage.type_label=Webpage

ccm-webpage/src/com/arsdigita/cms/webpage/WebpageResources_de.properties

@@ -7,3 +7,4 @@ webpage.ui.no_such_contentsection=no such content section.
 webpage.ui.illegal_portlet=Illegal portlet ID
 webpage.ui.illegal_webpage_portlet=Illegal Webpage Portlet ID
 webpage.ui.no_permission_edit=Sie haben nicht die Erlaubnis dieses Item zu editieren.
+cms.webpage.webpage.type_label=Internetseite