Skip to content

fix(tpl): switch login/signup to profile/logout when logged in #22

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

Merged
merged 2 commits into from
Sep 7, 2021
Merged

fix(tpl): switch login/signup to profile/logout when logged in #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5e4627
fix(tpl): switch login/signup to profile/logout when logged in
Sep 2, 2021
f3d101a
fix(tpl): change prev commit to not override default nav-userlinks.tpl
Sep 7, 2021
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
32 changes: 22 additions & 10 deletions html-templates/designs/site-bootstrap4.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!DOCTYPE html>
{load_templates designs/site.subtemplates.tpl}
<html lang="en">

<head>
Expand Down Expand Up @@ -70,16 +71,27 @@
<ul class="dropdown-menu search" id="navbarSearchBarDropdown" aria-labelledby="navbarDropdown">
</ul>
</li>
<li class="nav-item show">
<a class="nav-link " href="/login?return=%2F" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
Login
</a>
</li>
<li class="nav-item show">
<a class="nav-link " href="/register?return=%2F" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
Signup
</a>
</li>
{if $.User}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{avatar $.User 18} {$.User->FirstName}
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
{include includes/site-bootstrap4.nav-userlinks.tpl}
</div>
</li>
{else}
<li class="nav-item show">
<a class="nav-link" href="/login?return={$.server.REQUEST_URI|escape:url}" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
{_ "Login"}
</a>
</li>
<li class="nav-item show">
<a class="nav-link" href="/register?return={$.server.REQUEST_URI|escape:url}" id="navbarDropdown" role="button" aria-haspopup="false" aria-expanded="false">
{_ "Signup"}
</a>
</li>
{/if}
</ul>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions html-templates/includes/site-bootstrap4.nav-userlinks.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<a class="dropdown-item nav-link" href="{$.User->getURL()}">{_ "View My Profile"}</a>
<a class="dropdown-item nav-link" href="/profile">{_ "Edit My Profile"}</a>
<a class="dropdown-item nav-link" href="/logout">{_ "Logout"}</a>