mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-08 01:05:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Interface

Browse source 
Updated metadata-sync badge and save
Updated unsaved changes badge triggers
Harmonized global and unit mode by creating a template for the filters

TODO :

Uncomment updateBlock calls in metaSync and implement tags update

Uncomment pluginSave method and test it with an updated plugin
This commit is contained in:
marsooooo 2024-07-02 11:01:18 +02:00
parent 5a05350bd0
commit f355a307d7
10 changed files with 667 additions and 964 deletions
Download patch file Download diff file Expand all files Collapse all files

1
admin/batch_manager_unit.php
View file

@ -515,6 +515,7 @@ SELECT
)); ));
} }
$template->assign('ACTIVE_PLUGINS', array_keys($pwg_loaded_plugins));
$template->assign(array( $template->assign(array(
'ELEMENT_IDS' => implode(',', $element_ids), 'ELEMENT_IDS' => implode(',', $element_ids),

70
admin/themes/default/js/batchManagerGlobal.js
View file

@ -1,73 +1,3 @@
/* ********** Filters*/
function filter_enable(filter) {
/* show the filter*/
$("#"+filter).show();
/* check the checkbox to declare we use this filter */
$("input[type=checkbox][name="+filter+"_use]").prop("checked", true);
/* forbid to select this filter in the addFilter list */
$("#addFilter").find("a[data-value="+filter+"]").addClass("disabled", "disabled");
/* hide the no filter message */
$('.noFilter').hide();
$('.addFilter-button').removeClass('highlight');
}
function filter_disable(filter) {
/* hide the filter line */
$("#"+filter).hide();
/* uncheck the checkbox to declare we do not use this filter */
$("input[name="+filter+"_use]").prop("checked", false);
/* give the possibility to show it again */
$("#addFilter").find("a[data-value="+filter+"]").removeClass("disabled");
/* show the no filter message if no filter selected */
if ($('#filterList li:visible').length == 0) {
$('.noFilter').show();
$('.addFilter-button').addClass('highlight');
}
}
$(".removeFilter").addClass("icon-cancel-circled");
$(".removeFilter").click(function () {
var filter = $(this).parent('li').attr("id");
filter_disable(filter);
return false;
});
$("#addFilter a").on('click', function () {
var filter = $(this).attr("data-value");
filter_enable(filter);
});
$("#removeFilters").click(function() {
$("#filterList li").each(function() {
var filter = $(this).attr("id");
filter_disable(filter);
});
return false;
});
$('[data-slider=widths]').pwgDoubleSlider(sliders.widths);
$('[data-slider=heights]').pwgDoubleSlider(sliders.heights);
$('[data-slider=ratios]').pwgDoubleSlider(sliders.ratios);
$('[data-slider=filesizes]').pwgDoubleSlider(sliders.filesizes);
$(document).mouseup(function (e) {
e.stopPropagation();
if (!$(event.target).hasClass('addFilter-button')) {
$('.addFilter-dropdown').slideUp();
}
});
/* ********** Thumbs */ /* ********** Thumbs */
/* Shift-click: select all photos between the click and the shift+click */ /* Shift-click: select all photos between the click and the shift+click */

236
admin/themes/default/js/batchManagerUnit.js
View file

@ -1,6 +1,4 @@
$(document).ready(function() { $(document).ready(function() {
//Pagination
// Detect unsaved changes on any inputs // Detect unsaved changes on any inputs
var user_interacted = false; var user_interacted = false;
@ -8,11 +6,25 @@ $(document).ready(function () {
user_interacted = true; user_interacted = true;
}); });
$('input, textarea, select').on('change', function() { $('input, textarea').on('input', function() {
var pictureId = $(this).parents("fieldset").data("image_id"); var pictureId = $(this).parents("fieldset").data("image_id");
if (user_interacted == true) { if (user_interacted == true) {
showUnsavedLocalBadge(pictureId); showUnsavedLocalBadge(pictureId);
}
});
// Specific handler for datepicker inputs
$('input[data-datepicker]').on('change', function() {
var pictureId = $(this).parents("fieldset").data("image_id");
if (user_interacted == true) {
showUnsavedLocalBadge(pictureId);
}
});
$('select').on('change', function() {
var pictureId = $(this).parents("fieldset").data("image_id");
if (user_interacted == true) {
showUnsavedLocalBadge(pictureId);
} }
}); });
@ -20,9 +32,8 @@ $(document).ready(function () {
user_interacted = true; user_interacted = true;
var pictureId = $(this).parents("fieldset").data("image_id"); var pictureId = $(this).parents("fieldset").data("image_id");
showUnsavedLocalBadge(pictureId); showUnsavedLocalBadge(pictureId);
}); });
// METADATA SYNC // METADATA SYNC
$('.action-sync-metadata').on('click', function(event) { $('.action-sync-metadata').on('click', function(event) {
var pictureId = $(this).parents("fieldset").data("image_id"); var pictureId = $(this).parents("fieldset").data("image_id");
@ -57,47 +68,15 @@ $(document).ready(function () {
success: function(data) { success: function(data) {
var isOk = data.stat && data.stat === "ok"; var isOk = data.stat && data.stat === "ok";
if (isOk) { if (isOk) {
$.ajax({ updateBlock(pictureId);
url: 'ws.php?format=json',
type: 'GET',
dataType: 'json',
data: {
method: 'pwg.images.getInfo',
image_id: pictureId, // corrected variable name
format: 'json'
},
success: function(response) {
if (response.stat === 'ok') {
$("#picture-" + pictureId + " #name-" + pictureId).val(response.result.name);
$("#picture-" + pictureId + " #author-" + pictureId).val(response.result.author);
$("#picture-" + pictureId + " #date_creation-" + pictureId).val(response.result.date_creation);
$("#picture-" + pictureId + " #description-" + pictureId).val(response.result.comment);
$("#picture-" + pictureId + " #level-" + pictureId).val(response.result.level);
$("#picture-" + pictureId + " #filename-" + pictureId).text(response.result.file);
$("#picture-" + pictureId + " #filesize-" + pictureId).text(response.result.filesize);
$("#picture-" + pictureId + " #dimensions-" + pictureId).text(response.result.width + "x" + response.result.height);
showMetasyncSuccesBadge(pictureId);
enableLocalButton(pictureId)
} else {
console.error("Error:", response.message);
showErrorLocalBadge(pictureId);
enableLocalButton(pictureId)
}
},
error: function(xhr, status, error) {
console.error("Error:", status, error);
showErrorLocalBadge(pictureId);
enableLocalButton(pictureId)
}
});
} else { } else {
showErrorLocalBadge(pictureId); showErrorLocalBadge(pictureId);
enableLocalButton(pictureId) enableLocalButton(pictureId);
} }
}, },
error: function(data) { error: function(data) {
console.error("Error occurred"); console.error("Error occurred");
enableLocalButton(pictureId) enableLocalButton(pictureId);
} }
}); });
} }
@ -108,14 +87,10 @@ $(document).ready(function () {
} }
}); });
}); });
// DELETE // DELETE
$('.action-delete-picture').on('click', function(event) { $('.action-delete-picture').on('click', function(event) {
var $fieldset = $(this).parents("fieldset"); var $fieldset = $(this).parents("fieldset");
var pictureId = $fieldset.data("image_id"); var pictureId = $fieldset.data("image_id");
$.confirm({ $.confirm({
title: str_are_you_sure, title: str_are_you_sure,
draggable: false, draggable: false,
@ -164,7 +139,6 @@ $(document).ready(function () {
} }
}); });
})(image_ids); })(image_ids);
image_ids = []; image_ids = [];
} }
}, },
@ -174,68 +148,53 @@ $(document).ready(function () {
} }
}); });
}); });
// VALIDATION // VALIDATION
//Unit Save //Unit Save
$('.action-save-picture').on('click', function(event) { $('.action-save-picture').on('click', function(event) {
var $fieldset = $(this).parents("fieldset"); var $fieldset = $(this).parents("fieldset");
var pictureId = $fieldset.data("image_id"); var pictureId = $fieldset.data("image_id");
saveChanges(pictureId); saveChanges(pictureId);
}); });
//Global Save //Global Save
$('.action-save-global').on('click', function(event) { $('.action-save-global').on('click', function(event) {
saveAllChanges(); saveAllChanges();
}); });
//Categories //Categories
$(".linked-albums.add-item").on("click", function() { $(".linked-albums.add-item").on("click", function() {
var pictureId = $(this).parents("fieldset").data("image_id") var pictureId = $(this).parents("fieldset").data("image_id")
linked_albums_open(pictureId); linked_albums_open(pictureId);
set_up_popin(); set_up_popin();
}); });
$(".limitReached").html(str_no_search_in_progress); $(".limitReached").html(str_no_search_in_progress);
$(".search-cancel-linked-album").hide(); $(".search-cancel-linked-album").hide();
$(".linkedAlbumPopInContainer .searching").hide(); $(".linkedAlbumPopInContainer .searching").hide();
$("#linkedAlbumSearch .search-input").on('input', function() { $("#linkedAlbumSearch .search-input").on('input', function() {
var pictureId = $("#linkedAlbumSearch .search-input").parents(".linkedAlbumPopInContainer").attr("id"); var pictureId = $("#linkedAlbumSearch .search-input").parents(".linkedAlbumPopInContainer").attr("id");
if ($(this).val() != 0) { if ($(this).val() != 0) {
$("#linkedAlbumSearch .search-cancel-linked-album").show() $("#linkedAlbumSearch .search-cancel-linked-album").show()
} else { } else {
$("#linkedAlbumSearch .search-cancel-linked-album").hide(); $("#linkedAlbumSearch .search-cancel-linked-album").hide();
} }
// Search input value length required to start searching // Search input value length required to start searching
if ($(this).val().length > 0) { if ($(this).val().length > 0) {
linked_albums_search($(this).val(), pictureId); linked_albums_search($(this).val(), pictureId);
} else { } else {
$(".limitReached").html(str_no_search_in_progress); $(".limitReached").html(str_no_search_in_progress);
$("#searchResult").empty(); $("#searchResult").empty();
} }
}) })
$(".search-cancel-linked-album").on("click", function() { $(".search-cancel-linked-album").on("click", function() {
$("#linkedAlbumSearch .search-input").val(""); $("#linkedAlbumSearch .search-input").val("");
$("#linkedAlbumSearch .search-input").trigger("input"); $("#linkedAlbumSearch .search-input").trigger("input");
}) })
$(".related-categories-container .breadcrumb-item .remove-item").on("click", function() { $(".related-categories-container .breadcrumb-item .remove-item").on("click", function() {
var pictureId = $(this).parents("fieldset").data("image_id") var pictureId = $(this).parents("fieldset").data("image_id")
remove_related_category($(this).attr("id"), pictureId); remove_related_category($(this).attr("id"), pictureId);
}) })
pluginFunctionMapInit(activePlugins);
}) })
function fill_results(cats, pictureId) { function fill_results(cats, pictureId) {
$("#searchResult").empty(); $("#searchResult").empty();
cats.forEach(cat => { cats.forEach(cat => {
$("#searchResult").append( $("#searchResult").append(
@ -266,7 +225,6 @@ function fill_results(cats, pictureId) {
$("#" + pictureId + " .invisible-related-categories-select option[value=" + catId + "]").remove(); $("#" + pictureId + " .invisible-related-categories-select option[value=" + catId + "]").remove();
$("#" + pictureId + " .invisible-related-categories-select").trigger('change'); $("#" + pictureId + " .invisible-related-categories-select").trigger('change');
$("#" + pictureId + " #" + catId).parent().remove(); $("#" + pictureId + " #" + catId).parent().remove();
cat_to_remove_index = this_related_category_ids.indexOf(catId); cat_to_remove_index = this_related_category_ids.indexOf(catId);
if (cat_to_remove_index > -1) { if (cat_to_remove_index > -1) {
this_related_category_ids.splice(cat_to_remove_index, 1); this_related_category_ids.splice(cat_to_remove_index, 1);
@ -283,26 +241,20 @@ function fill_results(cats, pictureId) {
"<span class='link-path'>" + cat_link_path + "</span><span id=" + catId + " class='icon-cancel-circled remove-item'></span>" + "<span class='link-path'>" + cat_link_path + "</span><span id=" + catId + " class='icon-cancel-circled remove-item'></span>" +
"</div>" "</div>"
); );
$(".search-result-item#" + catId).addClass("notClickable"); $(".search-result-item#" + catId).addClass("notClickable");
this_related_category_ids.push(catId); this_related_category_ids.push(catId);
$(".invisible-related-categories-select").append("<option selected value=" + catId + "></option>").trigger('change'); $(".invisible-related-categories-select").append("<option selected value=" + catId + "></option>").trigger('change');
$("#" + catId).on("click", function() { $("#" + catId).on("click", function() {
remove_related_category(catId, pictureId); remove_related_category(catId, pictureId);
}) })
linked_albums_close(); linked_albums_close();
} }
check_related_categories(pictureId); check_related_categories(pictureId);
} }
function check_related_categories(pictureId) { function check_related_categories(pictureId) {
var this_related_category_ids = window["related_category_ids_" + pictureId]; var this_related_category_ids = window["related_category_ids_" + pictureId];
$("#picture-" + pictureId + " .linked-albums-badge").html(this_related_category_ids.length); $("#picture-" + pictureId + " .linked-albums-badge").html(this_related_category_ids.length);
if (this_related_category_ids.length == 0) { if (this_related_category_ids.length == 0) {
$("#" + pictureId + " .linked-albums-badge").addClass("badge-red"); $("#" + pictureId + " .linked-albums-badge").addClass("badge-red");
$("#" + pictureId + " .add-item").addClass("highlight"); $("#" + pictureId + " .add-item").addClass("highlight");
@ -318,7 +270,6 @@ function fill_results(cats, pictureId) {
var visibleLocalUnsavedCount = $(".local-unsaved-badge").filter(function() { var visibleLocalUnsavedCount = $(".local-unsaved-badge").filter(function() {
return $(this).css('display') === 'block'; return $(this).css('display') === 'block';
}).length; }).length;
if (visibleLocalUnsavedCount > 0) { if (visibleLocalUnsavedCount > 0) {
$(".global-unsaved-badge").css('display', 'block'); $(".global-unsaved-badge").css('display', 'block');
$("#unsaved-count").text(visibleLocalUnsavedCount); $("#unsaved-count").text(visibleLocalUnsavedCount);
@ -339,7 +290,6 @@ function hideUnsavedLocalBadge(pictureId) {
$("#picture-" + pictureId + " .local-unsaved-badge").css('display', 'none'); $("#picture-" + pictureId + " .local-unsaved-badge").css('display', 'none');
updateUnsavedGlobalBadge(); updateUnsavedGlobalBadge();
} }
$(window).on('beforeunload', function() { $(window).on('beforeunload', function() {
if (user_interacted) { if (user_interacted) {
return "You have unsaved changes, are you sure you want to leave this page?"; return "You have unsaved changes, are you sure you want to leave this page?";
@ -349,16 +299,15 @@ $(window).on('beforeunload', function() {
function showErrorLocalBadge(pictureId) { function showErrorLocalBadge(pictureId) {
$("#picture-" + pictureId + " .local-error-badge").css('display', 'block'); $("#picture-" + pictureId + " .local-error-badge").css('display', 'block');
} }
function hideErrorLocalBadge(pictureId) { function hideErrorLocalBadge(pictureId) {
$("#picture-" + pictureId + " .local-error-badge").css('display', 'none'); $("#picture-" + pictureId + " .local-error-badge").css('display', 'none');
} }
//Succes badge //Succes badge
function updateSuccessGlobalBadge() { function updateSuccessGlobalBadge() {
var visibleLocalSuccesCount = $(".local-success-badge").filter(function() { var visibleLocalSuccesCount = $(".local-success-badge").filter(function() {
return $(this).css('display') === 'block'; return $(this).css('display') === 'block';
}).length; }).length;
if (visibleLocalSuccesCount > 0) { if (visibleLocalSuccesCount > 0) {
showSuccesGlobalBadge() showSuccesGlobalBadge()
} else { } else {
@ -372,7 +321,6 @@ function showSuccessLocalBadge(pictureId) {
'display': 'block', 'display': 'block',
'opacity': 1 'opacity': 1
}); });
setTimeout(() => { setTimeout(() => {
badge.fadeOut(1000, function() { badge.fadeOut(1000, function() {
badge.css('display', 'none'); badge.css('display', 'none');
@ -390,7 +338,6 @@ function showSuccesGlobalBadge() {
'display': 'block', 'display': 'block',
'opacity': 1 'opacity': 1
}); });
setTimeout(() => { setTimeout(() => {
badge.fadeOut(1000, function() { badge.fadeOut(1000, function() {
badge.css('display', 'none'); badge.css('display', 'none');
@ -408,7 +355,6 @@ function showMetasyncSuccesBadge(pictureId) {
'display': 'block', 'display': 'block',
'opacity': 1 'opacity': 1
}); });
setTimeout(() => { setTimeout(() => {
badge.fadeOut(1000, function() { badge.fadeOut(1000, function() {
badge.css('display', 'none'); badge.css('display', 'none');
@ -418,47 +364,40 @@ function showMetasyncSuccesBadge(pictureId) {
function disableLocalButton(pictureId) { function disableLocalButton(pictureId) {
$("#picture-" + pictureId + " .action-save-picture").addClass("disabled"); $("#picture-" + pictureId + " .action-save-picture").addClass("disabled");
$("#picture-" + pictureId + " .action-save-picture i").removeClass("icon-floppy").addClass("icon-spin6 animate-spin"); $("#picture-" + pictureId + " .action-save-picture i").removeClass("icon-floppy").addClass("icon-spin6 animate-spin");
disableGlobalButton(); disableGlobalButton();
} }
function enableLocalButton(pictureId) { function enableLocalButton(pictureId) {
$("#picture-" + pictureId + " .action-save-picture").removeClass("disabled"); $("#picture-" + pictureId + " .action-save-picture").removeClass("disabled");
$("#picture-" + pictureId + " .action-save-picture i").removeClass("icon-spin6 animate-spin").addClass("icon-floppy"); $("#picture-" + pictureId + " .action-save-picture i").removeClass("icon-spin6 animate-spin").addClass("icon-floppy");
} }
function disableGlobalButton() { function disableGlobalButton() {
$(".action-save-global").addClass("disabled"); $(".action-save-global").addClass("disabled");
$(".action-save-global i").removeClass("icon-floppy").addClass("icon-spin6 animate-spin"); $(".action-save-global i").removeClass("icon-floppy").addClass("icon-spin6 animate-spin");
} }
function enableGlobalButton() { function enableGlobalButton() {
$(".action-save-global").removeClass("disabled"); $(".action-save-global").removeClass("disabled");
$(".action-save-global i").removeClass("icon-spin6 animate-spin").addClass("icon-floppy"); $(".action-save-global i").removeClass("icon-spin6 animate-spin").addClass("icon-floppy");
} }
function saveChanges(pictureId) { function saveChanges(pictureId) {
if ($("#picture-" + pictureId + " .local-unsaved-badge").css('display') === 'block') { if ($("#picture-" + pictureId + " .local-unsaved-badge").css('display') === 'block') {
disableLocalButton(pictureId); disableLocalButton(pictureId);
// Retrieve Infos // Retrieve Infos
var name = $("#name-" + pictureId).val(); var name = $("#name-" + pictureId).val();
var author = $("#author-" + pictureId).val(); var author = $("#author-" + pictureId).val();
var date_creation = $("#date_creation-" + pictureId).val(); var date_creation = $("#date_creation-" + pictureId).val();
var comment = $("#description-" + pictureId).val(); var comment = $("#description-" + pictureId).val();
var level = $("#level-" + pictureId + " option:selected").val(); var level = $("#level-" + pictureId + " option:selected").val();
// Get Categories // Get Categories
var categories = []; var categories = [];
$("#picture-" + pictureId + " .remove-item").each(function() { $("#picture-" + pictureId + " .remove-item").each(function() {
categories.push($(this).attr("id")); categories.push($(this).attr("id"));
}); });
var categoriesStr = categories.join(';'); var categoriesStr = categories.join(';');
// Get Tags // Get Tags
var tags = []; var tags = [];
$("#tags-" + pictureId + " option").each(function() { $("#tags-" + pictureId + " option").each(function() {
@ -466,7 +405,6 @@ function saveChanges(pictureId) {
tags.push(tagId); tags.push(tagId);
}); });
var tagsStr = tags.join(','); var tagsStr = tags.join(',');
$.ajax({ $.ajax({
url: 'ws.php?format=json', url: 'ws.php?format=json',
method: 'POST', method: 'POST',
@ -490,7 +428,7 @@ function saveChanges(pictureId) {
hideUnsavedLocalBadge(pictureId); hideUnsavedLocalBadge(pictureId);
showSuccessLocalBadge(pictureId); showSuccessLocalBadge(pictureId);
updateSuccessGlobalBadge(); updateSuccessGlobalBadge();
pluginSaveLoop(activePlugins); //call for plugin save // pluginSaveLoop(activePlugins); //call for plugin save
}, },
error: function(xhr, status, error) { error: function(xhr, status, error) {
enableLocalButton(pictureId); enableLocalButton(pictureId);
@ -501,81 +439,106 @@ function saveChanges(pictureId) {
console.error('Error:', error); console.error('Error:', error);
} }
}); });
} else { } else {}
}
} }
function saveAllChanges() { function saveAllChanges() {
$("fieldset").each(function() { $("fieldset").each(function() {
var pictureId = $(this).data("image_id"); var pictureId = $(this).data("image_id");
saveChanges(pictureId); saveChanges(pictureId);
}); });
} }
//PLUGINS SAVE METHOD //PLUGINS SAVE METHOD
var activePlugins = []; var pluginFunctionMap = {};
$.ajax({
url: 'ws.php?format=json',
method: 'GET',
data: {
method: 'pwg.plugins.getList',
},
success: function(response) {
console.log("AJAX call succeeded. Raw response: ", response);
console.log("Type of response: ", typeof response);
if (typeof response === 'string') {
try {
response = JSON.parse(response);
console.log("Parsed response: ", response);
} catch (e) {
console.error("Failed to parse response as JSON: ", e);
}
}
console.log("Response stat: ", response.stat);
console.log("Response result: ", response.result);
console.log("Is result an array? ", Array.isArray(response.result));
if (response.stat === "ok" && Array.isArray(response.result)) {
activePlugins = response.result.filter(function(plugin) {
return plugin.state === "active";
}).map(function(plugin) {
return plugin.id;
});
console.log("Active plugins: ", activePlugins);
function pluginFunctionMapInit(activePlugins) {
activePlugins.forEach(function(pluginId) {
var functionName = pluginId + '_batchManagerSave';
if (typeof window[functionName] === 'function') {
pluginFunctionMap[pluginId] = window[functionName];
} else { } else {
console.error("Unexpected response format or status."); console.log('Function not found during initialization: ' + functionName);
}
},
error: function(xhr, status, error) {
console.error("An error occurred: " + error);
} }
}); });
}
function pluginSaveLoop(plugins) { function pluginSaveLoop(activePlugins) {
if (plugins.length === 0) { if (activePlugins.length === 0) {
console.log("No plugins to process in pluginSaveLoop."); console.log("No plugins to process in pluginSaveLoop.");
return; return;
} }
plugins.forEach(function(pluginId) { activePlugins.forEach(function(pluginId) {
var functionName = pluginId + '_batchManagerSave'; var saveFunction = pluginFunctionMap[pluginId];
if (typeof saveFunction === 'function') {
if (typeof window[functionName] === 'function') { saveFunction();
window[functionName](); console.log('Executed function for plugin: ' + pluginId);
console.log('Executed function: ' + functionName);
} else { } else {
console.log('Function not found: ' + functionName); console.log('Function not found for plugin: ' + pluginId);
} }
}); });
} }
//UPDATE BLOCKS (Yet to be implemented)
function updateBlock(pictureId) {
$.ajax({
url: 'ws.php?format=json',
type: 'GET',
dataType: 'json',
data: {
method: 'pwg.images.getInfo',
image_id: pictureId,
format: 'json'
},
success: function(response) {
if (response.stat === 'ok') {
$("#picture-" + pictureId + " #name-" + pictureId).val(response.result.name);
$("#picture-" + pictureId + " #author-" + pictureId).val(response.result.author);
$("#picture-" + pictureId + " #date_creation-" + pictureId).val(response.result.date_creation);
$("#picture-" + pictureId + " #description-" + pictureId).val(response.result.comment);
$("#picture-" + pictureId + " #level-" + pictureId).val(response.result.level);
$("#picture-" + pictureId + " #filename-" + pictureId).text(response.result.file);
$("#picture-" + pictureId + " #filesize-" + pictureId).text(response.result.filesize);
$("#picture-" + pictureId + " #dimensions-" + pictureId).text(response.result.width + "x" + response.result.height);
// updateTags(response.result.tags, pictureId); //Yet to be implemented
showMetasyncSuccesBadge(pictureId);
enableLocalButton(pictureId);
enableGlobalButton();
} else {
console.error("Error:", response.message);
showErrorLocalBadge(pictureId);
enableLocalButton(pictureId);
enableGlobalButton();
}
},
error: function(xhr, status, error) {
console.error("Error:", status, error);
showErrorLocalBadge(pictureId);
enableLocalButton(pictureId);
}
});
}
//TAGS UPDATE Yet to be implemented
// function updateTags(tagsData, pictureId) {
// var $tagsUpdate = $('#tags-'+pictureId).selectize({
// create: true,
// persist: false
// });
// var selectizeTags = $tagsUpdate[0].selectize;
// var transformedData = tagsData.map(function(item) {
// return {
// value: item.id,
// text: item.name
// };
// })
// console.log(transformedData);
// selectizeTags.clearOptions();
// selectizeTags.addOption(transformedData);
// selectizeTags.refreshOptions(true);
// };
//UNRELEASED LEVEL SLIDER
// $(function () { // $(function () {
// $('.privacy-filter-slider').each(function() { // $('.privacy-filter-slider').each(function() {
// var id = $(this).attr('id'); // var id = $(this).attr('id');
// $(this).slider({ // $(this).slider({
// range: 'min', // range: 'min',
// value: $(this).attr('value'), // value: $(this).attr('value'),
@ -587,10 +550,7 @@ function pluginSaveLoop(plugins) {
// }); // });
// }); // });
// }); // });
// function updateCertificationFilterLabel(value, id) { // function updateCertificationFilterLabel(value, id) {
// let label = strs_privacy[value]; // let label = strs_privacy[value];
// $('#' + id + ' .privacy').html(label); // $('#' + id + ' .privacy').html(label);
// } // }

247
admin/themes/default/template/batch_manager_global.tpl
View file

@ -6,7 +6,7 @@
{combine_script id='jquery.ui.slider' require='jquery.ui' load='async' path='themes/default/js/ui/minified/jquery.ui.slider.min.js'} {combine_script id='jquery.ui.slider' require='jquery.ui' load='async' path='themes/default/js/ui/minified/jquery.ui.slider.min.js'}
{combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"} {combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
{combine_script id='doubleSlider' load='async' require='jquery.ui.slider' path='admin/themes/default/js/doubleSlider.js'} {combine_script id='doubleSlider' load='footer' require='jquery.ui.slider' path='admin/themes/default/js/doubleSlider.js'}
{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'} {combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
@ -311,46 +311,6 @@ $(document).ready(function() {
jQuery("#sync_md5sum").toggle(jQuery(this).val() == "no_sync_md5sum"); jQuery("#sync_md5sum").toggle(jQuery(this).val() == "no_sync_md5sum");
}); });
}); });
{*<!-- sliders config -->*}
var sliders = {
widths: {
values: [{$dimensions.widths}],
selected: {
min: {$dimensions.selected.min_width},
max: {$dimensions.selected.max_width},
},
text: '{'between %d and %d pixels'|translate|escape:'javascript'}'
},
heights: {
values: [{$dimensions.heights}],
selected: {
min: {$dimensions.selected.min_height},
max: {$dimensions.selected.max_height},
},
text: '{'between %d and %d pixels'|translate|escape:'javascript'}'
},
ratios: {
values: [{$dimensions.ratios}],
selected: {
min: {$dimensions.selected.min_ratio},
max: {$dimensions.selected.max_ratio},
},
text: '{'between %.2f and %.2f'|translate|escape:'javascript'}'
},
filesizes: {
values: [{$filesize.list}],
selected: {
min: {$filesize.selected.min},
max: {$filesize.selected.max},
},
text: '{'between %s and %s MB'|translate|escape:'javascript'}'
}
};
{/footer_script} {/footer_script}
{combine_script id='jquery.confirm' load='footer' require='jquery' path='themes/default/js/plugins/jquery-confirm.min.js'} {combine_script id='jquery.confirm' load='footer' require='jquery' path='themes/default/js/plugins/jquery-confirm.min.js'}
@ -361,207 +321,10 @@ var sliders = {
<form action="{$F_ACTION}" method="post"> <form action="{$F_ACTION}" method="post">
<input type="hidden" name="start" value="{$START}"> <input type="hidden" name="start" value="{$START}">
<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
{include file='include/batch_manager_filter.inc.tpl'
<fieldset> title={'Batch Manager Filter'|@translate}
<legend><span class='icon-filter icon-green'></span>{'Filter'|@translate}</legend> searchPlaceholder={'Filters'|@translate}
}
<div class="filterBlock">
<ul id="filterList">
<li id="filter_prefilter" {if !isset($filter.prefilter)}style="display:none"{/if}>
<input type="checkbox" name="filter_prefilter_use" class="useFilterCheckbox" {if isset($filter.prefilter)}checked="checked"{/if}>
<p>{'Predefined filter'|@translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
<select name="filter_prefilter">
{foreach from=$prefilters item=prefilter}
{assign 'optionClass' ''}
{if $prefilter.ID eq 'no_album'}{assign 'optionClass' 'icon-heart-broken'}{/if}
{if $prefilter.ID eq 'caddie'}{assign 'optionClass' 'icon-flag'}{/if}
<option value="{$prefilter.ID}" class="{$optionClass}" {if isset($filter.prefilter) && $filter.prefilter eq $prefilter.ID}selected="selected"{/if}>{$prefilter.NAME}</option>
{/foreach}
</select>
<a id="empty_caddie" href="admin.php?page=batch_manager&amp;action=empty_caddie" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'caddie'}display:none{/if}">{'Empty caddie'|translate}</a>
{if $NB_ORPHANS > 0}
<a id="delete_orphans" href="#" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'no_album'}display:none{/if}" class="icon-trash">{'Delete %d orphan photos'|translate:$NB_ORPHANS}</a>
{/if}
{if $NB_NO_MD5SUM > 0}
<a id="sync_md5sum" href="#" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'no_sync_md5sum'}display:none{/if}" class="icon-arrows-cw">{'Compute %d missing checksums'|translate:{$NB_NO_MD5SUM}}</a>
{/if}
<span id="add_md5sum" style="display:none">
<img class="loading" src="themes/default/images/ajax-loader-small.gif">
<span id="md5sum_added">0</span>% -
<span id="md5sum_to_add" data-origin="{$NB_NO_MD5SUM}">{$NB_NO_MD5SUM}</span>
{'checksums to add'|translate}
</span>
<span id="add_md5sum_error" class="errors" style="display:none"></span>
<span id="orphans_deletion" style="display:none">
<img class="loading" src="themes/default/images/ajax-loader-small.gif">
<span id="orphans_deleted">0</span>% -
<span id="orphans_to_delete" data-origin="{$NB_ORPHANS}">{$NB_ORPHANS}</span>
{'orphans to delete'|translate}
</span>
<span id="orphans_deletion_error" class="errors" style="display:none"></span>
<span id="duplicates_options" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'duplicates'}display:none{/if}">
{'based on'|translate}
<label class="font-checkbox"><span class="icon-check"></span><input type="checkbox" name="filter_duplicates_filename" {if isset($filter.duplicates_filename)}checked="checked"{/if}> {'file name'|translate}</label>
<label class="font-checkbox" title="md5sum"><span class="icon-check"></span><input type="checkbox" name="filter_duplicates_checksum" {if isset($filter.duplicates_checksum)}checked="checked"{/if}> {'checksum'|translate} <i class="icon-help-circled tiptip" title="translated md5sum definition here !"> </i></label>
<label class="font-checkbox"><span class="icon-check"></span><input type="checkbox" name="filter_duplicates_date" {if isset($filter.duplicates_date) or (isset($filter.prefilter) and $filter.prefilter ne 'duplicates')}checked="checked"{/if}> {'date & time'|translate}</label>
<label class="font-checkbox"><span class="icon-check"></span><input type="checkbox" name="filter_duplicates_dimensions" {if isset($filter.duplicates_dimensions)}checked="checked"{/if}> {'width & height'|translate}</label>
</span>
</li>
<li id="filter_category" {if !isset($filter.category)}style="display:none"{/if}>
<input type="checkbox" name="filter_category_use" class="useFilterCheckbox" {if isset($filter.category)}checked="checked"{/if}>
<p>{'Album'|@translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
<select data-selectize="categories" data-value="{$filter_category_selected|@json_encode|escape:html}"
data-default="first" name="filter_category"></select>
<label class="font-checkbox"><span class="icon-check"></span><input type="checkbox" name="filter_category_recursive" {if isset($filter.category_recursive)}checked="checked"{/if}> {'include child albums'|@translate}</label>
</li>
<li id="filter_tags" {if !isset($filter.tags)}style="display:none"{/if}>
<input type="checkbox" name="filter_tags_use" class="useFilterCheckbox" {if isset($filter.tags)}checked="checked"{/if}>
<p>{'Tags'|@translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
<select data-selectize="tags" data-value="{$filter_tags|@json_encode|escape:html}"
placeholder="{'Type in a search term'|translate}"
name="filter_tags[]" multiple style="width:600px;"></select>
<label class="font-checkbox"><span class="icon-circle-empty"></span><span><input type="radio" name="tag_mode" value="AND" {if !isset($filter.tag_mode) or $filter.tag_mode eq 'AND'}checked="checked"{/if}> {'All tags'|@translate}</span></label>
<label class="font-checkbox"><span class="icon-circle-empty"></span><span><input type="radio" name="tag_mode" value="OR" {if isset($filter.tag_mode) and $filter.tag_mode eq 'OR'}checked="checked"{/if}> {'Any tag'|@translate}</span></label>
</li>
<li id="filter_level" {if !isset($filter.level)}style="display:none"{/if}>
<input type="checkbox" name="filter_level_use" class="useFilterCheckbox" {if isset($filter.level)}checked="checked"{/if}>
<p>{'Privacy level'|@translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
<select name="filter_level" size="1">
{html_options options=$filter_level_options selected=$filter_level_options_selected}
</select>
<label class="font-checkbox"><span class="icon-check"></span><input type="checkbox" name="filter_level_include_lower" {if isset($filter.level_include_lower)}checked="checked"{/if}> {'include photos with lower privacy level'|@translate}</label>
</li>
<li id="filter_dimension" {if !isset($filter.dimension)}style="display:none"{/if}>
<input type="checkbox" name="filter_dimension_use" class="useFilterCheckbox" {if isset($filter.dimension)}checked="checked"{/if}>
<p>{'Dimensions'|translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
<blockquote>
<div data-slider="widths" class="dimensionSlidersBlocks">
<div class="dimensionSlidersTitleButtons">
<div>
{'Width'|translate} <span class="slider-info">{'between %d and %d pixels'|translate:$dimensions.selected.min_width:$dimensions.selected.max_width}</span>
</div>
<a class="slider-choice dimension-cancel" data-min="{$dimensions.bounds.min_width}" data-max="{$dimensions.bounds.max_width}">{'Reset'|translate}</a>
</div>
<div class="slider-slider"></div>
<input type="hidden" data-input="min" name="filter_dimension_min_width" value="{$dimensions.selected.min_width}">
<input type="hidden" data-input="max" name="filter_dimension_max_width" value="{$dimensions.selected.max_width}">
</div>
<div data-slider="heights" class="dimensionSlidersBlocks">
<div class="dimensionSlidersTitleButtons">
<div>
{'Height'|translate} <span class="slider-info">{'between %d and %d pixels'|translate:$dimensions.selected.min_height:$dimensions.selected.max_height}</span>
</div>
<a class="slider-choice dimension-cancel" data-min="{$dimensions.bounds.min_height}" data-max="{$dimensions.bounds.max_height}">{'Reset'|translate}</a>
</div>
<div class="slider-slider"></div>
<input type="hidden" data-input="min" name="filter_dimension_min_height" value="{$dimensions.selected.min_height}">
<input type="hidden" data-input="max" name="filter_dimension_max_height" value="{$dimensions.selected.max_height}">
</div>
<div data-slider="ratios" class="dimensionSlidersBlocks">
<div style="margin-bottom: 11px;">
<span>{'Ratio'|translate} ({'Width'|@translate}/{'Height'|@translate})</span>
<span class="slider-info">{'between %.2f and %.2f'|translate:$dimensions.selected.min_ratio:$dimensions.selected.max_ratio}</span>
</div>
<div class="dimensionSlidersRatioButtons">
<div>
{if isset($dimensions.ratio_portrait)} <a class="slider-choice" data-min="{$dimensions.ratio_portrait.min}" data-max="{$dimensions.ratio_portrait.max}">{'Portrait'|translate}</a>{/if}
{if isset($dimensions.ratio_square)} <a class="slider-choice" data-min="{$dimensions.ratio_square.min}" data-max="
{$dimensions.ratio_square.max}">{'square'|translate}</a>{/if}
{if isset($dimensions.ratio_landscape)} <a class="slider-choice" data-min="{$dimensions.ratio_landscape.min}" data-max="{$dimensions.ratio_landscape.max}">{'Landscape'|translate}</a>{/if}
{if isset($dimensions.ratio_panorama)} <a class="slider-choice" data-min="{$dimensions.ratio_panorama.min}" data-max="{$dimensions.ratio_panorama.max}">{'Panorama'|translate}</a>{/if}
</div>
<div>
<a class="slider-choice dimension-cancel" data-min="{$dimensions.bounds.min_ratio}" data-max="{$dimensions.bounds.max_ratio}">{'Reset'|translate}</a>
</div>
</div>
<div class="slider-slider"></div>
<input type="hidden" data-input="min" name="filter_dimension_min_ratio" value="{$dimensions.selected.min_ratio}">
<input type="hidden" data-input="max" name="filter_dimension_max_ratio" value="{$dimensions.selected.max_ratio}">
</div>
</blockquote>
</li>
<li id="filter_search"{if !isset($filter.search)} style="display:none"{/if}>
<input type="checkbox" name="filter_search_use" class="useFilterCheckbox"{if isset($filter.search)} checked="checked"{/if}>
<p>{'Search'|@translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
<input name="q" size=40 value="{if isset($filter.search)} {$filter.search.q|stripslashes|htmlspecialchars}{/if}">
<a href="admin/popuphelp.php?page=quick_search&amp;output=content_only" title="{'Help'|@translate}" class="help-popin-search"><span class="icon-help-circled">{'Search tips'|translate}</span></a>
{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
{if (isset($no_search_results))}
<div>{'No results for'|@translate} :
<em><strong>
{foreach $no_search_results as $res}
{if !$res@first} &mdash; {/if}
{$res}
{/foreach}
</strong></em>
</div>
{/if}
</li>
<li id="filter_filesize" {if !isset($filter.filesize)}style="display:none"{/if}>
<input type="checkbox" name="filter_filesize_use" class="useFilterCheckbox" {if isset($filter.filesize)}checked="checked"{/if}>
<p>{'Filesize'|translate}</p>
<a href="#" class="removeFilter" title="{'remove this filter'|translate}"><span>[x]</span></a>
<blockquote>
<div data-slider="filesizes">
<span class="slider-info">{'between %s and %s MB'|translate:$filesize.selected.min:$filesize.selected.max}</span>
<a class="slider-choice dimension-cancel" data-min="{$filesize.bounds.min}" data-max="{$filesize.bounds.max}">{'Reset'|translate}</a>
<div class="slider-slider"></div>
<input type="hidden" data-input="min" name="filter_filesize_min" value="{$filesize.selected.min}">
<input type="hidden" data-input="max" name="filter_filesize_max" value="{$filesize.selected.max}">
</div>
</blockquote>
</li>
</ul>
<div class='noFilter'>{'No filter, add one'|@translate}</div>
<div class="filterActions">
<div id="addFilter">
<div class="addFilter-button icon-plus" onclick="$('.addFilter-dropdown').slideToggle()">{'Add a filter'|@translate}</div>
<div class="addFilter-dropdown">
<a data-value="filter_prefilter" {if isset($filter.prefilter)}class="disabled"{/if}>{'Predefined filter'|@translate}</a>
<a data-value="filter_category" {if isset($filter.category)}class="disabled"{/if}>{'Album'|@translate}</a>
<a data-value="filter_tags" {if isset($filter.tags)}class="disabled"{/if}>{'Tags'|@translate}</a>
<a data-value="filter_level" {if isset($filter.level)}class="disabled"{/if}>{'Privacy level'|@translate}</a>
<a data-value="filter_dimension" {if isset($filter.dimension)}class="disabled"{/if}>{'Dimensions'|@translate}</a>
<a data-value="filter_filesize" {if isset($filter.filesize)}class="disabled"{/if}>{'Filesize'|@translate}</a>
<a data-value="filter_search"{if isset($filter.search)} class="disabled"{/if}>{'Search'|@translate}</a>
</div>
<a id="removeFilters" class="icon-cancel" style="display: none;">{'Remove all filters'|@translate}</a>
</div>
<button id="applyFilter" name="submitFilter" type="submit">
<i class="icon-arrows-cw"></i> {'Refresh photo set'|@translate}
</button>
</div>
</div>
</fieldset>
<fieldset> <fieldset>
<legend><span class='icon-check icon-blue '></span>{'Selection'|@translate}</legend> <legend><span class='icon-check icon-blue '></span>{'Selection'|@translate}</legend>

171
admin/themes/default/template/batch_manager_unit.tpl
View file

@ -21,6 +21,8 @@
{combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {combine_css path="admin/themes/default/fontello/css/animation.css" order=10}
{footer_script} {footer_script}
{* <!-- PLUGINS --> *}
var activePlugins = {$ACTIVE_PLUGINS|json_encode};
(function(){ (function(){
{* <!-- TAGS --> *} {* <!-- TAGS --> *}
var tagsCache = new TagsCache({ var tagsCache = new TagsCache({
@ -73,24 +75,23 @@ const strs_privacy = {
{combine_script id='batchManagerUnit' load='footer' require='jquery.ui.effect-blind,jquery.sort' path='admin/themes/default/js/batchManagerUnit.js'} {combine_script id='batchManagerUnit' load='footer' require='jquery.ui.effect-blind,jquery.sort' path='admin/themes/default/js/batchManagerUnit.js'}
<div id="batchManagerGlobal" style="margin-bottom: 80px;"> <div id="batchManagerGlobal" style="margin-bottom: 80px;">
<div style="clear:both"></div> <div style="clear:both"></div>
{debug}{if isset($ELEMENT_IDS)}
{debug} <div>
{if isset($ELEMENT_IDS)}<div><input type="hidden" name="element_ids" value="{$ELEMENT_IDS}"></div>{/if} <input type="hidden" name="element_ids" value="{$ELEMENT_IDS}">
</div>
{/if}
{*Filters*} {*Filters*}
{include file='include/batch_manager_filter.inc.tpl' <form method="post" action="{$F_ACTION}" class="filter">
title={'Batch Manager Filter'|@translate} {include file='include/batch_manager_filter.inc.tpl' title={'Batch Manager Filter'|@translate} searchPlaceholder={'Filters'|@translate}}
searchPlaceholder={'Filters'|@translate} </form>
} <legend style="padding: 1em;">
<span class='icon-menu icon-blue'></span>
Liste
<legend style="padding: 1em;"><span class='icon-menu icon-blue'></span>Liste<span class="count-badge"> {count($all_elements)}</span></legend> <span class="count-badge"> {count($all_elements)}</span>
</legend>
{if !empty($elements) } {if !empty($elements) }
<div style="margin: 10px 0; display: flex; justify-content: space-between; padding: 1em;"> <div style="margin: 10px 0; display: flex; justify-content: space-between; padding: 1em;">
<div style="margin-right: 21px;" class="pagination-per-page"> <div style="margin-right: 21px;" class="pagination-per-page">
<span style="font-weight: bold;color: unset;">{'photos per page'|@translate} :</span> <span style="font-weight: bold;color: unset;">{'photos per page'|@translate} :</span>
<a href="{$U_ELEMENTS_PAGE}&amp;display=5">5</a> <a href="{$U_ELEMENTS_PAGE}&amp;display=5">5</a>
@ -99,21 +100,37 @@ const strs_privacy = {
</div> </div>
<div style="margin-left: 22px;"> <div style="margin-left: 22px;">
<div class="pagination-reload"> <div class="pagination-reload">
{if !empty($navbar) }<a class="button-reload tiptip" title="{'Pagination has changed and needs to be reloaded !'|@translate}" style="display: none;" href="{$F_ACTION}"><i class="icon-cw"></i></a>{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} {if !empty($navbar) }
<a class="button-reload tiptip" title="{'Pagination has changed and needs to be reloaded !'|@translate}" style="display: none;" href="{$F_ACTION}"><i class="icon-cw"></i></a>
{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
</div> </div>
</div> </div>
</div> </div>
{foreach from=$elements item=element} {foreach from=$elements item=element}
{footer_script} {footer_script}
var related_category_ids_{$element.ID} = {$element.related_category_ids}; var related_category_ids_{$element.ID} = {$element.related_category_ids};
url_delete_{$element.id} = '{$element.U_DELETE}'; url_delete_{$element.id} = '{$element.U_DELETE}';
{/footer_script} {/footer_script}
<div class="success deleted-badge" data-image_id="{$element.ID}" style="display: none;">
<div class="success deleted-badge" data-image_id="{$element.ID}" style="display: none;"><i class="icon-ok" style="font-size: 20px;"></i><p>&nbsp;{'Image'|@translate}&nbsp;<p style="font-weight: bold;">#{$element.ID} '{$element.FILE}'</p>&nbsp;{'was succesfully deleted'|@translate}</p></div> <i class="icon-ok" style="font-size: 20px;"></i>
<p>
&nbsp;{'Image'|@translate}&nbsp;
<p style="font-weight: bold;">
#{$element.ID} '{$element.FILE}'
</p>
&nbsp;{'was succesfully deleted'|@translate}
</p>
</div>
<fieldset class="elementEdit" id="picture-{$element.ID}" data-image_id="{$element.ID}"> <fieldset class="elementEdit" id="picture-{$element.ID}" data-image_id="{$element.ID}">
<div class="pictureIdLabel">#{$element.ID}</div> <div class="metasync-success badge-container" style="display: none;">
<div class="badge-succes">
<i class="icon-ok">&#xe819;</i>
{'Metadata sync complete'|@translate}
</div>
</div>
<div class="pictureIdLabel">
#{$element.ID}
</div>
<div class="media-box"> <div class="media-box">
<img src="{$element.TN_SRC}" alt="imagename" class="media-box-embed" style="{if $element.FORMAT}width:100%; max-height:100%;{else}max-width:100%; height:100%;{/if}"> <img src="{$element.TN_SRC}" alt="imagename" class="media-box-embed" style="{if $element.FORMAT}width:100%; max-height:100%;{else}max-width:100%; height:100%;{/if}">
<div class="media-hover"> <div class="media-hover">
@ -123,17 +140,22 @@ const strs_privacy = {
<a class="icon-signal tiptip" href="{$element.U_HISTORY}" title="Visit history"></a> <a class="icon-signal tiptip" href="{$element.U_HISTORY}" title="Visit history"></a>
<a target="_blank" class="icon-pencil tiptip" href="{$element.U_EDIT}" title="{'Edit photo'|@translate}"></a> <a target="_blank" class="icon-pencil tiptip" href="{$element.U_EDIT}" title="{'Edit photo'|@translate}"></a>
{if !url_is_remote($element.PATH)} {if !url_is_remote($element.PATH)}
<a class="icon-arrows-cw tiptip action-sync-metadata" title="{'Synchronize metadata'|@translate}"></a> {* <a class="icon-arrows-cw tiptip action-sync-metadata" title="{'Synchronize metadata'|@translate}"></a> *}
<a class="icon-trash tiptip action-delete-picture" title="{'delete photo'|@translate}"></a> <a class="icon-trash tiptip action-delete-picture" title="{'delete photo'|@translate}"></a>
{/if} {/if}
</div> </div>
{if isset($element.U_JUMPTO)} {if isset($element.U_JUMPTO)}
<a class="see-out" href="{$element.U_JUMPTO}" > <a class="see-out" href="{$element.U_JUMPTO}" >
<p><i class="icon-left-open"></i>{'Open in gallery'|@translate}</p> <p>
<i class="icon-left-open"></i>
{'Open in gallery'|@translate}
</p>
{else} {else}
<a class="see-out disabled" href="#" > <a class="see-out disabled" href="#" >
<p class="" title="{'You don\'t have access to this photo'|translate}" ><i class="icon-left-open"></i>{'Open in gallery'|translate}</p> <p class="" title="{'You don\'t have access to this photo'|translate}" >
<i class="icon-left-open"></i>
{'Open in gallery'|translate}
</p>
{/if} {/if}
</a> </a>
</div> </div>
@ -147,7 +169,6 @@ const strs_privacy = {
<span class="main-info-desc" id="dimensions-{$element.id}">{$element.DIMENSIONS}</span> <span class="main-info-desc" id="dimensions-{$element.id}">{$element.DIMENSIONS}</span>
<span class="main-info-desc" id="filesize-{$element.id}">{$element.FILESIZE}</span> <span class="main-info-desc" id="filesize-{$element.id}">{$element.FILESIZE}</span>
<span class="main-info-desc">{$element.EXT}</span> <span class="main-info-desc">{$element.EXT}</span>
</div> </div>
<div class="main-info-block"> <div class="main-info-block">
<div class='info-framed-icon' style="margin-right:0px;"> <div class='info-framed-icon' style="margin-right:0px;">
@ -160,12 +181,10 @@ const strs_privacy = {
</div> </div>
</div> </div>
<div class="info-container"> <div class="info-container">
<div class="half-line-info-box"> <div class="half-line-info-box">
<strong>{'Title'|@translate}</strong> <strong>{'Title'|@translate}</strong>
<input type="text" name="name" id="name-{$element.id}" value="{$element.NAME}"> <input type="text" name="name" id="name-{$element.id}" value="{$element.NAME}">
</div> </div>
<div class="calendar-box"> <div class="calendar-box">
<strong>{'Creation date'|@translate}</strong> <strong>{'Creation date'|@translate}</strong>
<input type="hidden" id="date_creation-{$element.id}" name="date_creation-{$element.id}" value="{$element.DATE_CREATION}"> <input type="hidden" id="date_creation-{$element.id}" name="date_creation-{$element.id}" value="{$element.DATE_CREATION}">
@ -174,28 +193,24 @@ const strs_privacy = {
<input type="text" data-datepicker="date_creation-{$element.id}" data-datepicker-unset="date_creation_unset-{$element.id}" readonly> <input type="text" data-datepicker="date_creation-{$element.id}" data-datepicker-unset="date_creation_unset-{$element.id}" readonly>
<a href="#" class="icon-cancel-circled unset datepickerDelete" id="date_creation_unset-{$element.id}"></a> <a href="#" class="icon-cancel-circled unset datepickerDelete" id="date_creation_unset-{$element.id}"></a>
</label> </label>
</div> </div>
<div class="half-line-info-box"> <div class="half-line-info-box">
<strong>{'Author'|@translate}</strong> <strong>{'Author'|@translate}</strong>
<input type="text" name="author" id="author-{$element.id}" value="{$element.AUTHOR}"> <input type="text" name="author" id="author-{$element.id}" value="{$element.AUTHOR}">
</div> </div>
<div class="half-line-info-box"> <div class="half-line-info-box">
<div class="privacy-label-container"> <div class="privacy-label-container">
<strong>{'Who can see ?'|@translate}</strong> <i>{'level of confidentiality'|@translate}</i> <strong>{'Who can see ?'|@translate}</strong>
<i>{'level of confidentiality'|@translate}</i>
</div> </div>
<select name="level" id="level-{$element.id}" size="1"> <select name="level" id="level-{$element.id}" size="1">
{html_options options=$level_options selected=$element.level_options_selected} {html_options options=$level_options selected=$element.level_options_selected}
</select> </select>
{* <div class="advanced-filter-item advanced-filter-privacy" > {*
<div class="advanced-filter-item advanced-filter-privacy" >
<div class="privacy-label-container"> <div class="privacy-label-container">
<strong>{'Who can see this photo?'|@translate}</strong> <strong>{'Who can see this photo?'|@translate}</strong>
<label class="advanced-filter-item-label" for="privacy-filter" > <label class="advanced-filter-item-label" for="privacy-filter" ><span class="privacy">{$level_options[$element.LEVEL]}</span></label>
<span class="privacy">{$level_options[$element.LEVEL]}</span>
</label>
</div> </div>
<div class="advanced-filter-item-container"> <div class="advanced-filter-item-container">
<div id="privacy-filter" class="select-bar"></div> <div id="privacy-filter" class="select-bar"></div>
@ -203,50 +218,71 @@ const strs_privacy = {
<div class="slider-bar-container privacy-filter-slider" value="{$element.LEVEL_CONVERT}" id="{$element.ID}"></div> <div class="slider-bar-container privacy-filter-slider" value="{$element.LEVEL_CONVERT}" id="{$element.ID}"></div>
</div> </div>
</div> </div>
</div> *}
</div> </div>
*}
</div>
<div class="full-line-tag-box"> <div class="full-line-tag-box">
<strong>{'Tags'|@translate}</strong> <strong>{'Tags'|@translate}</strong>
<select id="tags-{$element.id}" data-selectize="tags" data-value="{$element.TAGS|@json_encode|escape:html}" <select id="tags-{$element.id}" data-selectize="tags" data-value="{$element.TAGS|@json_encode|escape:html}"placeholder="{'Type in a search term'|translate}"data-create="true" name="tags" id="tags-{$element.id}[]" multiple></select>
placeholder="{'Type in a search term'|translate}"
data-create="true" name="tags" id="tags-{$element.id}[]" multiple></select>
</div> </div>
<div class="full-line-info-box" id="{$element.ID}"> <div class="full-line-info-box" id="{$element.ID}">
<strong>{'Linked albums'|@translate} <span class="linked-albums-badge {if $element.related_categories|@count < 1 } badge-red {/if}"> {$element.related_categories|@count} </span></strong> <strong>{'Linked albums'|@translate} <span class="linked-albums-badge {if $element.related_categories|@count < 1 } badge-red {/if}"> {$element.related_categories|@count} </span></strong>
{if $element.related_categories|@count < 1} {if $element.related_categories|@count
< 1}
<span class="orphan-photo">{'This photo is an orphan'|@translate}</span> <span class="orphan-photo">{'This photo is an orphan'|@translate}</span>
{else} {else}
<span class="orphan-photo"></span> <span class="orphan-photo"></span>
{/if} {/if}
<div class="related-categories-container"> <div class="related-categories-container">
{foreach from=$element.related_categories item=$cat_path key=$key} {foreach from=$element.related_categories item=$cat_path key=$key}
<div class="breadcrumb-item album-listed"><span class="link-path">{$cat_path['name']}</span>{if $cat_path['unlinkable']}<span id={$key} class="icon-cancel-circled remove-item"></span>{else}<span id={$key} class="icon-help-circled help-item tiptip" title="{'This picture is physically linked to this album, you can\'t dissociate them'|translate}"></span>{/if}</div> <div class="breadcrumb-item album-listed">
<span class="link-path">{$cat_path['name']}</span>
{if $cat_path['unlinkable']}
<span id={$key} class="icon-cancel-circled remove-item"></span>
{else}
<span id={$key} class="icon-help-circled help-item tiptip" title="{'This picture is physically linked to this album, you can\'t dissociate them'|translate}"></span>
{/if}
</div>
{/foreach} {/foreach}
</div> </div>
<div class="breadcrumb-item linked-albums add-item {if $element.related_categories|@count < 1 } highlight {/if}"><span class="icon-plus-circled"></span>{'Add'|translate}</div> <div class="breadcrumb-item linked-albums add-item {if $element.related_categories|@count < 1 } highlight {/if}">
<span class="icon-plus-circled"></span>
{'Add'|translate}
</div>
</div> </div>
<div class="full-line-description-box"> <div class="full-line-description-box">
<strong>{'Description'|@translate}</strong> <strong>{'Description'|@translate}</strong>
<textarea cols="50" rows="4" name="description" class="description-box" id="description-{$element.id}">{$element.DESCRIPTION}</textarea> <textarea cols="50" rows="4" name="description" class="description-box" id="description-{$element.id}">{$element.DESCRIPTION}</textarea>
</div> </div>
<div class="validation-container"> <div class="validation-container">
<div class="save-button-container"> <div class="save-button-container">
<div class="buttonLike action-save-picture"><i class="icon-floppy"></i>{'Submit'|@translate}</div> <div class="buttonLike action-save-picture buttonSubmitLocal">
<i class="icon-floppy"></i>
{'Save'|@translate}
</div>
</div>
<div class="local-unsaved-badge badge-container" style="display: none;">
<div class="badge-unsaved">
<i class="icon-attention">&#xe829;</i>
{'You have unsaved changes'|@translate}
</div>
</div>
<div class="local-success-badge badge-container" style="display: none;">
<div class="badge-succes">
<i class="icon-ok">&#xe819;</i>
{'Changes saved'|@translate}
</div>
</div>
<div class="local-error-badge badge-container" style="display: none;">
<div class="badge-error">
<i class="icon-cancel">&#xe822;</i>
{'An error has occured'|@translate}
</div>
</div> </div>
<div class="local-unsaved-badge badge-container" style="display: none;"><div class="badge-unsaved"><i class="icon-attention">&#xe829;</i>{'You have unsaved changes'|@translate}</div></div>
<div class="local-success-badge badge-container" style="display: none;"><div class="badge-succes"><i class="icon-ok">&#xe819;</i>{'Changes saved'|@translate}</div></div>
<div class="local-error-badge badge-container" style="display: none;"><div class="badge-error"><i class="icon-cancel">&#xe822;</i>{'An error has occured'|@translate}</div></div>
<div class="metasync-success badge-container" style="display: none;"><div class="badge-succes"><i class="icon-ok">&#xe819;</i>{'Metadata sync complete'|@translate}</div></div>
</div> </div>
</div> </div>
</fieldset> </fieldset>
{/foreach} {/foreach}
<div style="margin: 30px 0; display: flex; justify-content: space-between; padding: 1em;"> <div style="margin: 30px 0; display: flex; justify-content: space-between; padding: 1em;">
<div class="pagination-per-page"> <div class="pagination-per-page">
<span class="thumbnailsActionsShow" style="font-weight: bold;">{'Display'|@translate}</span> <span class="thumbnailsActionsShow" style="font-weight: bold;">{'Display'|@translate}</span>
@ -255,37 +291,42 @@ const strs_privacy = {
<a id="pagination-per-page-50">50</a> <a id="pagination-per-page-50">50</a>
</div> </div>
<div style="margin-left: 22px;"> <div style="margin-left: 22px;">
<div class="pagination-reload"> <div class="pagination-reload">
{if !empty($navbar) }<a class="button-reload tiptip" title="Pagination has changed and needs to be reloaded !" style="display: none;" href="{$F_ACTION}"><i class="icon-cw"></i></a>{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} {if !empty($navbar) }
<a class="button-reload tiptip" title="Pagination has changed and needs to be reloaded !" style="display: none;" href="{$F_ACTION}"><i class="icon-cw"></i></a>
{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
</div> </div>
</div> </div>
</div> </div>
{/if} {/if}
<div class="bottom-save-bar"> <div class="bottom-save-bar">
<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
<div class="badge-container global-unsaved-badge" style="display: none;"> <div class="badge-container global-unsaved-badge" style="display: none;">
<div class="badge-unsaved"><i class="icon-attention">&#xe829;</i> <div class="badge-unsaved">
<span id="unsaved-count"></span> {'image(s) contains unsaved changes'|@translate} <i class="icon-attention">&#xe829;</i>
<span id="unsaved-count"></span>
{'image(s) contains unsaved changes'|@translate}
</div> </div>
</div> </div>
<div class="badge-container global-succes-badge" style="display: none;"> <div class="badge-container global-succes-badge" style="display: none;">
<div class="badge-succes"><i class="icon-ok">&#xe829;</i> <div class="badge-succes">
<i class="icon-ok">&#xe829;</i>
{'Changes saved'|@translate} {'Changes saved'|@translate}
</div> </div>
</div> </div>
<div class="badge-container global-error-badge" style="display: none;"> <div class="badge-container global-error-badge" style="display: none;">
<div class="badge-error"><i class="icon-cancel">&#xe829;</i> <div class="badge-error">
<i class="icon-cancel">&#xe829;</i>
{'An error has occured'|@translate} {'An error has occured'|@translate}
</div> </div>
</div> </div>
<div class="buttonLike action-save-global"><i class="icon-floppy"></i>Save all photos</div> <div class="buttonLike action-save-global">
<i class="icon-floppy"></i>
Save all photos
</div>
</div>
</div> </div>
</div>
{include file='include/album_selector.inc.tpl' {include file='include/album_selector.inc.tpl'
title={'Associate to album'|@translate} title={'Associate to album'|@translate}

2
admin/themes/default/template/include/batch_manager_filter.inc.tpl
View file

@ -40,7 +40,6 @@ var sliders = {
{/footer_script} {/footer_script}
{combine_script id='batchManagerFilter' load='footer' path='admin/themes/default/js/batchManagerFilter.js'} {combine_script id='batchManagerFilter' load='footer' path='admin/themes/default/js/batchManagerFilter.js'}
<form method="post" action="{$F_ACTION}" class="filter">
<fieldset> <fieldset>
<legend><span class='icon-filter icon-green'></span>{'Filter'|@translate}</legend> <legend><span class='icon-filter icon-green'></span>{'Filter'|@translate}</legend>
<div class="filterBlock"> <div class="filterBlock">
@ -238,4 +237,3 @@ var sliders = {
</div> </div>
</div> </div>
</fieldset> </fieldset>
</form>

17
admin/themes/default/theme.css
View file

@ -2286,6 +2286,13 @@ h2:lang(en) { text-transform:capitalize; }
border-left:4px solid #6DCE5E; border-left:4px solid #6DCE5E;
} }
.metasync-success {
position: absolute;
top: -15px;
left: 50%;
transform: translateX(-50%);
}
.badge { .badge {
background-color:#0a0; background-color:#0a0;
color:white; color:white;
@ -2296,6 +2303,10 @@ h2:lang(en) { text-transform:capitalize; }
margin-left:5px; margin-left:5px;
} }
.buttonSubmitLocal {
margin-left: 9px !important;
}
.infos li, .errors li, .warnings li, .messages li { list-style-type:none; } .infos li, .errors li, .warnings li, .messages li { list-style-type:none; }
.infos .submit {margin-left:30px;} .infos .submit {margin-left:30px;}
@ -3424,7 +3435,6 @@ LEGEND SPAN {
.media-hover{ .media-hover{
opacity:0%; opacity:0%;
background-color: #0000009c;
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -3432,6 +3442,7 @@ LEGEND SPAN {
.media-hover:hover{ .media-hover:hover{
opacity: 100%; opacity: 100%;
transition: ease-in-out 0.3s;
} }
.main-info-container{ .main-info-container{
@ -3679,8 +3690,6 @@ LEGEND SPAN {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 90px;
height: 45px;
} }
.disabled { .disabled {
@ -3741,7 +3750,7 @@ LEGEND SPAN {
#batchManagerGlobal #selectedMessage {padding:5px; border-radius:5px; float: right;} #batchManagerGlobal #selectedMessage {padding:5px; border-radius:5px; float: right;}
#batchManagerGlobal #applyOnDetails {text-align: center; margin-top: 8px; color: #FFA646; font-weight: bold;} #batchManagerGlobal #applyOnDetails {text-align: center; margin-top: 8px; color: #FFA646; font-weight: bold;}
#batchManagerGlobal .actionButtons {text-align:left; display: flex; flex-direction: column;} #batchManagerGlobal .actionButtons {text-align:left; display: flex; flex-direction: column;}
#batchManagerGlobal #filterList {padding-left:0px; display: flex; flex-wrap: wrap; align-items: start; margin-top: 0px;} #batchManagerGlobal #filterList {padding-left:0px; display: flex; flex-wrap: wrap; align-items: start; margin-top: 0px; margin-bottom: 10px !important;}
#batchManagerGlobal #filterList li { #batchManagerGlobal #filterList li {
list-style-type:none; list-style-type:none;
background-color: #fafafa; background-color: #fafafa;

1
include/ws_functions/pwg.images.php
View file

@ -2290,7 +2290,6 @@ SELECT path
*/ */
function ws_images_setInfo($params, $service) function ws_images_setInfo($params, $service)
{ {
sleep(5);
global $conf; global $conf;
if (isset($params['pwg_token']) and get_pwg_token() != $params['pwg_token']) if (isset($params['pwg_token']) and get_pwg_token() != $params['pwg_token'])

1
language/en_UK/admin.lang.php
View file

@ -1366,4 +1366,5 @@ $lang['An error has occured'] = 'An error has occured';
$lang['image(s) contains unsaved changes'] = 'image(s) contains unsaved changes'; $lang['image(s) contains unsaved changes'] = 'image(s) contains unsaved changes';
$lang['Pagination has changed and needs to be reloaded !'] = 'Pagination has changed and needs to be reloaded !'; $lang['Pagination has changed and needs to be reloaded !'] = 'Pagination has changed and needs to be reloaded !';
$lang['Metadata sync complete'] = 'Metadata sync complete'; $lang['Metadata sync complete'] = 'Metadata sync complete';
$lang['Save'] = 'Save';
// Leave this line empty // Leave this line empty

1
language/fr_FR/admin.lang.php
View file

@ -1366,4 +1366,5 @@ $lang['An error has occured'] = 'Une erreur est survenue';
$lang['image(s) contains unsaved changes'] = 'image(s) ne sont pas sauvegardées'; $lang['image(s) contains unsaved changes'] = 'image(s) ne sont pas sauvegardées';
$lang['Pagination has changed and needs to be reloaded !'] = "La pagination a changée et nécessite d'être rechargée !"; $lang['Pagination has changed and needs to be reloaded !'] = "La pagination a changée et nécessite d'être rechargée !";
$lang['Metadata sync complete'] = 'Méta-données synchronisées'; $lang['Metadata sync complete'] = 'Méta-données synchronisées';
$lang['Save'] = 'Enregistrer';
// Leave this line empty // Leave this line empty