Skip to content

Commit 73249dc

Browse files
dansupdansup
committed
Update nav layout
1 parent 4e2e64b commit 73249dc

File tree

1 file changed

+106
-95
lines changed

1 file changed

+106
-95
lines changed

‎resources/views/layouts/partial/nav.blade.php

Lines changed: 106 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,118 @@
1-
<nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom border sticky-top py-1">
1+
<nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom sticky-top py-1">
22
<div class="container">
3-
<a class="navbar-brand d-flex align-items-center" href="{{ route('timeline.personal') }}" title="Logo">
4-
<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager">
5-
<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config('app.name', 'pixelfed') }}</span>
6-
</a>
3+
<a class="navbar-brand d-flex align-items-center" href="{{ route('timeline.personal') }}" title="Logo">
4+
<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager">
5+
<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config('app.name', 'pixelfed') }}</span>
6+
</a>
77

8-
<div class="collapse navbar-collapse">
9-
@auth
10-
<ul class="navbar-nav d-none d-md-block mx-auto">
11-
<form class="form-inline search-bar" method="get" action="/i/results">
12-
<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">
13-
</form>
14-
</ul>
15-
@endauth
8+
<div class="collapse navbar-collapse">
9+
@auth
10+
<ul class="navbar-nav d-none d-md-block mx-auto">
11+
<form class="form-inline search-bar" method="get" action="/i/results">
12+
<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">
13+
</form>
14+
</ul>
15+
@endauth
1616

17-
@guest
18-
19-
<ul class="navbar-nav ml-auto">
20-
<li>
21-
<a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">
22-
{{ __('Login') }}
23-
</a>
24-
</li>
25-
@if(config('pixelfed.open_registration'))
17+
@guest
18+
19+
<ul class="navbar-nav ml-auto">
2620
<li>
27-
<a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">
28-
{{ __('Register') }}
21+
<a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">
22+
{{ __('Login') }}
2923
</a>
3024
</li>
31-
@endif
32-
@else
33-
<div class="ml-auto">
34-
<ul class="navbar-nav">
35-
<div class="d-none d-md-block">
36-
<li class="nav-item px-md-2">
37-
<a class="nav-link font-weight-bold text-muted" href="/" title="Home Timeline" data-toggle="tooltip" data-placement="bottom">
38-
<i class="fas fa-home fa-lg"></i>
25+
@if(config('pixelfed.open_registration') && config('instance.restricted.enabled') == false)
26+
<li>
27+
<a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">
28+
{{ __('Register') }}
3929
</a>
4030
</li>
41-
</div>
42-
<li class="d-block d-md-none"></li>
43-
<div class="d-none d-md-block">
44-
<li class="nav-item px-md-2">
45-
<a class="nav-link font-weight-bold text-muted" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
46-
<i class="far fa-compass fa-lg"></i>
31+
@endif
32+
@else
33+
<div class="ml-auto">
34+
<ul class="navbar-nav">
35+
<div class="d-none d-md-block">
36+
<li class="nav-item px-md-2">
37+
<a class="nav-link font-weight-bold text-muted" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
38+
<i class="far fa-compass fa-lg"></i>
39+
</a>
40+
</li>
41+
</div>
42+
<div class="d-none d-md-block">
43+
<li class="nav-item px-md-2">
44+
<a class="nav-link font-weight-bold text-muted" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
45+
<i class="far fa-bell fa-lg"></i>
46+
</a>
47+
</li>
48+
</div>
49+
<li class="nav-item dropdown ml-2">
50+
<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">
51+
<i class="far fa-user fa-lg text-muted"></i>
4752
</a>
48-
</li>
49-
</div>
50-
<li class="nav-item dropdown ml-2">
51-
<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">
52-
<i class="far fa-user fa-lg text-muted"></i>
53-
</a>
5453

