fixed templates

cvat-ai · Nov 11, 2020 · e309f2f · e309f2f
1 parent a916e65
commit e309f2f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 14 deletions.
diff --git 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
@@ -1,12 +1,14 @@
-{% 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
     to connect their account.
 </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
@@ -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
@@ -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
@@ -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
@@ -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 %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ datumaro/ @@
     keys/
     logs/
     static/
+    templates/