From dd5ef8b6094bc9d6e8a6101ec68963e5e5d07221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Gn=C3=A4gi?= <gnaegi@frentix.com> Date: Thu, 30 Jan 2020 15:20:46 +0100 Subject: [PATCH] OO-4511 Usability: add title to notes list --- .../ui/_content/cert_statement_list.html | 22 +++++++++++++------ .../org/olat/note/NoteListController.java | 6 ++++- .../org/olat/note/_content/notesList.html | 2 ++ 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/olat/note/_content/notesList.html diff --git a/src/main/java/org/olat/course/certificate/ui/_content/cert_statement_list.html b/src/main/java/org/olat/course/certificate/ui/_content/cert_statement_list.html index 2c3753c21ff..7cc00559753 100644 --- a/src/main/java/org/olat/course/certificate/ui/_content/cert_statement_list.html +++ b/src/main/java/org/olat/course/certificate/ui/_content/cert_statement_list.html @@ -1,8 +1,16 @@ -<h2 ><i class="o_icon o_icon o_icon-fw o_icon_certificate"> </i>$r.translate("certificates.and.statements.title")</h2> - #if($r.available("coaching.tool")) -<div class="o_button_group o_button_group_right"> - $r.render("coaching.tool") -</div> -#end -$r.render("certificates") \ No newline at end of file +## in user management +<fieldset > + <legend> + <i class="o_icon o_icon o_icon-fw o_icon_certificate"> </i>$r.translate("certificates.and.statements.title") + </legend> + <div class="o_button_group o_button_group_right"> + $r.render("coaching.tool") + </div> + $r.render("certificates") +</fieldset> +#else +## in users home +<h2 ><i class="o_icon o_icon o_icon-fw o_icon_certificate"> </i>$r.translate("certificates.and.statements.title")</h2> +$r.render("certificates") +#end \ No newline at end of file diff --git a/src/main/java/org/olat/note/NoteListController.java b/src/main/java/org/olat/note/NoteListController.java index 13bf3d210c9..6b36b9b1a8e 100644 --- a/src/main/java/org/olat/note/NoteListController.java +++ b/src/main/java/org/olat/note/NoteListController.java @@ -36,6 +36,7 @@ import org.olat.core.gui.components.table.Table; import org.olat.core.gui.components.table.TableController; import org.olat.core.gui.components.table.TableEvent; import org.olat.core.gui.components.table.TableGuiConfiguration; +import org.olat.core.gui.components.velocity.VelocityContainer; import org.olat.core.gui.control.Controller; import org.olat.core.gui.control.Event; import org.olat.core.gui.control.WindowControl; @@ -93,8 +94,11 @@ public class NoteListController extends BasicController implements GenericEventL tableC.addColumnDescriptor(new StaticColumnDescriptor("delete", "table.header.delete", translate( "action.delete"))); populateNLTable(); + + VelocityContainer notesListVC = createVelocityContainer("notesList"); + notesListVC.put("table", tableC.getInitialComponent()); - putInitialPanel(tableC.getInitialComponent()); + putInitialPanel(notesListVC); sec = ureq.getUserSession().getSingleUserEventCenter(); sec.registerFor(this, ureq.getIdentity(), OresHelper.lookupType(Note.class)); diff --git a/src/main/java/org/olat/note/_content/notesList.html b/src/main/java/org/olat/note/_content/notesList.html new file mode 100644 index 00000000000..4ae06a3dee3 --- /dev/null +++ b/src/main/java/org/olat/note/_content/notesList.html @@ -0,0 +1,2 @@ +<h2 ><i class="o_icon o_icon o_icon-fw o_icon_notes"> </i>$r.translate("notesPortlet.title")</h2> +$r.render("table") \ No newline at end of file -- GitLab