Move templates out of tmp directory

Feliix42 · Feliix42 · commit 21f5238fb015 · 2020-09-12T18:59:56.000+02:00
diff --git a/course/templates/base-shell.html b/course/templates/base-shell.html
diff --git a/course/templates/base.html b/course/templates/base.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base-shell.html' %}
+{% extends 'base-shell.html' %}
 {% load i18n %}
 
 {% block header_nav %}
diff --git a/course/templates/course/attendee-list.html b/course/templates/course/attendee-list.html
diff --git a/course/templates/course/attendees.html b/course/templates/course/attendees.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/course/contact-teachers.html b/course/templates/course/contact-teachers.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/course/edit.html b/course/templates/course/edit.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/course/info.html b/course/templates/course/info.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/course/notify-done.html b/course/templates/course/notify-done.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/course/notify.html b/course/templates/course/notify.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/course/teachers.html b/course/templates/course/teachers.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/course/timetable.html b/course/templates/course/timetable.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/error/404.html b/course/templates/error/404.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/error/500.html b/course/templates/error/500.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/error/db.html b/course/templates/error/db.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/index.html b/course/templates/index.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/news/edit.html b/course/templates/news/edit.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/privacy-policy.html b/course/templates/privacy-policy.html
diff --git a/course/templates/privacy.html b/course/templates/privacy.html
@@ -1,8 +1,8 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
   <h1>{% trans "Privacy Policy" %}</h1>
 
-  {% include "new_ui_foo/privacy-policy.html" %}
+  {% include "privacy-policy.html" %}
 {% endblock %}
diff --git a/course/templates/subject/edit.html b/course/templates/subject/edit.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/templates/subject/info.html b/course/templates/subject/info.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/course/templates/subject/overview.html b/course/templates/subject/overview.html
@@ -1,4 +1,4 @@
-{% extends "new_ui_foo/base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
 {% block content %}
diff --git a/course/views/course.py b/course/views/course.py
@@ -66,7 +66,7 @@ def course(request: HttpRequest, course_id: str):
 
         return render(
             request,
-            'new_ui_foo/course/info.html',
+            'course/info.html',
             context
         )
     except Course.DoesNotExist:
@@ -80,7 +80,7 @@ def participants_list(request, course_id):
 
         return render(
             request,
-            'new_ui_foo/course/attendees.html',
+            'course/attendees.html',
             {'course': current_course}
         )
     except Course.DoesNotExist:
@@ -117,7 +117,7 @@ def edit_course(request: HttpRequest, course_id: str):
         form = CourseForm(instance=current_course,initial={'schedule_type':current_schedule.get_type()})
     return render(
         request,
-        'new_ui_foo/course/edit.html',
+        'course/edit.html',
         {
             'title': _('Edit course'),
             'form': form,
@@ -191,7 +191,7 @@ def create(request):
 
     return render(
         request,
-        'new_ui_foo/course/edit.html',
+        'course/edit.html',
         {
             'title': _('New Course'),
             'form': form,
@@ -257,7 +257,7 @@ def add_teacher(request, course_id):
 
     return render(
         request,
-        'new_ui_foo/course/teachers.html',
+        'course/teachers.html',
         context
     )
 
@@ -319,7 +319,7 @@ def notify(request: HttpRequest, course_id):
 
     return render(
         request,
-        'new_ui_foo/course/notify.html',
+        'course/notify.html',
         {
             'title': _('Notify Course'),
             'form': form,
@@ -331,7 +331,7 @@ def notify(request: HttpRequest, course_id):
 def notify_done(request, course_id):
     return render(
         request,
-        'new_ui_foo/course/notify-done.html',
+        'course/notify-done.html',
         {
             'course_id': course_id
         }
@@ -367,7 +367,7 @@ def attendee_list(request, course_id):
 
         return render(
                 request,
-                'new_ui_foo/course/attendee-list.html',
+                'course/attendee-list.html',
                 {
                     'attendees': course.participants.all(),
                     'slots': range(slots)
@@ -397,7 +397,7 @@ def contact_teachers(request, course_id):
 
     return render(
         request,
-        'new_ui_foo/course/contact-teachers.html',
+        'course/contact-teachers.html',
         {
             'title': _('Notify Course'),
             'form': form,
diff --git a/course/views/index.py b/course/views/index.py
@@ -6,7 +6,7 @@
 def index(request):
     return render(
         request,
-        'new_ui_foo/index.html',
+        'index.html',
         {
             'title': _('Welcome'),
             'news': news.News.objects.order_by('-id')
@@ -17,21 +17,21 @@ def index(request):
 def privacy_policy(request):
     return render(
         request,
-        'new_ui_foo/privacy.html',
+        'privacy.html',
         {
             'title': _('Privacy Policy')
         }
     )
 
 
-def handler404(request, exception, template_name="new_ui_foo/error/404.html"):
+def handler404(request, exception, template_name="error/404.html"):
     response = render_to_response(template_name)
     response.status_code = 404
     return response
 
 
-def handler500(request): #t, exception, template_name="new_ui_foo/error/500.html"):
-    template_name = "new_ui_foo/error/500.html"
+def handler500(request): #t, exception, template_name="error/500.html"):
+    template_name = "error/500.html"
     response = render_to_response(template_name)
     response.status_code = 500
     return response
diff --git a/course/views/news.py b/course/views/news.py
@@ -32,7 +32,7 @@ def create(request):
 
     return render(
         request,
-        'new_ui_foo/news/edit.html',
+        'news/edit.html',
         {
             'title': _('New News'),
             'create': True,
@@ -67,7 +67,7 @@ def edit(request: HttpRequest, news_id: str):
         form = NewsForm(instance=cur_news)
     return render(
         request,
-        'new_ui_foo/news/edit.html',
+        'news/edit.html',
         {
             'title': _('Edit News'),
             'create': False,
diff --git a/course/views/subject.py b/course/views/subject.py
@@ -32,7 +32,7 @@ def course_overview(request, subjectname):
 
     return render(
         request,
-        'new_ui_foo/subject/info.html',
+        'subject/info.html',
         {
             'title': subjectname,
             'subject': active_subject,
@@ -45,7 +45,7 @@ def course_overview(request, subjectname):
 def subject_overview(request):
     return render(
         request,
-        'new_ui_foo/subject/overview.html',
+        'subject/overview.html',
         {
             'title': _('Subject Overview'),
             'visible_subjects': subject.Subject.get_visible(),
@@ -74,7 +74,7 @@ def create(request):
 
     return render(
         request,
-        'new_ui_foo/subject/edit.html',
+        'subject/edit.html',
         {
             'title': _('New Subject'),
             'create': True,
@@ -104,7 +104,7 @@ def edit(request, subjectname):
 
     return render(
         request,
-        'new_ui_foo/subject/edit.html',
+        'subject/edit.html',
         {
             'title': subj.name,
             'create': False,
diff --git a/course/views/time.py b/course/views/time.py
@@ -45,7 +45,7 @@ def edit_slot(request: HttpRequest, course_id):
 
     return render(
         request,
-        'new_ui_foo/course/timetable.html',
+        'course/timetable.html',
         {
             'title': _('Edit Schedule'),
             'form': form,
diff --git a/user/templates/contact-form.html b/user/templates/contact-form.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/registration/login.html b/user/templates/registration/login.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/user/templates/registration/logout.html b/user/templates/registration/logout.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/user/templates/registration/password-reset-done.html b/user/templates/registration/password-reset-done.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/user/templates/registration/password-reset.html b/user/templates/registration/password-reset.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/user/templates/registration/register.html b/user/templates/registration/register.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/registration/success.html b/user/templates/registration/success.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/user/activate.html b/user/templates/user/activate.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/user/change_pass.html b/user/templates/user/change_pass.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/user/change_pass_success.html b/user/templates/user/change_pass_success.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
 
diff --git a/user/templates/user/deletion-success.html b/user/templates/user/deletion-success.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/user/edit.html b/user/templates/user/edit.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/user/privacy-agreement.html b/user/templates/user/privacy-agreement.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
@@ -16,7 +16,7 @@ <h3 class="card-header">{% trans 'New privacy policy' %}</h3>
 
 <hr class="mb-3">
 
-{% include 'new_ui_foo/privacy-policy.html' %}
+{% include 'privacy-policy.html' %}
 
 <hr class="mt-3 mb-3">
 
diff --git a/user/templates/user/profile.html b/user/templates/user/profile.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/user/public_profile.html b/user/templates/user/public_profile.html
@@ -1,4 +1,4 @@
-{% extends 'new_ui_foo/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 
 {% block content %}
diff --git a/user/templates/view-error.html b/user/templates/view-error.html
@@ -1,4 +1,4 @@
-{% extends "new_ui_foo/base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 {% block content %}
 
diff --git a/user/urls.py b/user/urls.py
diff --git a/user/views/contact.py b/user/views/contact.py
diff --git a/user/views/register.py b/user/views/register.py
diff --git a/user/views/user.py b/user/views/user.py
diff --git a/user/views/verify.py b/user/views/verify.py
diff --git a/util/error/reporting.py b/util/error/reporting.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends 'new_ui_foo/base-shell.html' %}`
	`1`	`+{% extends 'base-shell.html' %}`
`2`	`2`	`{% load i18n %}`
`3`	`3`
`4`	`4`	`{% block header_nav %}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends 'new_ui_foo/base.html' %}`
	`1`	`+{% extends 'base.html' %}`
`2`	`2`	`{% load i18n %}`
`3`	`3`	`{% block content %}`
`4`	`4`