fixes for staff page

changed link on staff page to user's page now that its public
made buttons to show authors and staff visible regardless of login state
This commit is contained in:
Jake Potrebic 2020-10-29 15:44:34 -07:00
parent a9f632efaa
commit 41e536c2e9
No known key found for this signature in database
GPG Key ID: 7C58557EC9C421F8
2 changed files with 16 additions and 16 deletions

View File

@ -51,6 +51,20 @@
<#if authEnabled>
<div class="collapse navbar-collapse float-right navbar-right">
<ul class="nav navbar-nav">
<#assign title><@spring.message "project.viewAuthors"/></#assign>
<li class="nav-icon authors-icon" <@tooltip title=title />>
<a href="${Routes.USERS_SHOW_AUTHORS.getRouteUrl("", "")}">
<i class="icon fas fa-users"></i>
</a>
</li>
<#assign title><@spring.message "project.viewStaff"/></#assign>
<li class="nav-icon staff-icon" <@tooltip title=title />>
<a href="${Routes.USERS_SHOW_STAFF.getRouteUrl("", "")}">
<i class="icon fas fa-user-tie"></i>
</a>
</li>
<#if cu??>
<li class="dropdown nav-icon new-controls">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="creatorDropDown" aria-expanded="false">
@ -68,21 +82,7 @@
</div>
</li>
<#assign title><@spring.message "project.viewAuthors"/></#assign>
<li class="nav-icon authors-icon" <@tooltip title=title />>
<a href="${Routes.USERS_SHOW_AUTHORS.getRouteUrl("", "")}">
<i class="icon fas fa-users"></i>
</a>
</li>
<#assign title><@spring.message "project.viewStaff"/></#assign>
<li class="nav-icon staff-icon" <@tooltip title=title />>
<a href="${Routes.USERS_SHOW_STAFF.getRouteUrl("", "")}">
<i class="icon fas fa-user-tie"></i>
</a>
</li>
<#-- Show user controls -->
<#-- Show user controls -->
<li class="dropdown user-controls nav-icon">
<a href="#" class="dropdown-toggle user-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userDropDown" aria-expanded="false">
<#if headerData.hasNotice()>

View File

@ -51,7 +51,7 @@
<#import "*/utils/userAvatar.ftlh" as userAvatar>
<td><@userAvatar.userAvatar userName=staffUser.name avatarUrl=utils.avatarUrl(staffUser.name) clazz="user-avatar-xs"></@userAvatar.userAvatar></td>
<td>
<a href="${Routes.SHOW_ACTIVITIES.getRouteUrl(staffUser.name)}">${staffUser.name}</a>
<a href="${Routes.USERS_SHOW_PROJECTS.getRouteUrl(staffUser.name)}">${staffUser.name}</a>
</td>
<td>
<span class="user-role channel" style="background-color: ${staffUser.role.color.hex}">