-
Notifications
You must be signed in to change notification settings - Fork 10k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Regression: Admin embedded layout (#14229)
* Only show sidenav in embedded mode if rendering admin templates * Add layout parameter to pathFor helper * Keep sidenav for admin pages in embedded layout
- Loading branch information
Showing
10 changed files
with
52 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,30 @@ | ||
<template name="sideNav"> | ||
<aside class="sidebar sidebar--{{sidebarViewMode}} {{#if sidebarHideAvatar}}sidebar--hide-avatar{{/if}}" role="navigation"> | ||
{{> sidebarHeader }} | ||
{{#if loggedInUser}} | ||
<div class="unread-rooms background-primary-action-color color-primary-action-contrast top-unread-rooms hidden"> | ||
{{_ "More_unreads"}} <i class="icon-up-big"></i> | ||
<aside class="sidebar sidebar--{{sidebarViewMode}} {{#if sidebarHideAvatar}}sidebar--hide-avatar{{/if}}" role="navigation"> | ||
{{> sidebarHeader }} | ||
{{#if loggedInUser}} | ||
<div class="unread-rooms background-primary-action-color color-primary-action-contrast top-unread-rooms hidden"> | ||
{{_ "More_unreads"}} <i class="icon-up-big"></i> | ||
</div> | ||
<div class="rooms-list" aria-label="{{_ "Channels"}}" role="region"> | ||
{{#each roomType}} | ||
{{> Template.dynamic template=template data=data }} | ||
{{/each}} | ||
</div> | ||
<div class="unread-rooms background-primary-action-color color-primary-action-contrast bottom-unread-rooms hidden"> | ||
{{_ "More_unreads"}} <i class="icon-down-big"></i> | ||
</div> | ||
<div class="flex-nav animated-hidden"> | ||
{{> Template.dynamic template=flexTemplate data=flexData }} | ||
</div> | ||
{{else}} | ||
<div class="rooms-list" aria-label="{{_ "Channels"}}" role="region"> | ||
<div class="wrapper"> | ||
{{> roomList anonymous=true label="Channels" }} | ||
</div> | ||
<div class="rooms-list" aria-label="{{_ "Channels"}}" role="region"> | ||
{{#each roomType}} | ||
{{> Template.dynamic template=template data=data }} | ||
{{/each}} | ||
</div> | ||
<div class="unread-rooms background-primary-action-color color-primary-action-contrast bottom-unread-rooms hidden"> | ||
{{_ "More_unreads"}} <i class="icon-down-big"></i> | ||
</div> | ||
<div class="flex-nav animated-hidden"> | ||
{{> Template.dynamic template=flexTemplate data=flexData }} | ||
</div> | ||
{{else}} | ||
<div class="rooms-list" aria-label="{{_ "Channels"}}" role="region"> | ||
<div class="wrapper"> | ||
{{> roomList anonymous=true label="Channels" }} | ||
</div> | ||
</div> | ||
{{/if}} | ||
</div> | ||
{{/if}} | ||
|
||
<footer class="sidebar__footer">{{{footer}}}</footer> | ||
</aside> | ||
<div class="sidebar-wrap"></div> | ||
<footer class="sidebar__footer">{{{footer}}}</footer> | ||
</aside> | ||
<div class="sidebar-wrap"></div> | ||
</template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters