Skip to content
Snippets Groups Projects
Commit 517308a4 authored by srosse's avatar srosse
Browse files

OO-1886: backport changeset to 10.4

parent 472be01c
No related branches found
No related tags found
No related merge requests found
...@@ -298,11 +298,11 @@ public class LLEditForm extends FormBasicController { ...@@ -298,11 +298,11 @@ public class LLEditForm extends FormBasicController {
private void addNewFormLink(int index, final LLModel link) { private void addNewFormLink(int index, final LLModel link) {
// add link target // add link target
TextElement lTarget = uifactory.addTextElement("target" + counter, null, -1, link.getTarget(), flc); TextElement lTarget = uifactory.addTextElement("target" + counter, null, -1, link.getTarget(), flc);
lTarget.setPlaceholderKey("target.example", null);
lTarget.clearError(); lTarget.clearError();
lTarget.setEnabled(!link.isIntern()); lTarget.setEnabled(!link.isIntern());
lTarget.setDisplaySize(40); lTarget.setDisplaySize(40);
lTarget.setMandatory(true); lTarget.setMandatory(true);
lTarget.setExampleKey("target.example", null);
lTarget.setNotEmptyCheck("ll.table.target.error"); lTarget.setNotEmptyCheck("ll.table.target.error");
lTarget.setItemValidatorProvider(new ItemValidatorProvider() { lTarget.setItemValidatorProvider(new ItemValidatorProvider() {
public boolean isValidValue(String value, ValidationError validationError, Locale locale) { public boolean isValidValue(String value, ValidationError validationError, Locale locale) {
...@@ -333,14 +333,14 @@ public class LLEditForm extends FormBasicController { ...@@ -333,14 +333,14 @@ public class LLEditForm extends FormBasicController {
lDescription.setDisplaySize(20); lDescription.setDisplaySize(20);
lDescription.setNotEmptyCheck("ll.table.description.error"); lDescription.setNotEmptyCheck("ll.table.description.error");
lDescription.setMandatory(true); lDescription.setMandatory(true);
lDescription.setExampleKey("ll.table.description", null); lDescription.setPlaceholderKey("ll.table.description", null);
lDescription.setUserObject(link); lDescription.setUserObject(link);
lDescriptionInputList.add(index, lDescription); lDescriptionInputList.add(index, lDescription);
// add link comment // add link comment
TextElement lComment =uifactory.addTextAreaElement("comment" + counter, null, -1, 2, 50, true, link.getComment(), flc); TextElement lComment =uifactory.addTextAreaElement("comment" + counter, null, -1, 2, 50, true, link.getComment(), flc);
lComment.setPlaceholderKey("ll.table.comment", null);
lComment.setDisplaySize(20); lComment.setDisplaySize(20);
lComment.setExampleKey("ll.table.comment", null);
lComment.setUserObject(link); lComment.setUserObject(link);
lCommentInputList.add(index, lComment); lCommentInputList.add(index, lComment);
......
...@@ -9,15 +9,15 @@ config.nolinks.long = Sie haben noch keine Links in dieser Liste erstellt. ...@@ -9,15 +9,15 @@ config.nolinks.long = Sie haben noch keine Links in dieser Liste erstellt.
ll.table.target = Linkziel ll.table.target = Linkziel
ll.table.html_target = Neues Fenster ll.table.html_target = Neues Fenster
ll.table.html_target.self = Gleiches Fenster ll.table.html_target.self = Gleiches Fenster
ll.table.description = Beschreibung ll.table.description = Titel angeben
ll.table.comment = Kommentar ll.table.comment = Geben Sie eine optionale Beschreibung f\u00DCr diesen Link an
ll.table.delete = - ll.table.delete = -
ll.table.add = + ll.table.add = +
ll.table.media = Media ll.table.media = Media
ll.table.target.error = Bitte URL eintragen ll.table.target.error = Bitte URL eintragen
ll.table.target.error.format = Ungltiges URL Format ll.table.target.error.format = Ung\u00DCltiges URL Format
ll.table.description.error = Bitte Beschreibung ausfllen ll.table.description.error = Bitte Beschreibung ausf\u00DCllen
ll.table.mandatory = * ... Pflichtfeld ll.table.mandatory = * ... Pflichtfeld
target.example=http://www.openolat.org target.example=http://www.openolat.org
...@@ -4,9 +4,9 @@ config.header=Link list ...@@ -4,9 +4,9 @@ config.header=Link list
config.nolinks.long=You have not created any links in this list yet. config.nolinks.long=You have not created any links in this list yet.
config.nolinks.short=Links incomplete. config.nolinks.short=Links incomplete.
ll.table.add=+ ll.table.add=+
ll.table.comment=Comment ll.table.comment=Enter an optional description for this link
ll.table.delete=- ll.table.delete=-
ll.table.description=Description ll.table.description=Enter a title
ll.table.description.error=Please fill in description ll.table.description.error=Please fill in description
ll.table.html_target=New window ll.table.html_target=New window
ll.table.html_target.self=Same window ll.table.html_target.self=Same window
...@@ -17,4 +17,4 @@ ll.table.target.error=Please insert URL ...@@ -17,4 +17,4 @@ ll.table.target.error=Please insert URL
ll.table.target.error.format=Invalid URL format ll.table.target.error.format=Invalid URL format
pane.tab.accessibility=Access pane.tab.accessibility=Access
pane.tab.llconfig=Configuration pane.tab.llconfig=Configuration
target.example=http://www.openolat.org target.example=Enter URL or select target
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment