Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
marySalvi committed Oct 10, 2023
1 parent b3717d0 commit b76fa34
Showing 1 changed file with 39 additions and 44 deletions.
83 changes: 39 additions & 44 deletions imagedephi/templates/HomePage.html.j2
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<!DOCTYPE html>
<html lang="en" data-theme="light">

<head>
<title>ImageDePHI</title>
<meta name="description" content="ImageDePHI GUI" />
<meta name="keywords" content="" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/full.css" rel="stylesheet" type="text/css" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet">
<script src="https://cdn.tailwindcss.com"></script>
<script>
<head>
<title>ImageDePHI</title>
<meta name="description" content="ImageDePHI GUI" />
<meta name="keywords" content="" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/full.css"
rel="stylesheet"
type="text/css" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/fonts/remixicon.css"
rel="stylesheet" />
<script src="https://cdn.tailwindcss.com"></script>
<script>
tailwind.config = {
theme: {
extend: {
Expand Down Expand Up @@ -91,45 +93,38 @@
</a>
</div>
</div>
<div class="flex items-center space-y-0.5">
<a class="btn btn-ghost btn-square btn-sm">
<i class="ri-side-bar-line text-lg text-neutral"></i>
</a>
</div>
{% include "InputStep.html.j2" %}
{% include "OutputStep.html.j2" %}
{% include "RulesetStep.html.j2" %}
<button type="submit" class="btn btn-wide bg-accent m-auto" {{ 'disabled' if redacted}}>De-phi
images
</button>
</div>
{% include "InputStep.html.j2" %}
{% include "OutputStep.html.j2" %}
{% include "RulesetStep.html.j2" %}
<button type="submit" class="btn btn-wide bg-accent m-auto" {{ 'disabled' if redacted}}>De-phi
images
</button>
</div>
</div>
</div>
<input type="checkbox" id="input-modal" class="modal-toggle" />
{% include "InputSelectorWidget.html.j2" %}
<input type="checkbox" id="output-modal" class="modal-toggle" />
{% include "OutputSelectorWidget.html.j2" %}
</form>
{# TODO make into a separate component #}
{% if redacted %}
<div class="px-8 py-4">
<div class="hero bg-base-200">
<div class="hero-content text-center">
<div>
<h1 class="text-5xl font-bold">Redaction Successful</h1>
<p class="ma-6">
We successfully performed a redaction on the images in {{
input_directory_data.directory
}}.
The redacted images are now in a new folder created in {{ output_directory_data.directory }}
</p>
<input type="checkbox" id="input-modal" class="modal-toggle" />
{% include "InputSelectorWidget.html.j2" %}
<input type="checkbox" id="output-modal" class="modal-toggle" />
{% include "OutputSelectorWidget.html.j2" %}
</form>
{# TODO make into a separate component #}
{% if redacted %}
<div class="px-8 py-4">
<div class="hero bg-base-200">
<div class="hero-content text-center">
<div>
<h1 class="text-5xl font-bold">Redaction Successful</h1>
<p class="ma-6">
We successfully performed a redaction on the images in {{
input_directory_data.directory
}}.
The redacted images are now in a new folder created in {{ output_directory_data.directory }}
</p>
</div>
</div>
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}
</div>
</body>

</body>
</html>

0 comments on commit b76fa34

Please sign in to comment.