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

Merge pull request #377 from hellcp/patch-27 

Fix usernames escaping div and make images link to users
This commit is contained in:
daniel 2018-08-14 15:10:31 -06:00 committed by GitHub
parent efbbcf24d7 3b60ab45ac
commit 9c4c06ea48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/status/show.blade.php
View File

@ -6,14 +6,14 @@
<div class="card card-md-rounded-0 status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}"> <div class="card card-md-rounded-0 status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
<div class="row mx-0"> <div class="row mx-0">
<div class="d-flex d-md-none align-items-center justify-content-between card-header bg-white w-100"> <div class="d-flex d-md-none align-items-center justify-content-between card-header bg-white w-100">
<div class="d-flex align-items-center status-username"> <a href="{{$user->url()}}" class="d-flex align-items-center status-username text-truncate" data-toggle="tooltip" data-placement="bottom" title="{{$user->username}}">
<div class="status-avatar mr-2"> <div class="status-avatar mr-2">
<img class="img-thumbnail" src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;"> <img src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;">
</div> </div>
<div class="username"> <div class="username">
<a href="{{$user->url()}}" class="username-link font-weight-bold text-dark">{{$user->username}}</a> <span class="username-link font-weight-bold text-dark">{{$user->username}}</span>
</div> </div>
</div> </a>
</div> </div>
<div class="col-12 col-md-8 status-photo px-0"> <div class="col-12 col-md-8 status-photo px-0">
@if($status->is_nsfw && $status->media_count == 1) @if($status->is_nsfw && $status->media_count == 1)
@ -61,14 +61,14 @@
</div> </div>
<div class="col-12 col-md-4 px-0 d-flex flex-column border-left border-md-left-0"> <div class="col-12 col-md-4 px-0 d-flex flex-column border-left border-md-left-0">
<div class="d-md-flex d-none align-items-center justify-content-between card-header py-3 bg-white"> <div class="d-md-flex d-none align-items-center justify-content-between card-header py-3 bg-white">
<div class="d-flex align-items-center status-username"> <a href="{{$user->url()}}" class="d-flex align-items-center status-username text-truncate" data-toggle="tooltip" data-placement="bottom" title="{{$user->username}}">
<div class="status-avatar mr-2"> <div class="status-avatar mr-2">
<img class="img-thumbnail" src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;"> <img src="{{$user->avatarUrl()}}" width="24px" height="24px" style="border-radius:12px;">
</div> </div>
<div class="username"> <div class="username">
<a href="{{$user->url()}}" class="username-link font-weight-bold text-dark">{{$user->username}}</a> <span class="username-link font-weight-bold text-dark">{{$user->username}}</span>
</div> </div>
</div> </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">