From 03dbc0035c3273ab929f1d39c519b4efa5379949 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 5 Apr 2017 10:20:31 +0200
Subject: [PATCH] OO-2672: add tooltip for the status
---
.../portfolio/ui/AbstractPageListController.java | 2 +-
.../ui/renderer/StatusCellRenderer.java | 16 +++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
index adf116fae51..c8b8c36b610 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
@@ -195,7 +195,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, PageCols.key, "select-page"));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(PageCols.title, "select-page", new PortfolioElementCellRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(PageCols.date, "select-page"));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(PageCols.status, new StatusCellRenderer()));
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(PageCols.status, new StatusCellRenderer(getTranslator())));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(PageCols.publicationDate, "select-page"));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(PageCols.categories, new CategoriesCellRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, PageCols.section/*, "select-section"*/, null));
diff --git a/src/main/java/org/olat/modules/portfolio/ui/renderer/StatusCellRenderer.java b/src/main/java/org/olat/modules/portfolio/ui/renderer/StatusCellRenderer.java
index 6054b33dbbf..62be105500b 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/renderer/StatusCellRenderer.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/renderer/StatusCellRenderer.java
@@ -35,16 +35,26 @@ import org.olat.modules.portfolio.SectionStatus;
*
*/
public class StatusCellRenderer implements FlexiCellRenderer {
+
+ private final Translator translator;
+
+ public StatusCellRenderer(Translator translator) {
+ this.translator = translator;
+ }
@Override
public void render(Renderer renderer, StringOutput target, Object cellValue,
- int row, FlexiTableComponent source, URLBuilder ubu, Translator translator) {
+ int row, FlexiTableComponent source, URLBuilder ubu, Translator trans) {
if(cellValue instanceof PageStatus) {
PageStatus status = (PageStatus)cellValue;
- target.append("<i class='o_icon ").append(status.cssClass()).append(" o_icon-fw'> </i>");
+ String tip = translator.translate(status.i18nKey());
+ target.append("<i class='o_icon ").append(status.cssClass()).append(" o_icon-fw' title='")
+ .append(tip).append("'> </i>");
} else if(cellValue instanceof SectionStatus) {
SectionStatus status = (SectionStatus)cellValue;
- target.append("<i class='o_icon ").append(status.cssClass()).append(" o_icon-fw'> </i>");
+ String tip = translator.translate(status.i18nKey());
+ target.append("<i class='o_icon ").append(status.cssClass()).append(" o_icon-fw' title='")
+ .append(tip).append("'> </i>");
}
}
}
--
GitLab