55-
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
56-
<div class="dropdown-item font-weight-bold cursor-pointer" onclick="App.util.compose.post()">
57-
<span class="fas fa-camera-retro pr-1"></span>
58-
{{__('navmenu.composePost')}}
59-
</div>
60-
<div class="dropdown-divider"></div>
61-
<a class="dropdown-item font-weight-bold" href="/i/me">
62-
<span class="far fa-user pr-1"></span>
63-
{{__('navmenu.myProfile')}}
64-
</a>
65-
<a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
66-
<span class="far fa-compass pr-1"></span>
67-
{{__('navmenu.discover')}}
68-
</a>
69-
<a class="dropdown-item font-weight-bold" href="{{route('notifications')}}">
70-
<span class="far fa-bell pr-1"></span>
71-
Notifications
72-
</a>
73-
<div class="dropdown-divider"></div>
74-
<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
75-
<span class="far fa-map pr-1"></span>
76-
{{__('navmenu.publicTimeline')}}
77-
</a>
78-
<div class="dropdown-divider"></div>
79-
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
80-
<span class="fas fa-cog pr-1"></span>
81-
{{__('navmenu.settings')}}
82-
</a>
83-
@if(Auth::user()->is_admin == true)
84-
<a class="dropdown-item font-weight-bold" href="{{ route('admin.home') }}">
85-
<span class="fas fa-cogs pr-1"></span>
86-
{{__('navmenu.admin')}}
87-
</a>
88-
@endif
89-
<div class="dropdown-divider"></div>
90-
<a class="dropdown-item font-weight-bold" href="{{ route('logout') }}"
91-
onclick="event.preventDefault();
92-
document.getElementById('logout-form').submit();">
93-
<span class="fas fa-sign-out-alt pr-1"></span>
94-
{{ __('navmenu.logout') }}
95-
</a>
54+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
55+
<div class="dropdown-item font-weight-bold cursor-pointer" onclick="App.util.compose.post()">
56+
<span class="fas fa-plus-square pr-2 text-lighter"></span>
57+
New Post
58+
</div>
59+
<div class="dropdown-divider"></div>
60+
<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
61+
<span class="fas fa-home pr-2 text-lighter"></span>
62+
Home
63+
</a>
64+
<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
65+
<span class="fas fa-stream pr-2 text-lighter"></span>
66+
Local
67+
</a>
68+
{{-- <a class="dropdown-item font-weight-bold" href="#">
69+
<span class="fas fa-circle-notch pr-2 text-lighter"></span>
70+
Circles
71+
</a> --}}
72+
{{-- <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
73+
<span class="fas fa-project-diagram fa-sm pr-2 text-lighter"></span>
74+
Network
75+
</a> --}}
76+
<div class="dropdown-divider"></div>
77+
<a class="dropdown-item font-weight-bold" href="/i/me">
78+
<span class="far fa-user pr-2 text-lighter"></span>
79+
{{__('navmenu.myProfile')}}
80+
</a>
81+
<a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
82+
<span class="far fa-compass pr-2 text-lighter"></span>
83+
{{__('navmenu.discover')}}
84+
</a>
85+
<a class="dropdown-item font-weight-bold" href="{{route('notifications')}}">
86+
<span class="far fa-bell pr-2 text-lighter"></span>
87+
Notifications
88+
</a>
89+
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
90+
<span class="fas fa-cog pr-2 text-lighter"></span>
91+
{{__('navmenu.settings')}}
92+
</a>
93+
@if(Auth::user()->is_admin == true)
94+
<div class="dropdown-divider"></div>
95+
<a class="dropdown-item font-weight-bold" href="{{ route('admin.home') }}">
96+
<span class="fas fa-shield-alt fa-sm pr-2 text-lighter"></span>
97+
{{__('navmenu.admin')}}
98+
</a>
99+
@endif
100+
<div class="dropdown-divider"></div>
101+
<a class="dropdown-item font-weight-bold" href="{{ route('logout') }}"
102+
onclick="event.preventDefault();
103+
document.getElementById('logout-form').submit();">
104+
<span class="fas fa-sign-out-alt pr-2"></span>
105+
{{ __('navmenu.logout') }}
106+
</a>
96107

97-
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
98-
@csrf
99-
</form>
100-
</div>
101-
</li>
102-
</div>
103-
@endguest
104-
</ul>
105-
</div>
108+
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
109+
@csrf
110+
</form>
111+
</div>
112+
</li>
113+
</div>
114+
@endguest
115+
</ul>
116+
</div>
106117
</div>
107-
</nav>
118+
</nav>

0 commit comments

Comments
 (0)