From 38c0a976b444eeb49fadcdc84c61eeedbbd6a6a9 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 4 Sep 2020 07:21:22 +0200
Subject: [PATCH] OO-4854: backport add message for easier usage
---
.../repository/ui/catalog/CatalogNodeManagerController.java | 2 +-
.../java/org/olat/repository/ui/catalog/_content/node.html | 3 ++-
.../repository/ui/catalog/_i18n/LocalStrings_de.properties | 1 +
.../repository/ui/catalog/_i18n/LocalStrings_en.properties | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java b/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
index 002c5bb1acd..42f0196bcc3 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
@@ -315,7 +315,7 @@ public class CatalogNodeManagerController extends FormBasicController implements
FlexiTableColumnModel nodeEntriesColumnsModel = getNodeFlexiTableColumnModel("nodes-", showCategoryUpDownColumn);
nodeEntriesModel = new NodeEntryRowModel(nodeEntriesColumnsModel);
- nodeEntriesEl = uifactory.addTableElement(getWindowControl(), "nodeEntries", nodeEntriesModel, getTranslator(), formLayout);
+ nodeEntriesEl = uifactory.addTableElement(getWindowControl(), "nodeEntries", nodeEntriesModel, 20, false, getTranslator(), formLayout);
}
private FlexiTableColumnModel getCatalogFlexiTableColumnModel(String cmdPrefix, boolean sortEnabled, boolean showUpDownColumn) {
diff --git a/src/main/java/org/olat/repository/ui/catalog/_content/node.html b/src/main/java/org/olat/repository/ui/catalog/_content/node.html
index 4b2db8e2f0a..14c6a6b7d0c 100644
--- a/src/main/java/org/olat/repository/ui/catalog/_content/node.html
+++ b/src/main/java/org/olat/repository/ui/catalog/_content/node.html
@@ -74,6 +74,7 @@
#end
## Render node list component
#if($isOrdering)
+ <div class="o_info">$r.translate("catalog.order.info")</div>
$r.render("nodeEntries")
#if($r.available("entries"))
<hr>
@@ -120,4 +121,4 @@
</div>
#end
#end
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_de.properties
index 77ed6a2275d..44e827e5575 100644
--- a/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_de.properties
@@ -13,6 +13,7 @@ cat.move.submit=Element verschieben.
cat.move.title=Eintrag an Kategorie anh\u00E4ngen\!
catalog.locked.by=Die Aktion kann nicht ausgef\u00fchrt werden, da der Katalog zur Zeit vom Benutzer {0} bearbeitet wird.
catalog.locked.by.same.user=$\:catalog.locked.by $org.olat.core\:lock.same.user.different.window
+catalog.order.info=Hier k\u00F6nnen Sie die Anzeige-Reihenfolge der Kategorien und Eintr\u00E4ge ver\u00E4ndern.<br>Die manuelle Sortierung ist nur m\u00F6glich, wenn keine automatische Sortierung aktiviert ist.<br>Diese Einstellungen k\u00F6nnen Sie im Men\u00fc unter \u0022Daten \u00E4ndern\u0022 anpassen.
catalog.popup.edit.shorttitle.desc=Setzen Sie einen Kurztitel zur Anzeige bei den Tiles.
catalog.popup.position.error.number.format=Nur Zahlen eingeben
catalog.popup.position.error.number=Werte von {0} bis {1} sind zul\u00e4ssig
diff --git a/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_en.properties
index cbb11acee4f..4788b953df7 100644
--- a/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/ui/catalog/_i18n/LocalStrings_en.properties
@@ -15,6 +15,7 @@ catalog.courses=My courses
catalog.locked.by=Cannot start action at this time because this catalog is currently being edited by user {0}
catalog.locked.by.same.user=$\:catalog.locked.by $org.olat.core\:lock.same.user.different.window
catalog.new=Catalog in own site
+catalog.order.info=Here you can change the display order of categories and entries.<br>Manual sorting is only possible if automatic sorting is not activated.<br>You can adjust these settings in the menu under \u0022Modify data\u0022.
catalog.popup.edit.shorttitle.desc=Add a short title for tiles view.
catalog.popup.position.error.number.format=Only numeric inputs
catalog.popup.position.error.number=Only values from {0} to {1}
--
GitLab