Refactor: templates location

TSD ...

adim_project/.gitignore

@@ -7,19 +7,14 @@
 
 **/*.old.jpg
 
-screen_session_cmd
-
 /media
 /static
 
 
 adim_project/apache.conf
 adim_project/wsgi.py
-adim_project/settings/local_settings.py
 
 adim_project/apache.conf.tpl
 adim_app/playground.py
-adim_app/templates/playground
+/templates/playground
 adim_app/static/js/playground.js
-
-adim_project/settings/shib_settings.py

adim_project/adim_app/views.py

@@ -34,7 +34,7 @@ def home(request):
     context = {}
     if request.user.is_anonymous():
         context['next'] = request.GET.get('next', "")
-    return render(request, "adim_app/home.html", context)
+    return render(request, "adim/home.html", context)
 
 
 def handle_404(request):
@@ -51,7 +51,7 @@ def essai(request):
     :param request:
     :return:
     """
-    return render(request, "adim_app/essai.html", {})
+    return render(request, "adim/essai.html", {})
     # return render(request, "adim_app/essai.html", {})
 
 
@@ -125,7 +125,7 @@ def send_anobj_thumb(request, anobj_uuid):
 
 @login_required
 def annotate_new(request):
-    return render(request, "adim_app/annotation_new.html", {})
+    return render(request, "adim/annotation_new.html", {})
 
 
 @login_required
@@ -212,7 +212,7 @@ def annotate(request, anobj_uuid=None):
         )
     })
 
-    return render(request, "adim_app/annotation.html", context)
+    return render(request, "adim/annotation.html", context)
 
 
 @login_required

adim_project/adim_project/settings/base.py

@@ -59,7 +59,7 @@ CACHES = {
 # ..... TEMPLATES CONFIG
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
-    'DIRS': [],
+    'DIRS': (normpath(join(SITE_ROOT, 'templates')), ),
     'OPTIONS': {
         'debug': False,
         'loaders': (
@@ -75,7 +75,7 @@ TEMPLATES = [{
             'django.core.context_processors.request',
             'django.core.context_processors.tz',
             'django.contrib.messages.context_processors.messages',
-            'adim_project.context_processors.default',
+            'adim_utils.context_processors.default',
         ],
         'string_if_invalid': "",
     }

adim_project/adim_app/templates/adim_app/annotation.html → adim_project/templates/adim/annotation.html

-{% extends "adim_app/base_annotation.html" %}
+{% extends "adim/base_annotation.html" %}
 {% load static i18n %}
 
 {%  block navbar_content %}

adim_project/adim_app/templates/adim_app/annotation_new.html → adim_project/templates/adim/annotation_new.html

-{% extends "adim_app/base_annotation.html" %}
+{% extends "adim/base_annotation.html" %}
 {% load static i18n %}
 
 {% block page_head %}{% endblock %}

adim_project/adim_app/templates/adim_app/base_annotation.html → adim_project/templates/adim/base_annotation.html

@@ -86,7 +86,7 @@
     </div>
 
 {#  -- AnObj Manager Dlog -- #}
-    {% include "adim_app/aom-modal.inc.html" %}
+    {% include "adim/aom-modal.inc.html" %}
 
 {#  -- SVG export Info -- #}
     <div class="modal" id="dlg-export-svg-info" data-backdrop="static" data-keyboard="false">

adim_project/adim_app/templates/adim_app/home.html → adim_project/templates/adim/home.html

@@ -23,7 +23,7 @@
             <div class="col-sm-3" id="home-action-box">
                 <div class="well well-sm">
                 {% if user.is_anonymous %}
-                    {% include "adim_app/login.inc.html" %}
+                    {% include "adim/login.inc.html" %}
                 {% else %}
                     <a href="{% url "adim.app:annotate-new" %}"
                        class="btn btn-lg btn-success btn-block">