nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5726 from rabuzarus/201805_-_edit_album_modal

Browse source 
Frio - fix missing modal for editing photo albums
This commit is contained in:
Hypolite Petovan 2018-09-05 12:52:11 -04:00 committed by GitHub
parent f6a35605c9 7c5e964581
commit 3a751f0562
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
view/theme/frio/js/mod_photos.js
View file

@ -15,7 +15,14 @@ $(document).ready(function() {
}).trigger('change'); }).trigger('change');
// Click event listener for the album edit link/button.
$("body").on('click', '#album-edit-link', function() {
var modalUrl = $(this).attr("data-modal-url");
if (typeof modalUrl !== "undefined") {
addToModal(modalUrl, 'photo-album-edit-wrapper');
}
});
}); });
$(window).load(function() { $(window).load(function() {

19
view/theme/frio/js/modal.js
View file

@ -188,14 +188,25 @@ function loadModalTitle() {
} }
} }
// This function loads html content from a friendica page
// into a modal. /**
function addToModal(url) { * This function loads html content from a friendica page into a modal.
*
* @param {string} url The url with html content.
* @param {string} id The ID of a html element (can be undefined).
* @returns {void}
*/
function addToModal(url, id) {
var char = qOrAmp(url); var char = qOrAmp(url);
url = url + char + 'mode=none'; url = url + char + 'mode=none';
var modal = $('#modal').modal(); var modal = $('#modal').modal();
// Only search for an element if we have an ID.
if (typeof id !== "undefined") {
url = url + " div#" + id;
}
modal modal
.find('#modal-body') .find('#modal-body')
.load(url, function (responseText, textStatus) { .load(url, function (responseText, textStatus) {
@ -215,7 +226,7 @@ function addToModal(url) {
}); });
} }
// Add a element (by it's id) to a bootstrap modal. // Add an element (by its id) to a bootstrap modal.
function addElmToModal(id) { function addElmToModal(id) {
var elm = $(id).html(); var elm = $(id).html();
var modal = $('#modal').modal(); var modal = $('#modal').modal();

23
view/theme/frio/templates/album_edit.tpl
View file

@ -1,14 +1,15 @@
<div id="photo-album-edit-wrapper"> <div id="photo-album-edit-wrapper">
<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label> <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
<div class="pull-left photo-album-edit-name"> <div class="pull-left photo-album-edit-name">
<input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name" style="width: 100%;"> <input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name">
</div> </div>
<div class="pull-right"> <div class="pull-right">
<input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
<input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" /> <input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
</div> </div>
</form> </form>
<div class="clear"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>

4
view/theme/frio/templates/photo_album.tpl
View file

@ -12,9 +12,9 @@
{{if $edit}} {{if $edit}}
<span class="icon-padding"> </span> <span class="icon-padding"> </span>
<a id="album-edit-link" class="page-action faded-icon" href="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip"> <button id="album-edit-link" class="btn-link page-action faded-icon" type="button" data-modal-url="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
</a> </button>
{{/if}} {{/if}}
{{if ! $noorder}} {{if ! $noorder}}