Skip to content
Snippets Groups Projects
Commit 591a0f89 authored by fkiefer's avatar fkiefer
Browse files

OO-2266 Adding of ContextHelp for ePortfolio

parent 4ec8f735
No related branches found
No related tags found
No related merge requests found
Showing
with 54 additions and 12 deletions
...@@ -67,6 +67,8 @@ public class BinderDeliveryOptionsController extends FormBasicController impleme ...@@ -67,6 +67,8 @@ public class BinderDeliveryOptionsController extends FormBasicController impleme
@Override @Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) { protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
setFormContextHelp("Portfolio template: Administration and editing#configuration");
newEntriesEl = uifactory.addCheckboxesHorizontal("canAddEntries", "allow.new.entries", formLayout, onKeys, onValues); newEntriesEl = uifactory.addCheckboxesHorizontal("canAddEntries", "allow.new.entries", formLayout, onKeys, onValues);
if(deliveryOptions.isAllowNewEntries()) { if(deliveryOptions.isAllowNewEntries()) {
newEntriesEl.select(onKeys[0], true); newEntriesEl.select(onKeys[0], true);
......
...@@ -97,7 +97,7 @@ public class SharedItemsController extends FormBasicController implements Activa ...@@ -97,7 +97,7 @@ public class SharedItemsController extends FormBasicController implements Activa
private BaseSecurityModule securityModule; private BaseSecurityModule securityModule;
public SharedItemsController(UserRequest ureq, WindowControl wControl, TooledStackedPanel stackPanel) { public SharedItemsController(UserRequest ureq, WindowControl wControl, TooledStackedPanel stackPanel) {
super(ureq, wControl, "shared"); super(ureq, wControl, "shared_with_me");
this.stackPanel = stackPanel; this.stackPanel = stackPanel;
setTranslator(userManager.getPropertyHandlerTranslator(getTranslator())); setTranslator(userManager.getPropertyHandlerTranslator(getTranslator()));
......
...@@ -128,6 +128,9 @@ public class TableOfContentController extends BasicController implements TooledC ...@@ -128,6 +128,9 @@ public class TableOfContentController extends BasicController implements TooledC
} }
mainVC.contextPut("owners", ownerSb.toString()); mainVC.contextPut("owners", ownerSb.toString());
mainVC.contextPut("isTemplate", secCallback.canNewAssignment());
mainVC.contextPut("isPersonalBinder", (!secCallback.canNewAssignment() && secCallback.canEditMetadataBinder()));
putInitialPanel(mainVC); putInitialPanel(mainVC);
loadModel(); loadModel();
} }
......
$r.render("table") <div class="clearfix">
\ No newline at end of file $r.contextHelpWithWrapper("My portfolio binders")
</div>
$r.render("table")
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
$r.render("timeline.switch.on") $r.render("timeline.switch.on")
</div> </div>
#end #end
<div class="o_portfolio_title_help_helper">
$r.contextHelpWithWrapper("Portfolio template: Administration and editing#entries")
</div>
</div> </div>
<div class="o_portfolio_entries #if($timelineSwitch) o_portfolio_withtimeline #end"> <div class="o_portfolio_entries #if($timelineSwitch) o_portfolio_withtimeline #end">
......
<div class="o_portfolio_content clearfix"> <div class="o_portfolio_content">
<div class="o_header_with_buttons"> $r.contextHelpWithWrapper("Quick links")
<h2>$r.translate("deleted.entries")</h2> <h2>$r.translate("deleted.entries")</h2>
</div>
<div class="o_portfolio_entries"> <div class="o_portfolio_entries clearfix">
$r.render("table") $r.render("table")
</div> </div>
<div class="o_button_group"> <div class="o_button_group">
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
$r.contextHelpWithWrapper("Media center")
<h4 class="panel-title"> <h4 class="panel-title">
<i class="o_icon o_icon_mediacenter o_icon-fw"> </i> <i class="o_icon o_icon_mediacenter o_icon-fw"> </i>
$r.translate("media.center") $r.translate("media.center")
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
$r.contextHelpWithWrapper("Quick links")
<h4 class="panel-title"> <h4 class="panel-title">
<i class="o_icon o_icon_pf_quick_links o_icon-fw"> </i> <i class="o_icon o_icon_pf_quick_links o_icon-fw"> </i>
$r.translate("quick.links") $r.translate("quick.links")
...@@ -42,6 +44,7 @@ ...@@ -42,6 +44,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
$r.contextHelpWithWrapper("My portfolio binders")
<h4 class="panel-title"> <h4 class="panel-title">
<i class="o_icon o_icon_pf_binder o_icon-fw"> </i> <i class="o_icon o_icon_pf_binder o_icon-fw"> </i>
$r.translate("my.portfolio.binders") $r.translate("my.portfolio.binders")
...@@ -59,6 +62,7 @@ ...@@ -59,6 +62,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
$r.contextHelpWithWrapper("My entries")
<h4 class="panel-title"> <h4 class="panel-title">
<i class="o_icon o_icon_pf_entry o_icon-fw"> </i> <i class="o_icon o_icon_pf_entry o_icon-fw"> </i>
$r.translate("my.entries") $r.translate("my.entries")
...@@ -78,6 +82,7 @@ ...@@ -78,6 +82,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
$r.contextHelpWithWrapper("Shared by me")
<h4 class="panel-title"> <h4 class="panel-title">
<i class="o_icon o_icon_pf_my_shares o_icon-fw"> </i> <i class="o_icon o_icon_pf_my_shares o_icon-fw"> </i>
$r.translate("my.shared.items") $r.translate("my.shared.items")
...@@ -95,6 +100,7 @@ ...@@ -95,6 +100,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
$r.contextHelpWithWrapper("Shared with me")
<h4 class="panel-title"> <h4 class="panel-title">
<i class="o_icon o_icon_pf_shared_with_me o_icon-fw"> </i> <i class="o_icon o_icon_pf_shared_with_me o_icon-fw"> </i>
$r.translate("shared.with.me") $r.translate("shared.with.me")
......
<div class="clearfix">
$r.contextHelpWithWrapper("Media center")
</div>
#if($r.isNotEmpty($tagLinks) || $r.available("new.medias")) #if($r.isNotEmpty($tagLinks) || $r.available("new.medias"))
<div class="o_block clearfix"> <div class="o_block clearfix">
#if($r.isNotEmpty($tagLinks)) #if($r.isNotEmpty($tagLinks))
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
$r.render("timeline.switch.off") $r.render("timeline.switch.off")
$r.render("timeline.switch.on") $r.render("timeline.switch.on")
</div> </div>
<div class="o_portfolio_title_help_helper">
$r.contextHelpWithWrapper("My entries")
</div>
</div> </div>
<div class="o_portfolio_entries #if($timelineSwitch) o_portfolio_withtimeline #end"> <div class="o_portfolio_entries #if($timelineSwitch) o_portfolio_withtimeline #end">
......
<div class="o_portfolio_publication"> <div class="o_portfolio_publication">
$r.contextHelpWithWrapper("Portfolio task and assignment: Collecting and editing#publish")
<h2>$r.translate("publish.status.title", $binderTitle)</h2> <h2>$r.translate("publish.status.title", $binderTitle)</h2>
#if(!${binderRow.getAccessRights().isEmpty()}) #if(!${binderRow.getAccessRights().isEmpty()})
<div class="o_portfolio_ac o_portfolio_ac_binder" > <div class="o_portfolio_ac o_portfolio_ac_binder" >
......
<div class="clearfix">
$r.contextHelpWithWrapper("Portfolio assignment: Grading")
</div>
$r.render("section-list") $r.render("section-list")
<div class="o_button_group"> <div class="o_button_group">
$r.render("buttons") $r.render("buttons")
......
$r.contextHelpWithWrapper("Shared by me")
<h2>
$r.translate("my.shared.items")
</h2>
$r.render("table") $r.render("table")
\ No newline at end of file
$r.contextHelpWithWrapper("Shared with me")
<h2>
$r.translate("shared.with.me")
</h2>
$r.render("table")
\ No newline at end of file
<div class="o_portfolio_content clearfix"> <div class="o_portfolio_content">
<div class="o_header_with_buttons"> #if ($isTemplate)
<h2>$r.translate("table.of.contents", $binderTitle) #if($owners && !$owners.isEmpty())<small>$r.translate("binder.by",$owners)</small>#end</h2> $r.contextHelpWithWrapper("Process of an assessment portfolio")
</div> #elseif ($isPersonalBinder)
<div class="o_portfolio_toc #if($timelineSwitch) o_portfolio_withtimeline #end"> $r.contextHelpWithWrapper("Three steps to your portfolio binder")
#else
$r.contextHelpWithWrapper("Portfolio task and assignment: Collecting and editing")
#end
<h2>$r.translate("table.of.contents", $binderTitle) #if($owners && !$owners.isEmpty())<small>$r.translate("binder.by",$owners)</small>#end</h2>
<div class="o_portfolio_toc #if($timelineSwitch) o_portfolio_withtimeline #end clearfix">
<ul class="list-unstyled"> <ul class="list-unstyled">
#foreach($section in $sections) #foreach($section in $sections)
<li class="o_section o_block_large_bottom"><div class="o_header_with_buttons"><h4>$r.render($section.sectionLink) </h4> <i class="o_icon $section.cssClassStatus o_icon-fw"> </i>#if(${section.isAssessable()}) ${section.getFormattedResult()} #end</div> <li class="o_section o_block_large_bottom"><div class="o_header_with_buttons"><h4>$r.render($section.sectionLink) </h4> <i class="o_icon $section.cssClassStatus o_icon-fw"> </i>#if(${section.isAssessable()}) ${section.getFormattedResult()} #end</div>
......
$r.contextHelpWithWrapper("My portfolio binders#portfolioinhalt")
#if($editMode) #if($editMode)
<div class="o_page_edit_title"> <div class="o_page_edit_title">
<div class="o_page_edit_toolbar"><ul class="list-inline"> <div class="o_page_edit_toolbar"><ul class="list-inline">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment