keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11960 from annando/issue-11880

Browse source 
Issue 11880: Provide "alt" description from uploaded file
This commit is contained in:
Hypolite Petovan 2022-10-03 19:10:00 -04:00 committed by GitHub
commit fa3f5d8d9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/fbrowser.php
View file

@ -103,7 +103,8 @@ function fbrowser_content(App $a)
return [ return [
DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'], DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
$filename_e, $filename_e,
DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext,
$rr['desc']
]; ];
} }
$files = array_map("_map_files1", $r); $files = array_map("_map_files1", $r);

2
view/js/filebrowser.js
View file

@ -85,7 +85,7 @@ var FileBrowser = {
var embed = ""; var embed = "";
if (FileBrowser.type == "image") { if (FileBrowser.type == "image") {
embed = "[url="+this.dataset.link+"][img="+this.dataset.img+"][/img][/url]"; embed = "[url="+this.dataset.link+"][img="+this.dataset.img+"]"+this.dataset.alt+"[/img][/url]";
} }
if (FileBrowser.type=="file") { if (FileBrowser.type=="file") {
// attachment links are "baseurl/attach/id"; we need id // attachment links are "baseurl/attach/id"; we need id

2
view/templates/filebrowser.tpl
View file

@ -32,7 +32,7 @@
<div class="list"> <div class="list">
{{foreach $files as $f}} {{foreach $files as $f}}
<div class="photo-album-image-wrapper"> <div class="photo-album-image-wrapper">
<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}"> <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}" data-alt="{{$f.3}}>
<img src="{{$f.2}}"> <img src="{{$f.2}}">
<p>{{$f.1}}</p> <p>{{$f.1}}</p>
</a> </a>

2
view/theme/frio/js/filebrowser.js
View file

@ -116,7 +116,7 @@ var FileBrowser = {
var embed = ""; var embed = "";
if (FileBrowser.type === "image") { if (FileBrowser.type === "image") {
embed = "[url=" + this.dataset.link + "][img=" + this.dataset.img + "][/img][/url]"; embed = "[url=" + this.dataset.link + "][img=" + this.dataset.img + "]" + this.dataset.alt + "[/img][/url]";
} }
if (FileBrowser.type === "file") { if (FileBrowser.type === "file") {
// attachment links are "baseurl/attach/id"; we need id // attachment links are "baseurl/attach/id"; we need id

2
view/theme/frio/templates/filebrowser.tpl
View file

@ -42,7 +42,7 @@
<div class="fbrowser-content-container"> <div class="fbrowser-content-container">
{{foreach $files as $f}} {{foreach $files as $f}}
<div class="photo-album-image-wrapper"> <div class="photo-album-image-wrapper">
<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}"> <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}" data-alt="{{$f.3}}">
<img src="{{$f.2}}" alt="{{$f.1}}"> <img src="{{$f.2}}" alt="{{$f.1}}">
<p>{{$f.1}}</p> <p>{{$f.1}}</p>
</a> </a>