From c603b21b678e7351be66a6b4572ccf5a1a5c3363 Mon Sep 17 00:00:00 2001 From: tosmers Date: Wed, 4 Mar 2015 21:09:18 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20(i)=20Die=20Bearbeiten-Umgebung=20ei?= =?UTF-8?q?nes=20externen=20Links=20um=20Informationen=20zu=20den=20versch?= =?UTF-8?q?iedenen=20Attribut-Labelen=20erg=C3=A4nzt=20(ii)=20Die=20letzte?= =?UTF-8?q?n=20Benennungs-Fehler=20in=20den=20Dateien=20externallink-item.?= =?UTF-8?q?jsp=20und=20externallink2-item.jsp=20beseitigt=20(iii)=20Englis?= =?UTF-8?q?ch=20-=20Deutsch=20=C3=9Cbersetztung=20eines=20keys=20in=20der?= =?UTF-8?q?=20CMSResources.properties=20getauscht.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3274 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/ExternalLink.xml | 18 ++++++------- .../cms/contenttypes/externallink-item.jsp | 6 ++--- .../cms/contenttypes/externallink2-item.jsp | 25 +++++++++++-------- .../ExternalLinkResources.properties | 7 ++++-- .../ExternalLinkResources_de.properties | 7 ++++-- .../ExternalLinkResources_en.properties | 7 ++++-- .../ui/ExternalLinkPropertyForm.java | 17 +++++++++---- .../com/arsdigita/cms/CMSResources.properties | 2 +- .../arsdigita/cms/CMSResources_de.properties | 2 +- 9 files changed, 56 insertions(+), 35 deletions(-) diff --git a/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ExternalLink.xml b/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ExternalLink.xml index de167c7c0..44995228e 100644 --- a/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ExternalLink.xml +++ b/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ExternalLink.xml @@ -1,20 +1,20 @@ + xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> - + diff --git a/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink-item.jsp b/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink-item.jsp index 21a4bdb9e..ce56c0cf2 100644 --- a/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink-item.jsp +++ b/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink-item.jsp @@ -2,14 +2,14 @@ xmlns:define="/WEB-INF/bebop-define.tld" xmlns:show="/WEB-INF/bebop-show.tld" version="1.2"> - + CMSContext ctx = CMS.getContext(); if (ctx.hasContentItem()) { - EForm eform = (EForm) ctx.getContentItem(); - String url = eform.getURL(); + ExternalLink extLink = (ExternalLink) ctx.getContentItem(); + String url = extLink.getURL(); if (url != null && url.length() > 0) { response.sendRedirect(url); } diff --git a/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink2-item.jsp b/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink2-item.jsp index 3b37d3df4..33415079f 100644 --- a/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink2-item.jsp +++ b/ccm-cms-types-externallink/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/externallink2-item.jsp @@ -1,19 +1,24 @@ -<%@page import="com.arsdigita.camden.cms.contenttypes.EForm,com.arsdigita.cms.CMS,com.arsdigita.cms.CMSContext" %> +<%@page import="com.arsdigita.cms.contenttypes.ExternalLink, + com.arsdigita.cms.CMS, + com.arsdigita.cms.CMSContext" %> <% CMSContext ctx = CMS.getContext(); if (ctx.hasContentItem()) { - EForm eform = (EForm) ctx.getContentItem(); - String url = eform.getURL(); - String title = eform.getTitle(); + ExternalLink extLink = (ExternalLink) ctx.getContentItem(); + String url = extLink.getURL(); + String title = extLink.getTitle(); if (url != null && url.length() > 0) { %> - - - - - <%= title %> - + + + + + + + <%= title %> + + <% } diff --git a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources.properties b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources.properties index eb2f34ce7..918c17fe4 100644 --- a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources.properties +++ b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources.properties @@ -1,7 +1,10 @@ # ExternalLinkResources.properties cms.contenttypes.ui.edit=Edit -cms.contenttypes.ExternalLink.name=Name (URL): +cms.contenttypes.ExternalLink.name=Name(URL stub): cms.contenttypes.ExternalLink.title=Title: cms.contenttypes.ExternalLink.location=Location (remote URL): -cms.contenttypes.ExternalLink.description=ExternalLink description: +cms.contenttypes.ExternalLink.description=Description: +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.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. diff --git a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_de.properties b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_de.properties index 61bfed054..4d006cc23 100644 --- a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_de.properties +++ b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_de.properties @@ -1,7 +1,10 @@ # ExternalLinkResources_de.properties cms.contenttypes.ui.edit=Bearbeiten -cms.contenttypes.ExternalLink.name=Name (URL): +cms.contenttypes.ExternalLink.name=Name(als Teil-URL): cms.contenttypes.ExternalLink.title=Titel: cms.contenttypes.ExternalLink.location=Ort (Ziel URL): -cms.contenttypes.ExternalLink.description=Beschreibung des externen Links: +cms.contenttypes.ExternalLink.description=Beschreibung: +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.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. diff --git a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_en.properties b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_en.properties index ee42bfb7a..faeba78c6 100644 --- a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_en.properties +++ b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ExternalLinkResources_en.properties @@ -1,7 +1,10 @@ # ExternalLinkResources_en.properties cms.contenttypes.ui.edit=Edit -cms.contenttypes.ExternalLink.name=Name (URL): +cms.contenttypes.ExternalLink.name=Name(URL stub): cms.contenttypes.ExternalLink.title=Title: cms.contenttypes.ExternalLink.location=Location (remote URL): -cms.contenttypes.ExternalLink.description=ExternalLink description: +cms.contenttypes.ExternalLink.description=Description: +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.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. diff --git a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ui/ExternalLinkPropertyForm.java b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ui/ExternalLinkPropertyForm.java index a69aefda8..4aa67e7b2 100644 --- a/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ui/ExternalLinkPropertyForm.java +++ b/ccm-cms-types-externallink/src/com/arsdigita/cms/contenttypes/ui/ExternalLinkPropertyForm.java @@ -25,6 +25,7 @@ import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.parameters.TrimmedStringParameter; import com.arsdigita.cms.contenttypes.ExternalLink; import com.arsdigita.cms.contenttypes.util.ExternalLinkGlobalizationUtil; import com.arsdigita.cms.ItemSelectionModel; @@ -70,12 +71,18 @@ public class ExternalLinkPropertyForm extends BasicPageForm protected void addWidgets() { super.addWidgets(); - add(new Label(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.location"))); + final TextField urlWidget = new TextField(new TrimmedStringParameter(ExternalLink.URL)); + urlWidget.setLabel(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.location")); + urlWidget.setHint(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.location_hint")); + add(urlWidget); url = new TextField(ExternalLink.URL); url.setSize(40); add(url); - add(new Label(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.description"))); + final TextField descriptionWidget = new TextField(new TrimmedStringParameter(ExternalLink.DESCRIPTION)); + descriptionWidget.setLabel(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.description")); + descriptionWidget.setHint(ExternalLinkGlobalizationUtil.globalize("cms.contenttypes.ExternalLink.description_hint")); + add(descriptionWidget); description = new TextArea(ExternalLink.DESCRIPTION, 5, 40, TextArea.SOFT); add(description); } @@ -87,11 +94,11 @@ public class ExternalLinkPropertyForm extends BasicPageForm */ @Override public void init(final FormSectionEvent fse) { - final ExternalLink site = (ExternalLink) super.initBasicWidgets(fse); + final ExternalLink extLink = (ExternalLink) super.initBasicWidgets(fse); final PageState state = fse.getPageState(); - url.setValue(state, site.getURL()); - description.setValue(state, site.getDescription()); + url.setValue(state, extLink.getURL()); + description.setValue(state, extLink.getDescription()); } /** diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index 641ba18ba..7f8c50901 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1056,7 +1056,7 @@ cms.contenttypes.ui.lead_hint=A short characterization of this item. You should cms.contenttypes.ui.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.ui.summary_hint=Propably 3-4 sentences to characterize the most important and interesting aspects of the item. By default it will be displayed along with the title in all item list, making up an rich information site. cms.contenttypes.ui.title_hint=The title of the item readable by the user. Besides special circumstances, should not exceed 2 text lines. -cms.contenttypes.ui.name_hint=Nicht Teil des Dokumentes wie es Besuchern angezeigt wird. Es handelt sich um den letzten Teil der URL (nach dem letzten "/") und ist somit Teil der Internet Addresse dieses Dokumentes. Es wird oben im Adressfeld des Browsers angezeigt. Es wird automatisch aus dem Titel generiert, wobei unzul\u00e4ssige Zeichen ersetzt werden. Bei einem sehr langen Titel kann eine manuelle K\u00fcrzung sinnvoll sein, um \u00fcberlange Adresszeilen zu vermeiden. +cms.contenttypes.ui.name_hint=Not part of the item as displayed to the user. It is the last part of the URL (after the last "/") and is part of the internet address of this item. It is displayed in the browsers address field. Made up automatically using the title, illegal characters replaced. With a long title you may choose to shorten it to avoid overly long internet addresses. #used for tabs in content section cms.ui.images=Images cms.ui.folder.additionalInfo=Info diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index 13f97038a..ac1493d74 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1050,7 +1050,7 @@ cms.contenttypes.ui.lead_hint=Eine kurze Charakterisierung des Dokumentes, nach cms.contenttypes.ui.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.ui.summary_hint=Nach M\u00f6glichkeit maximal 3-4 S\u00e4tze zur Charakterisierung der wichtigsten und f\u00fcr Leser interessantesten Aspekte des Dokuments. Standardm\u00e4\u00dfig wird die Beschreibung zusammen mit dem Titel in allen Dokumentenliste angezeigt, um so Seiten mit hohem Informationsgehalt zu erzeugen. cms.contenttypes.ui.title_hint=Titel des Dokuments wie ihn Besucher lesen sollen. Abgesehen von Sonderf\u00e4llen sollten 2 Zeilen auf keinen Fall \u00fcberschritten werden. Eine Beschr\u00e4nkung auf eine Zeile ist vorzuziehen. Der Titel wird jedesmal zusammen mit dem Dokument angezeigt. -cms.contenttypes.ui.name_hint=Not part of the item as displayed to the user. It is the last part of the URL (after the last "/") and is part of the internet address of this item. It is displayed in the browsers address field. Made up automatically using the title, illegal characters replaced. With a long title you may choose to shorten it to avoid overly long internet addresses. +cms.contenttypes.ui.name_hint=Nicht Teil des Dokumentes wie es Besuchern angezeigt wird. Es handelt sich um den letzten Teil der URL (nach dem letzten "/") und ist somit Teil der Internet Addresse dieses Dokumentes. Es wird oben im Adressfeld des Browsers angezeigt. Es wird automatisch aus dem Titel generiert, wobei unzul\u00e4ssige Zeichen ersetzt werden. Bei einem sehr langen Titel kann eine manuelle K\u00fcrzung sinnvoll sein, um \u00fcberlange Adresszeilen zu vermeiden. #used for tabs in content section cms.ui.images=Bilder cms.ui.folder.additionalInfo=Info