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

OO-2266 minor changes in PortfolioHomeController, Confluence Link

parent b9b8f235
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -58,7 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class PortfolioHomeController extends BasicController implements Activateable2 { public class PortfolioHomeController extends BasicController implements Activateable2 {
private Link myBindersLink, myEntriesLink, mySharedItemsLink, sharedItemsLink, mediaCenterLink; private Link myBindersLink, myEntriesLink, mySharedItemsLink, sharedItemsLink, mediaCenterLink;
private Link editLastEntryLink, createNewEntryLink, editLastUsedBinderLink, goToTrashLink; private Link editLastEntryLink, createNewEntryLink, showHelpLink, goToTrashLink;
private final VelocityContainer mainVC; private final VelocityContainer mainVC;
private final TooledStackedPanel stackPanel; private final TooledStackedPanel stackPanel;
...@@ -103,8 +103,8 @@ public class PortfolioHomeController extends BasicController implements Activate ...@@ -103,8 +103,8 @@ public class PortfolioHomeController extends BasicController implements Activate
editLastEntryLink.setIconRightCSS("o_icon o_icon_start"); editLastEntryLink.setIconRightCSS("o_icon o_icon_start");
createNewEntryLink = LinkFactory.createLink("new.entry", mainVC, this); createNewEntryLink = LinkFactory.createLink("new.entry", mainVC, this);
createNewEntryLink.setIconRightCSS("o_icon o_icon_start"); createNewEntryLink.setIconRightCSS("o_icon o_icon_start");
editLastUsedBinderLink = LinkFactory.createLink("edit.last.binder", mainVC, this); showHelpLink = LinkFactory.createLink("show.help.binder", mainVC, this);
editLastUsedBinderLink.setIconRightCSS("o_icon o_icon_start"); showHelpLink.setIconRightCSS("o_icon o_icon_start");
goToTrashLink = LinkFactory.createLink("go.to.trash", mainVC, this); goToTrashLink = LinkFactory.createLink("go.to.trash", mainVC, this);
goToTrashLink.setIconRightCSS("o_icon o_icon_start"); goToTrashLink.setIconRightCSS("o_icon o_icon_start");
...@@ -138,8 +138,8 @@ public class PortfolioHomeController extends BasicController implements Activate ...@@ -138,8 +138,8 @@ public class PortfolioHomeController extends BasicController implements Activate
doOpenLastEntry(ureq); doOpenLastEntry(ureq);
} else if(createNewEntryLink == source) { } else if(createNewEntryLink == source) {
doNewEntry(ureq); doNewEntry(ureq);
} else if(editLastUsedBinderLink == source) { } else if(showHelpLink == source) {
doOpenLastEditedBindersEntry(ureq);
} else if(goToTrashLink == source) { } else if(goToTrashLink == source) {
doDeletedPages(ureq); doDeletedPages(ureq);
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<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")
...@@ -20,7 +19,6 @@ ...@@ -20,7 +19,6 @@
<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")
...@@ -31,8 +29,12 @@ ...@@ -31,8 +29,12 @@
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>$r.render("edit.last.entry")</li> <li>$r.render("edit.last.entry")</li>
<li>$r.render("new.entry")</li> <li>$r.render("new.entry")</li>
<li>$r.render("edit.last.binder")</li>
<li>$r.render("go.to.trash")</li> <li>$r.render("go.to.trash")</li>
<li>
<a href="$r.contextHelpLink('Portfolio 2.0')" target="_blank">
$r.translate("show.help.binder") <i class="o_icon o_icon_start"> </i>
</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -44,7 +46,6 @@ ...@@ -44,7 +46,6 @@
<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")
...@@ -62,7 +63,6 @@ ...@@ -62,7 +63,6 @@
<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")
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<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")
...@@ -100,7 +99,6 @@ ...@@ -100,7 +99,6 @@
<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")
......
...@@ -133,6 +133,7 @@ edit.page.close=Editor schliessen ...@@ -133,6 +133,7 @@ edit.page.close=Editor schliessen
edit.page.metadata=Metadaten bearbeiten edit.page.metadata=Metadaten bearbeiten
edition=Edition edition=Edition
end.date=Enddatum end.date=Enddatum
show.help.binder=Hilfe
error.begin.after.end=Das Beginn-Datum muss vor dem Ende-Datum liegen. error.begin.after.end=Das Beginn-Datum muss vor dem Ende-Datum liegen.
error.invalid.type=Dieser Dateityp ist nicht unters\u00FCtzt. error.invalid.type=Dieser Dateityp ist nicht unters\u00FCtzt.
error.invitation.mail.used=Diese E-Mailadresse wird bereits von einem OpenOLAT-Benutzer verwendet. error.invitation.mail.used=Diese E-Mailadresse wird bereits von einem OpenOLAT-Benutzer verwendet.
......
...@@ -133,6 +133,7 @@ edit.page.close=Close editor ...@@ -133,6 +133,7 @@ edit.page.close=Close editor
edit.page.metadata=Edit metadata edit.page.metadata=Edit metadata
edition=Edition edition=Edition
end.date=End end.date=End
show.help.binder=Help
error.begin.after.end=The start date must be before the end date. error.begin.after.end=The start date must be before the end date.
error.invalid.type=This file type is not supported. error.invalid.type=This file type is not supported.
error.invitation.mail.used=This e-mail address is already used by an OpenOLAT user. error.invitation.mail.used=This e-mail address is already used by an OpenOLAT user.
......
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