ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make delete/restore button in viewer be the right colour, and go back to / when the success for the delete or restore finishes

Browse Source
This commit is contained in:
Damien De Paoli
2025-10-10 23:13:03 +11:00
parent fa2197adbe
commit b51d9e1776
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
TODO
View File

@@ -1,17 +1,6 @@
###
# 4 TEST everything (don't forget keybindings,e.g. delete)
# -- go into viewer code from a files_rbp - had red bin, bot green on viewer.
#
# consider this:
$('#viewer_bin use').attr('fill', 'var(--bs-success)'); $('#viewer_del').removeClass('btn-outline-danger').addClass('btn-outline-success')
$('#viewer_bin').hover(
function() {
$('use', this).attr('fill', 'white');
},
function() {
$('use', this).attr('fill', 'var(--bs-success)');
}
);
# - from viewer, if I del, then it stays on this view, should not (OR at least)
#
# 5 think I killed pa_job_manager without passing an eid to a transform job, shouldn't crash
# SHOULD JUST get AI to help clean-up and write defensive code here...

4
internal/js/files_support.js
View File

@@ -177,7 +177,7 @@ function DelDBox(del_or_undel)
div+=`
'/delete_files',
success: function(data){
if( $(location).attr('pathname').match('search') !== null ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-danger col-2">Ok</button>
if( $(location).attr('pathname').match('search') !== null || document.viewing ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-danger col-2">Ok</button>
</div>
`
else
@@ -186,7 +186,7 @@ function DelDBox(del_or_undel)
div+=`
'/restore_files',
success: function(data){
if( $(location).attr('pathname').match('search') !== null ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-success col-2">Ok</button>
if( $(location).attr('pathname').match('search') !== null || document.viewing ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-success col-2">Ok</button>
</div>
`
$('#dbox-content').html(div)

28
templates/files.html
View File

@@ -209,14 +209,16 @@
<button class="btn btn-outline-info p-1" title="View Original" onClick="window.location='/'+document.viewing.FullPathOnFS">
<svg width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#download"/></svg>
</button>
<button id="viewer_del" class="btn btn-outline-danger p-1" title="Delete (hotkey: Del)"
onClick="$.ajax({ type: 'POST', data: '&eid-0='+document.viewing.id, url: '/delete_files', success: function(data){ window.location='/'; return false; } })">
<button id="viewer_del" class="btn btn-outline-danger p-1" title="Delete (hotkey: Del)" onClick="DelDBox('Delete')">
<svg id="viewer_bin" width="32" height="32" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#trash"/></svg>
</button>
</div>
</div class="row">
</div id="viewer">
</div id="viewer_div">
{#
$.ajax({ type: 'POST', data: '&eid-0='+document.viewing.id, url: '/delete_files', success: function(data){ window.location='/'; return false; } })">
#}
{% endblock main_content %}
{% block script_content %}
@@ -258,7 +260,7 @@
if( fname.indexOf( "static/Import" ) == 0 )
{
s+='<svg width="20" height="20" fill="currentColor"><use xlink:href="{{url_for('internal', filename='icons.svg')}}#import"/></svg>'
tmp_path=fname.replace(imp_path,"" )
tmp_path=fname.replace("statuc/Import","" )
}
if( fname.indexOf( "static/Storage" ) == 0 )
{
@@ -280,5 +282,25 @@
window.addEventListener('resize', DrawImg, false);
window.addEventListener('resize', ResizeVideo, false);
// when we are in recycle bin, change colours to green & func to restore
if( window.location.href.includes('files_rbp') )
{
$('#viewer_bin').attr('fill', 'var(--bs-success)')
// fill with bg-success colour
$('#viewer_bin use').attr('fill', 'var(--bs-success)')
$('#viewer_del').removeClass('btn-outline-danger').addClass('btn-outline-success')
$('#viewer_del').on('mouseenter', function() {
// Set the SVG fill to white
$('#viewer_bin use').attr('fill', 'white');
});
// When mouse leaves the button
$('#viewer_del').on('mouseleave', function() {
// Revert the SVG fill to the bg-success colour
$('#viewer_bin use').attr('fill', 'var(--bs-success)');
});
$('#viewer_del').on('click', function() { DelDBox('Restore') } )
}
</script>
{% endblock script_content %}