Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all togglz that have to do with the angular pages #6800

Merged
merged 1 commit into from
May 25, 2023
Merged

Remove all togglz that have to do with the angular pages #6800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions orcid-core/src/main/java/org/orcid/core/togglz/Features.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
9 changes: 1 addition & 8 deletions orcid-web/src/main/resources/freemarker/includes/ng2_templates/header2-ng2-template.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,15 @@
<div class="slogan">${springMacroRequestContext.getMessage("public-layout.logo.tagline")?replace("<br />", " ")?replace("'", "\\'")}</div>

<div class="menu-control">
<@orcid.checkFeatureStatus 'ENABLE_USER_MENU'>
<user-menu *ngIf="isMobile && !openMobileMenu"></user-menu>
</@orcid.checkFeatureStatus>
<language-ng2 *ngIf="openMobileMenu"></language-ng2>
<span (click)="toggleMenu()" role="navigation" tabindex="0" aria-label="main menu" [hidden]="!openMobileMenu" style="height: 35px" class="close" alt="close menu"> </span>
<img (click)="toggleMenu()" role="navigation" tabindex="0" aria-label="main menu" [hidden]="openMobileMenu" style="height: 35px" src="{{assetsPath + '/img/glyphicon-menu.svg'}}" alt="open menu"/>
</div>
</div>
<div class="search" >
<div class="dropdown-menus-container">
<@orcid.checkFeatureStatus 'ENABLE_USER_MENU'>
<user-menu *ngIf="!isMobile"></user-menu>
</@orcid.checkFeatureStatus>
<language-ng2 *ngIf="!isMobile"></language-ng2>
</div>

Expand Down Expand Up @@ -74,15 +70,12 @@
<li role="presentation" class="expanded">
<a href="{{aboutUri}}" role="menuitem" >{{'${springMacroRequestContext.getMessage("wp-infosite-header.newsAndEvents")?replace("<br />", " ")?replace("'", "\\'")} '| uppercase }} </a>
</li>

<@orcid.checkFeatureStatus featureName='ENABLE_USER_MENU'>
<li role="presentation" class="last leaf ${(nav=="signin")?then('open', '')} " [ngClass]="{'hover': mobileMenu.SIGNIN}" (mouseenter)="menuHandler('SIGNIN', $event)" (focus)="menuHandler('SIGNIN', $event)" (click)="menuHandler('SIGNIN', $event)">
<div class="mobile-menu-sign-in">
<a class="mobile-menu-sign-in-url" *ngIf="!userInfo['REAL_USER_ORCID']" href="{{getBaseUri()}}/signin" role="menuitem">{{'${springMacroRequestContext.getMessage("public-layout.sign_in")?replace("<br />", " ")?replace("'", "\\'")}'| uppercase }}/{{'${springMacroRequestContext.getMessage("header.register")?replace("<br />", " ")?replace("'", "\\'")}'| uppercase }}</a>
<a class="mobile-menu-sign-in-url" *ngIf="userInfo['REAL_USER_ORCID']" href="{{getBaseUri()}}/signout" role="menuitem">{{'${springMacroRequestContext.getMessage("public-layout.sign_out")?replace("<br />", " ")?replace("'", "\\'")} '| uppercase }}</a>
</div>
</li>
</@orcid.checkFeatureStatus>
</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...d-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down