diff --git a/src/main/java/org/olat/modules/forms/ui/_content/editor.html b/src/main/java/org/olat/modules/forms/ui/_content/editor.html index 30b224bc88735194c9b954d88b140aeb7538c112..40db112c72b2a13e5c5ccc680ebf951edb7aad7a 100644 --- a/src/main/java/org/olat/modules/forms/ui/_content/editor.html +++ b/src/main/java/org/olat/modules/forms/ui/_content/editor.html @@ -1 +1,2 @@ +$r.contextHelpWithWrapper("Survey in the portfolio") $r.render("page") \ No newline at end of file diff --git a/src/main/java/org/olat/modules/forms/ui/_content/title_editor.html b/src/main/java/org/olat/modules/forms/ui/_content/title_editor.html index f3e441dae6621d9c68d1384f35d611257fb5cc3d..69a5467dea31ecf1a9a9453cc13a27f941051cc2 100644 --- a/src/main/java/org/olat/modules/forms/ui/_content/title_editor.html +++ b/src/main/java/org/olat/modules/forms/ui/_content/title_editor.html @@ -1,4 +1,3 @@ -$r.contextHelpWithWrapper("My portfolio binders#portfolioinhalt") #if($editMode) <div class="o_page_edit_title"> <div class="o_page_edit_toolbar"><ul class="list-inline"> diff --git a/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java b/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java index 6bbf6d00358ca2c8cedc3b307a5bfccf80e31500..3901a474f9f146744f66fbc8a53de8b258c6ee1c 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java +++ b/src/main/java/org/olat/modules/portfolio/ui/PageRunController.java @@ -142,6 +142,7 @@ public class PageRunController extends BasicController implements TooledControll pageEditCtrl = new PageEditorController(ureq, getWindowControl(), new PortfolioPageEditorProvider(), new FullEditorSecurityCallback(), getTranslator()); listenTo(pageEditCtrl); + mainVC.contextPut("isPersonalBinder", (!secCallback.canNewAssignment() && secCallback.canEditMetadataBinder())); mainVC.put("page", pageEditCtrl.getInitialComponent()); } } @@ -397,6 +398,7 @@ public class PageRunController extends BasicController implements TooledControll loadMeta(ureq); loadModel(ureq, false); doRunPage(ureq); + mainVC.contextPut("isPersonalBinder", false); fireEvent(ureq, Event.CHANGED_EVENT); } @@ -473,6 +475,7 @@ public class PageRunController extends BasicController implements TooledControll pageEditCtrl = new PageEditorController(ureq, getWindowControl(), new PortfolioPageEditorProvider(), new FullEditorSecurityCallback(), getTranslator()); listenTo(pageEditCtrl); + mainVC.contextPut("isPersonalBinder", (!secCallback.canNewAssignment() && secCallback.canEditMetadataBinder())); mainVC.put("page", pageEditCtrl.getInitialComponent()); editLink(false); } diff --git a/src/main/java/org/olat/modules/portfolio/ui/_content/page_content.html b/src/main/java/org/olat/modules/portfolio/ui/_content/page_content.html index 1936002c9e97199b95f58f63a0bc1f3e4b734921..5ea2f07416a9ab8f86f654c3ab6239247c550e27 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/_content/page_content.html +++ b/src/main/java/org/olat/modules/portfolio/ui/_content/page_content.html @@ -1,4 +1,7 @@ $r.render("meta") +#if ($isPersonalBinder) + $r.contextHelpWithWrapper("My portfolio binders#portfolioinhalt") +#end <div class="o_pf_content clearfix">$r.render("page")</div> #if($r.available("comments")) <div class="o_pf_comments clearfix">$r.render("comments")</div> diff --git a/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html b/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html index 153a6943c13ff40a4e3de977f12564a101b84500..69a5467dea31ecf1a9a9453cc13a27f941051cc2 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html +++ b/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html @@ -1,4 +1,3 @@ -$r.contextHelpWithWrapper("Survey in the portfolio") #if($editMode) <div class="o_page_edit_title"> <div class="o_page_edit_toolbar"><ul class="list-inline">