UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update nav

Browse source
This commit is contained in:
Daniel Supernault 2019-12-05 21:10:28 -07:00
parent e30c59c7bc
commit 473d1755b8
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/lang/en/navmenu.php
View file

@ -1,7 +1,6 @@
<?php <?php
return [ return [
'search' => 'Search', 'search' => 'Search',
'home' => 'Home', 'home' => 'Home',
'local' => 'Local', 'local' => 'Local',
@ -16,5 +15,5 @@ return [
'admin' => 'Admin', 'admin' => 'Admin',
'logout' => 'Logout', 'logout' => 'Logout',
'directMessages' => 'Direct Messages', 'directMessages' => 'Direct Messages',
'composePost' => 'Compose Post',
]; ];

2
resources/views/layouts/app.blade.php
View file

@ -66,7 +66,7 @@
<a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a> <a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<div class="nav-link text-lighter cursor-pointer" data-toggle="modal" data-target="#composeModal"><i class="fas fa-camera fa-lg"></i></div> <div class="nav-link text-lighter cursor-pointer" onclick="App.util.compose.post()"><i class="fas fa-camera fa-lg"></i></div>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a> <a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a>

23
resources/views/layouts/partial/nav.blade.php
View file

@ -47,26 +47,21 @@
</a> </a>
</li> </li>
</div> </div>
<div class="d-none d-md-block">
<li class="nav-item px-md-2">
<div title="Create new post" data-toggle="tooltip" data-placement="bottom">
<a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
<i class="fas fa-camera-retro fa-lg text-muted"></i>
</a>
</div>
</li>
</div>
<li class="nav-item dropdown ml-2"> <li class="nav-item dropdown ml-2">
<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">
<i class="far fa-user fa-lg text-muted"></i> <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">
<div class="dropdown-item font-weight-bold cursor-pointer" onclick="App.util.compose.post()">
<span class="fas fa-camera-retro pr-1"></span>
{{__('navmenu.composePost')}}
</div>
<div class="dropdown-divider"></div>
<a class="dropdown-item font-weight-bold" href="/i/me"> <a class="dropdown-item font-weight-bold" href="/i/me">
<span class="far fa-user pr-1"></span> <span class="far fa-user pr-1"></span>
{{__('navmenu.myProfile')}} {{__('navmenu.myProfile')}}
</a> </a>
<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')}}">
<span class="far fa-compass pr-1"></span> <span class="far fa-compass pr-1"></span>
{{__('navmenu.discover')}} {{__('navmenu.discover')}}
@ -75,16 +70,10 @@
<span class="far fa-bell pr-1"></span> <span class="far fa-bell pr-1"></span>
Notifications Notifications
</a> </a>
<div class="dropdown-divider"></div>
<a class="dropdown-item font-weight-bold" href="{{route('timeline.personal')}}">
<span class="fas fa-home pr-1"></span>
{{__('navmenu.myTimeline')}}
</a>
<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}"> <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
<span class="far fa-map pr-1"></span> <span class="far fa-map pr-1"></span>
{{__('navmenu.publicTimeline')}} {{__('navmenu.publicTimeline')}}
</a> </a>
<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>
{{__('navmenu.settings')}} {{__('navmenu.settings')}}
@ -94,8 +83,8 @@
<span class="fas fa-cogs pr-1"></span> <span class="fas fa-cogs pr-1"></span>
{{__('navmenu.admin')}} {{__('navmenu.admin')}}
</a> </a>
<div class="dropdown-divider"></div>
@endif @endif
<div class="dropdown-divider"></div>
<a class="dropdown-item font-weight-bold" href="{{ route('logout') }}" <a class="dropdown-item font-weight-bold" href="{{ route('logout') }}"
onclick="event.preventDefault(); onclick="event.preventDefault();
document.getElementById('logout-form').submit();"> document.getElementById('logout-form').submit();">