fix: merge main branch and renumber migration 027→037
Resolve 3 merge conflicts and renumber the automation_hooks migration to follow main's migration chain (036_add_document_translation_fields). Conflicts resolved: - app/api/__init__.py: add automation_router alongside main's new routers - app/utils/settings_service.py: add automation_hooks_enabled alongside compliance_enabled - tests/conftest.py: add AutomationHook alongside AuditLog/ComplianceTemplate imports Migration renumbered: - 027_add_automation_hooks → 037_add_automation_hooks - down_revision: 026_add_scheduled_jobs → 036_add_document_translation_fields Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Imprint - DocuElevate{% endblock %}
|
||||
{% block title %}{{ _("imprint.page_title") }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container mx-auto px-4 py-8 max-w-4xl">
|
||||
<h1 class="text-4xl font-bold mb-6">Imprint</h1>
|
||||
<p class="text-sm text-gray-500 mb-8">Information according to § 5 TMG (German Telemedia Act)</p>
|
||||
<h1 class="text-4xl font-bold mb-6">{{ _("imprint.heading") }}</h1>
|
||||
<p class="text-sm text-gray-500 mb-8">{{ _("imprint.subtitle") }}</p>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Service Provider</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.provider_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
<strong>Christian Louis IT Beratung</strong><br>
|
||||
Alter Steinweg 3<br>
|
||||
@@ -17,7 +17,7 @@
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Contact Information</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.contact_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
Fax: +49 40 97074609<br>
|
||||
Email: christianlouis@gmail.com<br>
|
||||
@@ -26,16 +26,16 @@
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Business Registration</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.business_registration_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
VAT Identification Number according to §27a Value Added Tax Act: DE202899017
|
||||
{{ _("imprint.business_registration_vat") }} DE202899017
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Responsible for Content</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.responsible_content_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
According to § 55 Abs. 2 RStV:<br>
|
||||
{{ _("imprint.responsible_content_rstv") }}<br>
|
||||
Christian Krakau-Louis<br>
|
||||
Alter Steinweg 3<br>
|
||||
20459 Hamburg<br>
|
||||
@@ -44,36 +44,36 @@
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Legal Notices</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.legal_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
Despite careful content control, we assume no liability for the content of external links. The operators of the linked pages are solely responsible for their content.
|
||||
{{ _("imprint.legal_liability") }}
|
||||
</p>
|
||||
<p class="text-gray-700 mb-3">
|
||||
All content on this website is protected by copyright. Any use outside the limits of copyright law requires the written consent of the respective author or creator.
|
||||
{{ _("imprint.legal_copyright") }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6 mb-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Online Dispute Resolution</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.dispute_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
The European Commission provides a platform for online dispute resolution (OS):
|
||||
{{ _("imprint.dispute_p1") }}
|
||||
<a href="https://ec.europa.eu/consumers/odr/" target="_blank" rel="noopener noreferrer" class="text-blue-600 hover:underline">https://ec.europa.eu/consumers/odr/</a>
|
||||
</p>
|
||||
<p class="text-gray-700 mb-3">
|
||||
We are not willing or obligated to participate in dispute resolution proceedings before a consumer arbitration board.
|
||||
{{ _("imprint.dispute_p2") }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<h2 class="text-2xl font-semibold mb-4">Related Policies</h2>
|
||||
<h2 class="text-2xl font-semibold mb-4">{{ _("imprint.policies_heading") }}</h2>
|
||||
<p class="text-gray-700 mb-3">
|
||||
Our service is governed by the following policies:
|
||||
{{ _("imprint.policies_intro") }}
|
||||
</p>
|
||||
<ul class="list-disc list-inside text-gray-700 ml-4 mb-3">
|
||||
<li><a href="/terms" class="text-blue-600 hover:underline">Terms of Service</a> - Rules for using DocuElevate</li>
|
||||
<li><a href="/privacy" class="text-blue-600 hover:underline">Privacy Policy</a> - How we handle your data</li>
|
||||
<li><a href="/cookies" class="text-blue-600 hover:underline">Cookie Policy</a> - Information about cookies we use</li>
|
||||
<li><a href="/license" class="text-blue-600 hover:underline">License Information</a> - How our software is licensed</li>
|
||||
<li><a href="/terms" class="text-blue-600 hover:underline">{{ _("imprint.policies_terms_label") }}</a> - {{ _("imprint.policies_terms_desc") }}</li>
|
||||
<li><a href="/privacy" class="text-blue-600 hover:underline">{{ _("imprint.policies_privacy_label") }}</a> - {{ _("imprint.policies_privacy_desc") }}</li>
|
||||
<li><a href="/cookies" class="text-blue-600 hover:underline">{{ _("imprint.policies_cookie_label") }}</a> - {{ _("imprint.policies_cookie_desc") }}</li>
|
||||
<li><a href="/license" class="text-blue-600 hover:underline">{{ _("imprint.policies_license_label") }}</a> - {{ _("imprint.policies_license_desc") }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user