mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #898 from pixelfed/frontend-ui-refactor 

Frontend ui refactor
This commit is contained in:
daniel 2019-02-27 20:44:23 -07:00 committed by GitHub
parent 80a6e2d27b 42c3578063
commit 04aaf96aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/lang/en/navmenu.php
View File

@ -2,13 +2,17 @@
return [
'viewMyProfile' => 'View my profile',
'myTimeline' => 'My Timeline',
'publicTimeline' => 'Public Timeline',
'remoteFollow' => 'Remote Follow',
'settings' => 'Settings',
'admin' => 'Admin',
'logout' => 'Logout',
'directMessages' => 'Direct Messages',
'search' => 'Search',
'home' => 'Home',
'local' => 'Local',
'discover' => 'Discover',
'viewMyProfile' => 'View my profile',
'myTimeline' => 'My Timeline',
'publicTimeline' => 'Public Timeline',
'remoteFollow' => 'Remote Follow',
'settings' => 'Settings',
'admin' => 'Admin',
'logout' => 'Logout',
'directMessages' => 'Direct Messages',
];

24
resources/views/layouts/partial/nav.blade.php
View File

@ -9,7 +9,7 @@
@auth
<ul class="navbar-nav ml-auto d-none d-md-block">
<form class="form-inline search-form">
<input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
<input class="form-control mr-sm-2 search-form-input" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off">
</form>
</ul>
@endauth
@ -25,7 +25,7 @@
<i class="fas fa-home fa-lg"></i>
</span>
<span class="d-none d-md-block">
{{ __('Home') }}
{{__('navmenu.home')}}
</span>
</a>
</li>
@ -35,7 +35,7 @@
<i class="far fa-map fa-lg"></i>
</span>
<span class="d-none d-md-block">
{{ __('Local') }}
{{__('navmenu.local')}}
</span>
</a>
</li>
@ -50,9 +50,9 @@
</a>
</li> --}}
<li class="nav-item pr-md-2">
<a class="nav-link font-weight-bold" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
<a class="nav-link font-weight-bold {{request()->is('*discover*') ?'text-primary':''}}" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom">
<span class="d-none d-md-block">
{{ __('Discover')}}</i>
{{__('navmenu.discover')}}</i>
</span>
</a>
</li>
@ -86,17 +86,17 @@
<a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
<span class="far fa-compass pr-1"></span>
{{__('Discover')}}
{{__('navmenu.discover')}}
</a>
{{-- <a class="dropdown-item font-weight-bold" href="{{route('messages')}}">
<span class="far fa-envelope pr-1"></span>
{{__('navmenu.directMessages')}}
</a> --}}
</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>
{{-- <a class="dropdown-item font-weight-bold" href="{{route('remotefollow')}}">
<span class="fas fa-user-plus pr-1"></span>
{{__('navmenu.remoteFollow')}}
</a> --}}
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
<span class="fas fa-cog pr-1"></span>
{{__('navmenu.settings')}}
@ -128,7 +128,7 @@
@auth
<nav class="breadcrumb d-md-none d-flex">
<form class="form-inline search-form mx-auto">
<input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
<input class="form-control mr-sm-2 search-form-input" type="search" placeholder="{{__('navmenu.search')}}" aria-label="Search">
</form>
</nav>
@endauth