mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 14:31:26 +00:00
Update nav bar
This commit is contained in:
Daniel Supernault
parent
7e11e4aa44
commit
98bf80e811
1 changed files with 34 additions and 59 deletions
|
|
@ -1,59 +1,48 @@
|
||||||
<nav class="navbar navbar-expand navbar-light navbar-laravel sticky-top">
|
<nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom border sticky-top py-1">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<a class="navbar-brand d-flex align-items-center" href="{{ route('timeline.personal') }}" title="Logo">
|
<a class="navbar-brand d-flex align-items-center" href="{{ route('timeline.personal') }}" title="Logo">
|
||||||
<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2">
|
<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager">
|
||||||
<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config('app.name', 'pixelfed') }}</span>
|
<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config('app.name', 'pixelfed') }}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
<div class="collapse navbar-collapse">
|
||||||
@auth
|
@auth
|
||||||
<ul class="navbar-nav d-none d-md-block mx-auto pr-3">
|
<ul class="navbar-nav d-none d-md-block mx-auto">
|
||||||
<form class="form-inline search-bar" method="get" action="/i/results">
|
<form class="form-inline search-bar" method="get" action="/i/results">
|
||||||
<div class="input-group">
|
<input class="form-control form-control-sm" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required style="line-height: 0.6;width:200px">
|
||||||
<input class="form-control" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required>
|
|
||||||
<div class="input-group-append">
|
|
||||||
<button class="btn btn-outline-primary" type="submit"><i class="fas fa-search"></i></button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
</form>
|
||||||
</ul>
|
</ul>
|
||||||
@endauth
|
@endauth
|
||||||
|
|
||||||
@guest
|
@guest
|
||||||
|
|
||||||
<ul class="navbar-nav ml-auto">
|
<ul class="navbar-nav ml-auto">
|
||||||
<li><a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">{{ __('Login') }}</a></li>
|
<li>
|
||||||
@if(config('pixelfed.open_registration'))
|
<a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">
|
||||||
<li><a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">{{ __('Register') }}</a></li>@endif
|
{{ __('Login') }}
|
||||||
@else
|
</a>
|
||||||
<ul class="navbar-nav ml-auto">
|
</li>
|
||||||
|
@if(config('pixelfed.open_registration'))
|
||||||
|
<li>
|
||||||
|
<a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">
|
||||||
|
{{ __('Register') }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
@endif
|
||||||
|
@else
|
||||||
|
<div class="ml-auto">
|
||||||
|
<ul class="navbar-nav">
|
||||||
<div class="d-none d-md-block">
|
<div class="d-none d-md-block">
|
||||||
<li class="nav-item px-md-2">
|
<li class="nav-item px-md-2">
|
||||||
<a class="nav-link font-weight-bold {{request()->is('/') ?'text-dark':'text-muted'}}" href="/" title="Home Timeline" data-toggle="tooltip" data-placement="bottom">
|
<a class="nav-link font-weight-bold text-muted" href="/" title="Home Timeline" data-toggle="tooltip" data-placement="bottom">
|
||||||
<i class="fas fa-home fa-lg"></i>
|
<i class="fas fa-home fa-lg"></i>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</div>
|
</div>
|
||||||
{{-- <div class="d-none d-md-block">
|
<li class="d-block d-md-none"></li>
|
||||||
<li class="nav-item px-md-2">
|
|
||||||
<a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public" title="Public Timeline" data-toggle="tooltip" data-placement="bottom">
|
|
||||||
<i class="far fa-map fa-lg"></i>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</div> --}}
|
|
||||||
|
|
||||||
<li class="d-block d-md-none">
|
|
||||||
|
|
||||||
</li>
|
|
||||||
|
|
||||||
{{-- <li class="pr-2">
|
|
||||||
<a class="nav-link font-weight-bold {{request()->is('timeline/network') ?'text-primary':''}}" href="{{route('timeline.network')}}" title="Network Timeline">
|
|
||||||
<i class="fas fa-globe fa-lg"></i>
|
|
||||||
</a>
|
|
||||||
</li> --}}
|
|
||||||
<div class="d-none d-md-block">
|
<div class="d-none d-md-block">
|
||||||
<li class="nav-item px-md-2">
|
<li class="nav-item px-md-2">
|
||||||
<a class="nav-link font-weight-bold {{request()->is('*discover*') ?'text-dark':'text-muted'}}" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
|
<a class="nav-link font-weight-bold text-muted" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
|
||||||
<i class="far fa-compass fa-lg"></i>
|
<i class="far fa-compass fa-lg"></i>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
@ -62,23 +51,20 @@
|
||||||
<li class="nav-item px-md-2">
|
<li class="nav-item px-md-2">
|
||||||
<div title="Create new post" data-toggle="tooltip" data-placement="bottom">
|
<div title="Create new post" data-toggle="tooltip" data-placement="bottom">
|
||||||
<a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
|
<a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
|
||||||
<i class="fas fa-camera-retro fa-lg text-primary"></i>
|
<i class="fas fa-camera-retro fa-lg text-muted"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</div>
|
</div>
|
||||||
</ul>
|
<li class="nav-item dropdown ml-2">
|
||||||
<ul class="navbar-nav">
|
|
||||||
<li class="nav-item dropdown">
|
|
||||||
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
|
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
|
||||||
<img class="rounded-circle box-shadow mr-1" src="{{Auth::user()->profile->avatarUrl()}}" width="26px" height="26px">
|
<i class="far fa-user fa-lg text-muted"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
|
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
|
||||||
<a class="dropdown-item font-weight-ultralight text-truncate" href="{{Auth::user()->url()}}">
|
<a class="dropdown-item font-weight-bold" href="/i/me">
|
||||||
<img class="rounded-circle box-shadow mr-1" src="{{Auth::user()->profile->avatarUrl()}}" width="26px" height="26px">
|
<span class="far fa-user pr-1"></span>
|
||||||
@{{Auth::user()->username}}
|
{{__('navmenu.myProfile')}}
|
||||||
<p class="small mb-0 text-muted text-center">{{__('navmenu.viewMyProfile')}}</p>
|
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
|
<a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
|
||||||
|
|
@ -98,18 +84,6 @@
|
||||||
<span class="far fa-map pr-1"></span>
|
<span class="far fa-map pr-1"></span>
|
||||||
{{__('navmenu.publicTimeline')}}
|
{{__('navmenu.publicTimeline')}}
|
||||||
</a>
|
</a>
|
||||||
{{-- <a class="dropdown-item font-weight-bold" href="{{route('timeline.network')}}">
|
|
||||||
<span class="fas fa-globe pr-1"></span>
|
|
||||||
Network Timeline
|
|
||||||
</a> --}}
|
|
||||||
{{-- <a class="dropdown-item font-weight-bold" href="{{route('messages')}}">
|
|
||||||
<span class="far fa-envelope pr-1"></span>
|
|
||||||
{{__('navmenu.directMessages')}}
|
|
||||||
</a>
|
|
||||||
<a class="dropdown-item font-weight-bold" href="{{route('account.circles')}}">
|
|
||||||
<span class="far fa-circle pr-1"></span>
|
|
||||||
{{__('Circles')}}
|
|
||||||
</a>--}}
|
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
|
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
|
||||||
<span class="fas fa-cog pr-1"></span>
|
<span class="fas fa-cog pr-1"></span>
|
||||||
|
|
@ -134,7 +108,8 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@endguest
|
</div>
|
||||||
|
@endguest
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue