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

minor clean up on headings, alerts at top of /fix_dups route

Browse Source
This commit is contained in:
Damien De Paoli
2021-02-13 20:30:21 +11:00
parent 49e0a5a797
commit 27e881ea8c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/base.html
View File

@@ -109,14 +109,16 @@
{% endif %}
{% if GetJM_Message() != None %}
{% set msg=GetJM_Message() %}
<div class="row alert alert-{{msg.alert}}">
{% if msg.job_id %}
<a href="{{url_for('joblog', id=msg.job_id)}}">Job #{{msg.job_id}}</a>:
{% if url_for(request.endpoint) != "/fix_dups" %}
<div class="row alert alert-{{msg.alert}}">
{% if msg.job_id %}
<a href="{{url_for('joblog', id=msg.job_id)}}">Job #{{msg.job_id}}</a>:
{% endif %}
{{msg.message|safe}}
</div>
{% if msg.alert != "danger" %}
{% set dont_print=ClearJM_Message(msg.id) %}
{% endif %}
{{msg.message|safe}}
</div>
{% if msg.alert != "danger" %}
{% set dont_print=ClearJM_Message(msg.id) %}
{% endif %}
{% endif %}
{% endif %}

4
templates/dups.html
View File

@@ -1,11 +1,11 @@
{% extends "base.html" %} {% block main_content %}
<div class="container-fluid">
<h3 class="offset-lg-2">{{page_title}}</h3>
<p>Duplicate files have been detected. They have the same binary content,
<div class="alert alert-info">Duplicate files have been detected. They have the same binary content,
but either have a different name or are stored in two different
directories. Choose between the options below. NOTE: after you click
'Delete Duplicates', the files / directories in red will be deleted from the file
system, those in green will remain</p>
system, those in green will remain</div>
<script>
let D=[]