chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-11-27 00:36:26 -07:00 committed by GitHub
commit a111cf7feb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/AvatarController.php
View file

@ -58,7 +58,7 @@ class AvatarController extends Controller
$path = $this->buildPath($id);
$dir = storage_path('app/'.$path);
$this->checkDir($dir);
$name = 'avatar.'.$file->guessExtension();
$name = str_random(20).'_avatar.'.$file->guessExtension();
$res = ['root' => 'storage/app/'.$path, 'name' => $name, 'storage' => $path];
return $res;

4
resources/views/status/compose.blade.php
View file

@ -63,7 +63,7 @@
<input type="file" name="media" class="d-none file-input" multiple="">
<div class="caption d-none">
<div class="form-group mb-0">
<input type="text" class="form-control input-elevated font-weight-bold" placeholder="Add an optional caption">
<textarea class="form-control input-elevated font-weight-bold" placeholder="Add an optional caption"></textarea>
</div>
</div>
<div class="options"></div>
@ -470,7 +470,7 @@ $(document).on('click', '#create', function(e) {
$('.composeLoader').removeClass('d-none');
let data = {
media: pixelfed.uploader.meta,
caption: $('.caption input').val(),
caption: $('.caption textarea').val(),
visibility: pixelfed.uploader.visibility,
};
axios.post('/api/local/status/compose', data)