From b01ba9eed7f53c5ec2c8c970f627745fa0d2d157 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Thu, 26 Jan 2017 13:40:26 +0100
Subject: [PATCH] OO-2453 modify help button
---
src/main/java/org/olat/modules/forms/ui/_content/editor.html | 1 +
.../java/org/olat/modules/forms/ui/_content/title_editor.html | 1 -
.../java/org/olat/modules/portfolio/ui/PageRunController.java | 3 +++
.../org/olat/modules/portfolio/ui/_content/page_content.html | 3 +++
.../modules/portfolio/ui/editor/_content/title_editor.html | 1 -
5 files changed, 7 insertions(+), 2 deletions(-)
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 30b224bc887..40db112c72b 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 f3e441dae66..69a5467dea3 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 6bbf6d00358..3901a474f9f 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 1936002c9e9..5ea2f07416a 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 153a6943c13..69a5467dea3 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">
--
GitLab