From 85174347336f299ca72b3742c1baf4e36952db0c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 14:09:32 -0400
Subject: [PATCH] Add notes to admin UI encouraging Jinja2 over legacy Django
 templating

---
 netbox/extras/admin.py   | 10 +++++++++-
 netbox/extras/choices.py |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py
index 629edf5ce..a198d03d5 100644
--- a/netbox/extras/admin.py
+++ b/netbox/extras/admin.py
@@ -3,7 +3,6 @@ from django.contrib import admin
 
 from utilities.forms import LaxURLField
 from .models import CustomField, CustomFieldChoice, CustomLink, Graph, ExportTemplate, JobResult, Webhook
-from .reports import get_report
 
 
 def order_content_types(field):
@@ -160,6 +159,10 @@ class GraphForm(forms.ModelForm):
     class Meta:
         model = Graph
         exclude = ()
+        help_texts = {
+            'template_language': "<a href=\"https://jinja.palletsprojects.com\">Jinja2</a> is strongly recommended for "
+                                 "new graphs."
+        }
         widgets = {
             'source': forms.Textarea,
             'link': forms.Textarea,
@@ -195,6 +198,11 @@ class ExportTemplateForm(forms.ModelForm):
     class Meta:
         model = ExportTemplate
         exclude = []
+        help_texts = {
+            'template_language': "<strong>Warning:</strong> Support for Django templating will be dropped in NetBox "
+                                 "v2.10. <a href=\"https://jinja.palletsprojects.com\">Jinja2</a> is strongly "
+                                 "recommended."
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index f911f4f9d..b14748135 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -85,12 +85,12 @@ class ObjectChangeActionChoices(ChoiceSet):
 
 class TemplateLanguageChoices(ChoiceSet):
 
-    LANGUAGE_DJANGO = 'django'
     LANGUAGE_JINJA2 = 'jinja2'
+    LANGUAGE_DJANGO = 'django'
 
     CHOICES = (
-        (LANGUAGE_DJANGO, 'Django'),
         (LANGUAGE_JINJA2, 'Jinja2'),
+        (LANGUAGE_DJANGO, 'Django (Legacy)'),
     )