From e309f2f8bf30aaf02d46bea6793de2eba4dff5f1 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Wed, 11 Nov 2020 12:12:03 +0300
Subject: [PATCH 1/3] fixed templates

---
 .prettierignore                               |  1 +
 .../email_confirmation_signup_message.html    |  8 ++++---
 .../authentication/password_reset_email.html  | 21 ++++++++++++++-----
 .../templates/documentation/base_page.html    |  3 +--
 .../templates/documentation/user_guide.html   | 11 ++++++++--
 .../templates/documentation/xml_format.html   |  5 +++--
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 60bff4f52d9a..54f42aa52ac2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,3 +7,4 @@ datumaro/
 keys/
 logs/
 static/
+templates/
diff --git a/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html b/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html
index c121b810c453..ec80776a07f7 100644
--- a/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html
+++ b/cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html
@@ -1,5 +1,6 @@
-{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with
-site_name=current_site.name site_domain=current_site.domain %}Hello from {{ site_name }}!
+{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}
+{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}
+Hello from {{ site_name }}!
 
 <p>
     You're receiving this e-mail because user <strong>{{ user_display }}</strong> has given yours as an e-mail address
@@ -7,6 +8,7 @@
 </p>
 
 <p>To confirm this is correct, go to <a href="{{ activate_url }}">{{ activate_url }}</a></p>
-{% endblocktrans %} {% blocktrans with site_name=current_site.name site_domain=current_site.domain %}
+{% endblocktrans %}
+{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}
 <strong>{{ site_domain }}</strong>
 {% endblocktrans %} {% endautoescape %}
diff --git a/cvat/apps/authentication/templates/authentication/password_reset_email.html b/cvat/apps/authentication/templates/authentication/password_reset_email.html
index e2c68db10772..fa3eef8bd49d 100644
--- a/cvat/apps/authentication/templates/authentication/password_reset_email.html
+++ b/cvat/apps/authentication/templates/authentication/password_reset_email.html
@@ -1,5 +1,16 @@
-{% load i18n %}{% autoescape off %} {% blocktrans %}You're receiving this email because you requested a password reset
-for your user account at {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page and choose a new
-password:" %} {% block reset_link %} {{ protocol }}://{{ domain }}/auth/password/reset/confirm?uid={{ uid }}&token={{
-token }} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} {% trans "Thanks
-for using our site!" %} {% blocktrans %}The {{ site_name }} team{% endblocktrans %} {% endautoescape %}
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}
+You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
+{% endblocktrans %}
+
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}/auth/password/reset/confirm?uid={{ uid }}&token={{ token }}
+{% endblock %}
+{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
+
+{% trans "Thanks for using our site!" %}
+
+{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
+
+{% endautoescape %}
diff --git a/cvat/apps/documentation/templates/documentation/base_page.html b/cvat/apps/documentation/templates/documentation/base_page.html
index be1271114901..903985553160 100644
--- a/cvat/apps/documentation/templates/documentation/base_page.html
+++ b/cvat/apps/documentation/templates/documentation/base_page.html
@@ -15,8 +15,7 @@
 </head>
 
 <body>
-    <xmp id="content" style="display: none"
->
+    <xmp id="content" style="display: none">
         {% autoescape off %}
         {% block content %}
         {% endblock %}
diff --git a/cvat/apps/documentation/templates/documentation/user_guide.html b/cvat/apps/documentation/templates/documentation/user_guide.html
index 7468b38da29b..2fea38e9a456 100644
--- a/cvat/apps/documentation/templates/documentation/user_guide.html
+++ b/cvat/apps/documentation/templates/documentation/user_guide.html
@@ -3,5 +3,12 @@
 
     SPDX-License-Identifier: MIT
 -->
-{% extends 'documentation/base_page.html' %} {% block title %} CVAT User Guide {% endblock %} {% block content %} {{
-user_guide }} {% endblock %}
+{% extends 'documentation/base_page.html' %}
+
+{% block title %}
+CVAT User Guide
+{% endblock %}
+
+{% block content %}
+{{ user_guide }}
+{% endblock %}
diff --git a/cvat/apps/documentation/templates/documentation/xml_format.html b/cvat/apps/documentation/templates/documentation/xml_format.html
index de89b1f2531d..44daf5254032 100644
--- a/cvat/apps/documentation/templates/documentation/xml_format.html
+++ b/cvat/apps/documentation/templates/documentation/xml_format.html
@@ -3,5 +3,6 @@
 
     SPDX-License-Identifier: MIT
 -->
-{% extends 'documentation/base_page.html' %} {% block title %} CVAT XML format {% endblock %} {% block content %} {{
-xml_format }} {% endblock %}
+{% extends 'documentation/base_page.html' %}
+{% block title %} CVAT XML format {% endblock %}
+{% block content %} {{ xml_format }} {% endblock %}

From ddef6c1b431a080be0b537cefc661452c5c7cd96 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Wed, 11 Nov 2020 14:45:00 +0300
Subject: [PATCH 2/3] updated license headers and changelog

---
 CHANGELOG.md                                                    | 2 +-
 cvat/apps/documentation/templates/documentation/base_page.html  | 2 +-
 cvat/apps/documentation/templates/documentation/user_guide.html | 2 +-
 cvat/apps/documentation/templates/documentation/xml_format.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f8c3eda397b..eb9c68ec398c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
--
+- Django templates for email and user guide (<https://github.com/openvinotoolkit/cvat/pull/2412>)
 
 ### Security
 
diff --git a/cvat/apps/documentation/templates/documentation/base_page.html b/cvat/apps/documentation/templates/documentation/base_page.html
index 903985553160..f49fe5f1002f 100644
--- a/cvat/apps/documentation/templates/documentation/base_page.html
+++ b/cvat/apps/documentation/templates/documentation/base_page.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 Intel Corporation
+    Copyright (C) 2018-2020 Intel Corporation
 
     SPDX-License-Identifier: MIT
 -->
diff --git a/cvat/apps/documentation/templates/documentation/user_guide.html b/cvat/apps/documentation/templates/documentation/user_guide.html
index 2fea38e9a456..fa1b6221d57a 100644
--- a/cvat/apps/documentation/templates/documentation/user_guide.html
+++ b/cvat/apps/documentation/templates/documentation/user_guide.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 Intel Corporation
+    Copyright (C) 2018-2020 Intel Corporation
 
     SPDX-License-Identifier: MIT
 -->
diff --git a/cvat/apps/documentation/templates/documentation/xml_format.html b/cvat/apps/documentation/templates/documentation/xml_format.html
index 44daf5254032..ff871aba9565 100644
--- a/cvat/apps/documentation/templates/documentation/xml_format.html
+++ b/cvat/apps/documentation/templates/documentation/xml_format.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 Intel Corporation
+    Copyright (C) 2018-2020 Intel Corporation
 
     SPDX-License-Identifier: MIT
 -->

From ca55dc02574198740a705d75fe39116738cd01c1 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Wed, 11 Nov 2020 15:46:54 +0300
Subject: [PATCH 3/3] updated eslintignore

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index 60bff4f52d9a..54f42aa52ac2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,3 +7,4 @@ datumaro/
 keys/
 logs/
 static/
+templates/