diff --git a/view/theme/frio/js/mod_photos.js b/view/theme/frio/js/mod_photos.js
index b8d03b5db9..77173385b1 100644
--- a/view/theme/frio/js/mod_photos.js
+++ b/view/theme/frio/js/mod_photos.js
@@ -15,7 +15,14 @@ $(document).ready(function() {
}).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() {
diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index 2b3059eaf1..9a15cab52a 100644
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -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);
url = url + char + 'mode=none';
var modal = $('#modal').modal();
+ // Only search for an element if we have an ID.
+ if (typeof id !== "undefined") {
+ url = url + " div#" + id;
+ }
+
modal
.find('#modal-body')
.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) {
var elm = $(id).html();
var modal = $('#modal').modal();
diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl
index 583eb6d1b7..f4a60b7d03 100644
--- a/view/theme/frio/templates/album_edit.tpl
+++ b/view/theme/frio/templates/album_edit.tpl
@@ -1,14 +1,15 @@