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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-09-02 01:38:29 -06:00 committed by GitHub
commit 3eedcefdbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/ProfileController.php
View file

@ -29,7 +29,8 @@ class ProfileController extends Controller
$username = $user->username; $username = $user->username;
$loggedIn = Auth::check(); $loggedIn = Auth::check();
$isPrivate = false; $isPrivate = false;
$isBlocked = false;
if ($user->remote_url) { if ($user->remote_url) {
$settings = new \StdClass; $settings = new \StdClass;
$settings->crawlable = false; $settings->crawlable = false;

44
resources/views/status/show/sidebar.blade.php
View file

@ -8,29 +8,45 @@
<span class="username-link font-weight-bold text-dark">{{$user->username}}</span> <span class="username-link font-weight-bold text-dark">{{$user->username}}</span>
</div> </div>
</a> </a>
<div class="float-right"> <div class="float-right">
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options"> <button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
<span class="fas fa-ellipsis-v text-muted"></span> <span class="fas fa-ellipsis-v text-muted"></span>
</button> </button>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item font-weight-bold" href="{{$status->reportUrl()}}">Report</a> <a class="dropdown-item font-weight-bold" href="{{$status->reportUrl()}}">Report</a>
{{-- <a class="dropdown-item" href="#">Embed</a> --}} {{-- <a class="dropdown-item" href="#">Embed</a> --}}
@if(Auth::check()) @if(Auth::check())
@if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true) @if(Auth::user()->profile->id !== $status->profile->id)
{{-- <a class="dropdown-item" href="{{$status->editUrl()}}">Edit</a> --}} <div class="dropdown-divider"></div>
<form method="post" action="/i/delete"> <form method="post" action="/i/mute">
@csrf @csrf
<input type="hidden" name="type" value="post"> <input type="hidden" name="type" value="user">
<input type="hidden" name="item" value="{{$status->id}}"> <input type="hidden" name="item" value="{{$status->profile_id}}">
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Delete</button> <button type="submit" class="dropdown-item btn btn-link font-weight-bold">Mute this user</button>
</form>
<form method="post" action="/i/block">
@csrf
<input type="hidden" name="type" value="user">
<input type="hidden" name="item" value="{{$status->profile_id}}">
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Block this user</button>
</form> </form>
@endif @endif
@if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
<div class="dropdown-divider"></div>
{{-- <a class="dropdown-item" href="{{$status->editUrl()}}">Edit</a> --}}
<form method="post" action="/i/delete">
@csrf
<input type="hidden" name="type" value="post">
<input type="hidden" name="item" value="{{$status->id}}">
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Delete</button>
</form>
@endif
@endif @endif
</div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="d-flex flex-md-column flex-column-reverse h-100"> <div class="d-flex flex-md-column flex-column-reverse h-100">
<div class="card-body status-comments"> <div class="card-body status-comments">