import org.cacert.gigi.pages.Verify;
import org.cacert.gigi.pages.account.ChangePasswordPage;
import org.cacert.gigi.pages.account.MyDetails;
+import org.cacert.gigi.pages.account.UserHistory;
+import org.cacert.gigi.pages.account.UserTrainings;
import org.cacert.gigi.pages.account.certs.CertificateAdd;
import org.cacert.gigi.pages.account.certs.Certificates;
import org.cacert.gigi.pages.account.domain.DomainOverview;
import org.cacert.gigi.pages.admin.support.FindUserPage;
import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
-import org.cacert.gigi.pages.admin.support.SupportUserHistory;
import org.cacert.gigi.pages.error.AccessDenied;
import org.cacert.gigi.pages.error.PageNotFound;
import org.cacert.gigi.pages.main.RegisterPage;
putPage(MyDetails.PATH, new MyDetails(), "My Account");
putPage(RegisterPage.PATH, new RegisterPage(), "CAcert.org");
putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
- putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates");
+ putPage(MailOverview.DEFAULT_PATH, new MailOverview("Email addresses"), "Certificates");
putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates");
putPage(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust");
putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Organisation Admin");
putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
- putPage(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin");
- putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "System Admin");
- putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "System Admin");
+
+ putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
+ putPage(FindUserPage.PATH, new FindUserPage("Find User"), "Support Console");
+ putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "Support Console");
+
putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
- putPage(SupportUserHistory.PATH, new SupportUserHistory(), null);
+ putPage(UserHistory.PATH, new UserHistory(false), "My Account");
+ putPage(UserHistory.SUPPORT_PATH, new UserHistory(true), null);
+ putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");
+ putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null);
if (testing) {
try {
Class<?> manager = Class.forName("org.cacert.gigi.pages.Manager");