Merge pull request #27 from NaturalSolutions/instance-multi-territoires-by-default

Instance multi territoires by default

Author: Jeje2201

backend/app.py

@@ -69,9 +69,8 @@ def inject_to_tpl():
         debug=app.debug, 
         locale=get_locale(), 
         isMultiObservatories=utils.isMultiObservatories,
-        isDbPagePublished=utils.isDbPagePublished,
         getThumborUrl=utils.getThumborUrl,
-        pathExists=os.path.exists,
+        getCustomTpl=utils.getCustomTpl,
     )
     data.update(custom)
     return data

backend/routes.py

@@ -301,7 +301,20 @@ def sample():
 
 @main.route('/about')
 def about():
-    if (not utils.isDbPagePublished('about')):
+
+    tpl = utils.getCustomTpl('about')
+
+    if not tpl:
+        return abort(404)
+
+    return render_template(tpl)
+
+@main.route('/legal-notices')
+def legal_notices():
+
+    tpl = utils.getCustomTpl('legal_notices')
+
+    if not tpl:
         return abort(404)
 
-    return render_template('db-page.jinja', name='about', page=utils.getDbPage('about'))
+    return render_template(tpl)

backend/static/css/home.css

@@ -3,7 +3,7 @@
   background-size: cover;
 }
 
