diff --git a/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java b/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java index 2a24eceaa84af4863ebb027a0b831d3de51cb7d0..5035d0100d896028717e7a1e12bf1f2368ccc377 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java +++ b/src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java @@ -58,7 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired; public class PortfolioHomeController extends BasicController implements Activateable2 { 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 TooledStackedPanel stackPanel; @@ -103,8 +103,8 @@ public class PortfolioHomeController extends BasicController implements Activate editLastEntryLink.setIconRightCSS("o_icon o_icon_start"); createNewEntryLink = LinkFactory.createLink("new.entry", mainVC, this); createNewEntryLink.setIconRightCSS("o_icon o_icon_start"); - editLastUsedBinderLink = LinkFactory.createLink("edit.last.binder", mainVC, this); - editLastUsedBinderLink.setIconRightCSS("o_icon o_icon_start"); + showHelpLink = LinkFactory.createLink("show.help.binder", mainVC, this); + showHelpLink.setIconRightCSS("o_icon o_icon_start"); goToTrashLink = LinkFactory.createLink("go.to.trash", mainVC, this); goToTrashLink.setIconRightCSS("o_icon o_icon_start"); @@ -138,8 +138,8 @@ public class PortfolioHomeController extends BasicController implements Activate doOpenLastEntry(ureq); } else if(createNewEntryLink == source) { doNewEntry(ureq); - } else if(editLastUsedBinderLink == source) { - doOpenLastEditedBindersEntry(ureq); + } else if(showHelpLink == source) { + } else if(goToTrashLink == source) { doDeletedPages(ureq); } diff --git a/src/main/java/org/olat/modules/portfolio/ui/_content/home.html b/src/main/java/org/olat/modules/portfolio/ui/_content/home.html index a8fd2b831ae35666ff5972de959c198aa22aada4..69c030223ee6d7ee6c8b18ac5ba766eae9bd8dc2 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/_content/home.html +++ b/src/main/java/org/olat/modules/portfolio/ui/_content/home.html @@ -2,7 +2,6 @@ <div class="col-sm-6"> <div class="panel panel-default"> <div class="panel-heading"> - $r.contextHelpWithWrapper("Media center") <h4 class="panel-title"> <i class="o_icon o_icon_mediacenter o_icon-fw"> </i> $r.translate("media.center") @@ -20,7 +19,6 @@ <div class="col-sm-6"> <div class="panel panel-default"> <div class="panel-heading"> - $r.contextHelpWithWrapper("Quick links") <h4 class="panel-title"> <i class="o_icon o_icon_pf_quick_links o_icon-fw"> </i> $r.translate("quick.links") @@ -31,8 +29,12 @@ <ul class="list-unstyled"> <li>$r.render("edit.last.entry")</li> <li>$r.render("new.entry")</li> - <li>$r.render("edit.last.binder")</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> </div> </div> @@ -44,7 +46,6 @@ <div class="col-sm-6"> <div class="panel panel-default"> <div class="panel-heading"> - $r.contextHelpWithWrapper("My portfolio binders") <h4 class="panel-title"> <i class="o_icon o_icon_pf_binder o_icon-fw"> </i> $r.translate("my.portfolio.binders") @@ -62,7 +63,6 @@ <div class="col-sm-6"> <div class="panel panel-default"> <div class="panel-heading"> - $r.contextHelpWithWrapper("My entries") <h4 class="panel-title"> <i class="o_icon o_icon_pf_entry o_icon-fw"> </i> $r.translate("my.entries") @@ -82,7 +82,6 @@ <div class="col-sm-6"> <div class="panel panel-default"> <div class="panel-heading"> - $r.contextHelpWithWrapper("Shared by me") <h4 class="panel-title"> <i class="o_icon o_icon_pf_my_shares o_icon-fw"> </i> $r.translate("my.shared.items") @@ -100,7 +99,6 @@ <div class="col-sm-6"> <div class="panel panel-default"> <div class="panel-heading"> - $r.contextHelpWithWrapper("Shared with me") <h4 class="panel-title"> <i class="o_icon o_icon_pf_shared_with_me o_icon-fw"> </i> $r.translate("shared.with.me") diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties index 3349dffdb03826596bc12d954679076c2b65cbc5..badab662b6ab327f6c346d123ab78707f2140672 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties @@ -133,6 +133,7 @@ edit.page.close=Editor schliessen edit.page.metadata=Metadaten bearbeiten edition=Edition end.date=Enddatum +show.help.binder=Hilfe error.begin.after.end=Das Beginn-Datum muss vor dem Ende-Datum liegen. error.invalid.type=Dieser Dateityp ist nicht unters\u00FCtzt. error.invitation.mail.used=Diese E-Mailadresse wird bereits von einem OpenOLAT-Benutzer verwendet. diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties index 0c7e177de1dad69b48f5d128289b6d4f19f5b094..59f45f3fc7eaa6ff6cd609474cc70fcd16051c75 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties @@ -133,6 +133,7 @@ edit.page.close=Close editor edit.page.metadata=Edit metadata edition=Edition end.date=End +show.help.binder=Help error.begin.after.end=The start date must be before the end date. error.invalid.type=This file type is not supported. error.invitation.mail.used=This e-mail address is already used by an OpenOLAT user.