Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Django templates for email and user guide #2412

Merged
merged 4 commits into from
Nov 11, 2020
Merged

Fixed Django templates for email and user guide #2412

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e309f2f
fixed templates
Nov 11, 2020
6833ab0
Merge remote-tracking branch 'origin/develop' into az/fix_templates
Nov 11, 2020
ddef6c1
updated license headers and changelog
Nov 11, 2020
ca55dc0
updated eslintignore
Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ datumaro/
keys/
logs/
static/
templates/
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 5 additions & 3 deletions cvat/apps/authentication/templates/account/email/email_confirmation_signup_message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
21 changes: 16 additions & 5 deletions cvat/apps/authentication/templates/authentication/password_reset_email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
5 changes: 2 additions & 3 deletions cvat/apps/documentation/templates/documentation/base_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (C) 2018 Intel Corporation
Copyright (C) 2018-2020 Intel Corporation

SPDX-License-Identifier: MIT
-->
Expand All @@ -15,8 +15,7 @@
</head>

<body>
<xmp id="content" style="display: none"
>
<xmp id="content" style="display: none">
{% autoescape off %}
{% block content %}
{% endblock %}
Expand Down
13 changes: 10 additions & 3 deletions cvat/apps/documentation/templates/documentation/user_guide.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<!--
Copyright (C) 2018 Intel Corporation
Copyright (C) 2018-2020 Intel Corporation

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 %}
7 changes: 4 additions & 3 deletions cvat/apps/documentation/templates/documentation/xml_format.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!--
Copyright (C) 2018 Intel Corporation
Copyright (C) 2018-2020 Intel Corporation

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 %}