-.page-home .app-home-carousel > h1 {
+.page-home .text-shadow{
   z-index: 2;
   text-shadow: 2px 2px 2px #00000099;
   right: 0;

backend/tpl/components/home-carousel.jinja

@@ -1,5 +1,5 @@
 <div id="js-app-home-carousel" class="app-home-carousel d-none d-md-block  position-relative">
-  <h1 class="position-absolute text-white pt-5 pr-5 pl-2 m-0 col-12 col-lg-8 col-xl-5">{{ _('home.title') }}</h1>
+  <h1 class="position-absolute text-white pt-5 pr-5 pl-2 m-0 col-12 col-lg-8 col-xl-5 text-shadow">{{ _('home.title') }}</h1>
   <b-carousel
     fade
     :interval="5000"

backend/tpl/components/legal-footer.jinja

@@ -0,0 +1,6 @@
+{{ _('footer.copyright') }}
+
+{% if getCustomTpl('legal_notices') %}
+  <span class="mx-3">-</span>
+  <a href="/legal-notices">Mentions Légales</a>
+{% endif %}

backend/tpl/components/main-nav.jinja

@@ -2,7 +2,7 @@
   <li class="nav-item {% if active_page == 'home' %}active{% endif %}">
     <a class="nav-link " href="/">{{ _('header.nav.home') }}</a>
   </li>
-  {% if isDbPagePublished('about'): %}
+  {% if getCustomTpl('about') %}
   <li class="nav-item {% if active_page == 'about' %}active{% endif %}">
     <a class="nav-link" href="/about" >{{ _('header.nav.about') }}</a>
   </li>

backend/tpl/home_mono_obs.jinja

@@ -27,10 +27,9 @@
 
   {% include 'components/home-carousel.jinja' %}
 
-  {% set intro_locale = dbconf.get('home_intro_' + locale.__str__()) %}
-  {% set intro = intro_locale if intro_locale else dbconf.get('home_intro', '') %}
-  {% if dbconf.home_intro_position == 'top': %}
-  {% autoescape false %}{{ intro }}{% endautoescape %}
+  {% set home_block_1 = getCustomTpl('home_block_1') %}
+  {% if home_block_1 %}
+    {% include home_block_1 %}
   {% endif %}
 
   <div class="blocks mt-4">
@@ -57,8 +56,9 @@
 
   </div>
 
-  {% if dbconf.home_intro_position == 'bottom': %}
-  {% autoescape false %}{{ intro }}{% endautoescape %}
+  {% set home_block_2 = getCustomTpl('home_block_2') %}
+  {% if home_block_2 %}
+    {% include home_block_2 %}
   {% endif %}
 </div>
 

backend/tpl/home_multi_obs.jinja

@@ -29,10 +29,9 @@
 
   {% include 'components/home-carousel.jinja' %}
 
-  {% set intro_locale = dbconf.get('home_intro_' + locale.__str__()) %}
-  {% set intro = intro_locale if intro_locale else dbconf.get('home_intro', '') %}
-  {% if dbconf.home_intro_position == 'top': %}
-  {% autoescape false %}{{ intro }}{% endautoescape %}
+  {% set home_block_1 = getCustomTpl('home_block_1') %}
+  {% if home_block_1 %}
+    {% include home_block_1 %}
   {% endif %}
 
   <div class="container-fluid px-0 my-4 my-md-5">
@@ -52,7 +51,7 @@
                 <a class="d-block w-100 h-100 position-relative" href='/sites?filters=[{"name":"id_observatory","values":[{{ observatories[count.value].id }}]}]'>  
                   <img class="w-100 h-100" src="{{ getThumborUrl('700x200', observatories[count.value].photo) }}">
                   <span class="d-flex flex-column justify-content-center align-items-center text-center position-absolute w-100 h-100 info text-white">
-                    <span class="text-uppercase">{{ observatories[count.value].title }}</span>
+                    <span class="text-uppercase text-shadow">{{ observatories[count.value].title }}</span>
                     <button type="button" class="btn btn-outline-light d-none">Voir</button>
                   </span>
                 </a>
@@ -81,6 +80,11 @@
     {% endfor %}  
   </div>
 
+  {% set home_block_2 = getCustomTpl('home_block_2') %}
+  {% if home_block_2 %}
+    {% include home_block_2 %}
+  {% endif %}
+
   <div class="container-xl">
     <div class="text-center">
       <a href="/sites">{{ _('home.map_block_title') }}</a>
@@ -93,9 +97,11 @@
     </a>
   </div>
 
-  {% if dbconf.home_intro_position == 'bottom': %}
-  {% autoescape false %}{{ intro }}{% endautoescape %}
+  {% set home_block_3 = getCustomTpl('home_block_3') %}
+  {% if home_block_3 %}
+    {% include home_block_3 %}
   {% endif %}
+
 </div>
 
 <script>

backend/tpl/layout.jinja

@@ -62,8 +62,9 @@
     </header>
     <div class="header-title d-none d-sm-block">{% block header_title %}{% endblock %}</div>
     {% block content %}{% endblock %}
-    {% if pathExists('tpl/custom/footer.jinja') %}
-    {% include 'custom/footer.jinja' %}
+    {% set footer = getCustomTpl('footer') %}
+    {% if footer: %}
+      {% include footer %}
     {% else %}
     <footer class="app-footer">
       {% block footer %}
@@ -117,7 +118,9 @@
 
       <hr class="mt-4" />
 
-      <div>{{ _('footer.copyright') }}</div>
+      <div class="mt-4 d-flex">
+        {% include 'components/legal-footer.jinja' %}
+      </div>
       {% endblock %}
     </footer>
     {% endif %}

backend/utils.py

@@ -24,6 +24,15 @@
 site_schema = models.TSiteSchema(many=True)
 themes_sthemes_schema = models.CorSthemeThemeSchema(many=True)
 
+def getCustomTpl(name):
+    tpl_local = f'custom/{name}_{get_locale().__str__()}.jinja'
+    tpl_common = f'custom/{name}.jinja'
+    if os.path.exists(f'tpl/{tpl_local}'):
+        return tpl_local
+    if os.path.exists(f'tpl/{tpl_common}'):
+        return tpl_common
+    return None
+
 def getThumborSignature(url):
     key = bytes(os.getenv("THUMBOR_SECURITY_KEY"), 'UTF-8')
     msg = bytes(url, 'UTF-8')
@@ -148,12 +157,6 @@ def getDbConf():
 
     return conf
 
-
-def isDbPagePublished(name):
-    dbconf = getDbConf()
-
-    return dbconf.get('page_' + name + '_published_' + get_locale().__str__(), dbconf.get('page_' + name + '_published')) is True
-
 def isMultiObservatories():
     # Pourrait passer par un count sql
     sql = text("SELECT id FROM geopaysages.t_observatory where is_published is true")
@@ -163,18 +166,6 @@ def isMultiObservatories():
         return True
     return False
 
-def getDbPage(name):
-    dbconf = getDbConf()
-
-    locale = get_locale()
-    title_locale = dbconf.get('page_' + name + '_title_' + locale.__str__())
-    content_locale = dbconf.get('page_' + name + '_content_' + locale.__str__())
-
-    return {
-        'title': title_locale if title_locale else dbconf.get('page_' + name + '_title', ''),
-        'content': content_locale if content_locale else dbconf.get('page_' + name + '_content', '')
-    }
-
 def getFiltersData():
     sites=site_schema.dump(models.TSite.query.join(models.Observatory).filter(models.TSite.publish_site == True, models.Observatory.is_published == True).order_by(DEFAULT_SORT_SITES))
     for site in sites: