diff --git a/orcid-core/src/main/java/org/orcid/core/togglz/Features.java b/orcid-core/src/main/java/org/orcid/core/togglz/Features.java index ea1f73f91fb..dcd3089ca90 100644 --- a/orcid-core/src/main/java/org/orcid/core/togglz/Features.java +++ b/orcid-core/src/main/java/org/orcid/core/togglz/Features.java @@ -33,30 +33,15 @@ public enum Features implements Feature { @Label("HelpHero") ORCID_ANGULAR_HELP_HERO, - @Label("Orcid Angular Lazy Load Peer Reviews") - ORCID_ANGULAR_LAZY_LOAD_PEER_REVIEWS, - - @Label("Orcid Angular Account settings ") - ORCID_ANGULAR_ACCOUNT_SETTINGS, - @Label("Disable Badges") DISABLE_BADGES, - @Label("Orcid Angular My Orcid") - ORCID_ANGULAR_MY_ORCID, - @Label("Spam button") SPAM_BUTTON, - @Label("Orcid Angular Search") - ORCID_ANGULAR_SEARCH, - @Label("Email status dropdown option") EMAIL_STATUS_DROPDOWN_OPTION, - @Label("Enable user menu") - ENABLE_USER_MENU, - @Label("Enable 2019 header") ENABLE_HEADER2, diff --git a/orcid-web/src/main/resources/freemarker/includes/ng2_templates/header2-ng2-template.ftl b/orcid-web/src/main/resources/freemarker/includes/ng2_templates/header2-ng2-template.ftl index 36603064516..9c8935c087e 100644 --- a/orcid-web/src/main/resources/freemarker/includes/ng2_templates/header2-ng2-template.ftl +++ b/orcid-web/src/main/resources/freemarker/includes/ng2_templates/header2-ng2-template.ftl @@ -10,9 +10,7 @@
${springMacroRequestContext.getMessage("public-layout.logo.tagline")?replace("
", " ")?replace("'", "\\'")}
diff --git a/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts b/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts index 6d855b22d98..332607b05ca 100644 --- a/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts +++ b/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts @@ -94,7 +94,7 @@ export class Header2Component { this.assetsPath = data.messages['STATIC_PATH']; this.aboutUri = data.messages['ABOUT_URI']; this.liveIds = data.messages['LIVE_IDS']; - this.userMenu = data.messages['ENABLE_USER_MENU'] === "true" + this.userMenu = true this.mobileMenu = { HELP: false,