Merge branch 'master' into datasource_fieldtypes

Template/Loader.py

@@ -1,11 +1,16 @@
 #-*- coding: utf-8 -*-
 
 import jinja2
+
 import settings
+from .api import api_lodel_templates
+from .exceptions import NotAllowedCustomAPIKeyError
 
 
 class TemplateLoader(object):
 
+    __reserved_template_keys = ['lodel']
+
     ## @brief Initializes a template loader
     #
     # @param search_path str : the base path from which the templates are searched. To use absolute paths, you can set
@@ -26,10 +31,26 @@ class TemplateLoader(object):
     #
     # @return str. String containing the HTML output of the processed templated
     def render_to_html(self, template_file, template_vars={}, template_extra=None):
+
         loader = jinja2.FileSystemLoader(searchpath=self.search_path, followlinks=self.follow_links)
         environment = jinja2.Environment(loader=loader)
         template = environment.get_template(template_file)
+
+        # Lodel2 default api is loaded
+        template.globals['lodel'] = api_lodel_templates
+
+        # Extra modules are loaded
         if template_extra is not None:
             for extra in template_extra:
+                if not self.__is_allowed_template_key(extra[0]):
+                    raise NotAllowedCustomAPIKeyError("The name 'lodel' is a reserved one for the loaded APIs in templates")
                 template.globals[extra[0]] = extra[1]
+
         return template.render(template_vars)
+
+    ## @brief Checks if the key used for the template is allowed
+    #
+    # @param key str
+    # @return bool
+    def __is_allowed_template_key(self, key):
+        return False if key in self.__class__.__reserved_template_keys else True

Template/__init__.py

@@ -1 +0,0 @@
-__author__ = 'roland'

Template/api/api_lodel_templates.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+# Lodel 2 templates API : loaded by default

Template/exceptions/NotAllowedCustomAPIKeyError.py

@@ -0,0 +1,7 @@
+#-*- coding: utf-8 -*-
+
+
+class NotAllowedCustomAPIKeyError(Exception):
+
+    def __init__(self, message):
+        self.message = message

Template/exceptions/__init__.py

@@ -0,0 +1 @@
+from .NotAllowedCustomAPIKeyError import NotAllowedCustomAPIKeyError

install/Makefile

@@ -7,7 +7,7 @@ dbinit:
 	python -c "import utils; utils.db_init()"
 
 dirinit:
-	@mkdir templates
+	python -c "import utils; utils.dir_init()"
 
 emgraph:
 	python -c "import utils; utils.em_graph()"

install/utils.py

@@ -3,6 +3,7 @@
 from loader import *
 import warnings
 
+
 def refreshdyn():
     import sys
     from EditorialModel.model import Model
@@ -18,6 +19,7 @@ def refreshdyn():
     # Create the python file
     fact.create_pyfile(em, LeDataSourceSQL, {})
 
+
 def db_init():
     from EditorialModel.backend.json_backend import EmBackendJson
     from EditorialModel.model import Model
@@ -25,6 +27,7 @@ def db_init():
     em = Model(EmBackendJson(Settings.em_file))
     em.migrate_handler(mh)
 
+
 def em_graph(output_file = None, image_format = None):
     from EditorialModel.model import Model
     from EditorialModel.backend.json_backend import EmBackendJson
@@ -63,3 +66,26 @@ def em_graph(output_file = None, image_format = None):
     os.unlink(dot_file)
     print("Output image written in file : '%s'" % output_file)
 
+
+def dir_init():
+    import os
+
+    # Templates
+    print("Creating Base Templates ...")
+    templates = {
+        'base': {'file': 'base.html', 'content': '{% extends "templates/base.html" %}'},
+        'base_backend': {'file': 'base_backend.html', 'content': '{% extends "templates/base_backend.html" %}'}
+    }
+
+    current_directory = os.path.dirname(os.path.abspath(__file__))
+    templates_directory = os.path.join(current_directory,'templates')
+    if not os.path.exists(templates_directory):
+        os.makedirs(templates_directory)
+
+    for _, template in templates.items():
+        my_file_path = os.path.join(templates_directory, template['file'])
+        if os.path.exists(my_file_path):
+            os.unlink(my_file_path)
+        with open(my_file_path, 'w') as my_file:
+            my_file.write(template['content'])
+        print("Created %s" % my_file_path)

templates/base.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    {% block title %}<title></title>{% endblock %}
+    {% block head %}{% endblock %}
+</head>
+<body>
+    <div id="content">
+        {% block content %}{% endblock %}
+    </div>
+    {% block javascript %}{% endblock %}
+</body>
+</html>

templates/base_backend.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    {% block title %}<title></title>{% endblock %}
+    {% block head %}{% endblock %}
+</head>
+<body>
+    <div id="content">
+        {% block content %}{% endblock %}
+    </div>
+    {% block javascript %}{% endblock %}
+</body>
+</html>