Projet

Général

Profil

0001-templates-use-start_timestamp-instead-of-computer-ve.patch

Frédéric Péters, 20 décembre 2018 09:50

Télécharger (17,1 ko)

Voir les différences: 

Subject: [PATCH] templates: use ?<start_timestamp> instead of computer version
 hash (#29238)


 debian/control                                              | 2 +-
 templates/combo/page_template.html                          | 6 +++---
 templates/fargo/base_iframe.html                            | 4 ++--
 templates/gadjo/base.html                                   | 3 ++-
 templates/includes/tracking.html                            | 4 ++--
 templates/theme.html                                        | 6 +++---
 templates/variants/alfortville/prepare-template.py          | 4 ++--
 templates/variants/grenoble-metropole/theme.html            | 4 ++--
 .../hautes-alpes-2018/combo/page_template_neutre.html       | 6 +++---
 templates/variants/hautes-alpes-2018/theme.html             | 4 ++--
 templates/variants/montpellier/theme.html                   | 4 ++--
 templates/variants/nancy-2017/prepare-template.py           | 4 ++--
 templates/variants/nancy-2017/theme.html                    | 4 ++--
 templates/variants/strasbourg-2018/combo/page_template.html | 6 +++---
 templates/variants/strasbourg-2018/theme.html               | 4 ++--
 templates/variants/strasbourg/theme.html                    | 4 ++--
 templates/variants/villeurbanne-2018/theme.html             | 4 ++--
 17 files changed, 37 insertions(+), 36 deletions(-)
debian/control
8 8 

  		




  9
  9
  
    
Package: publik-base-theme

  		




  10
  10
  
    
Architecture: all

  		




  11
  
  
    
Depends: ${shlibs:Depends}, ${misc:Depends}, python-xstatic-abrilfatface

  		




  
  11
  
    
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo, python-xstatic-abrilfatface

  		




  12
  12
  
    
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0)

  		




  13
  13
  
    
Breaks: combo (< 0.7.1)

  		




  14
  14
  
    
Description: Publik Base Theme

  		












  

    
      templates/combo/page_template.html
    
  





  16
  16
  
    
{% endblock %}

  		




  17
  17
  
    

  		




  18
  18
  
    
{% block extra_scripts %}

  		




  19
  
  
    
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{statics_hash}}" async></script>

  		




  20
  
  
    
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{statics_hash}}" async></script>

  		




  
  19
  
    
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{start_timestamp}}" async></script>

  		




  
  20
  
    
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{start_timestamp}}" async></script>

  		




  21
  21
  
    
<script src="{{site_base}}/__services.js"></script>

  		




  22
  22
  
    
{% if not no_extra_js %}

  		




  23
  
  
    
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{statics_hash}}" async></script>

  		




  
  23
  
    
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{start_timestamp}}" async></script>

  		




  24
  24
  
    
{% endif %}

  		




  25
  25
  
    
{% skeleton_extra_placeholder extra-head %}

  		




  26
  26
  
    
{% end_skeleton_extra_placeholder %}

  		












  

    
      templates/fargo/base_iframe.html
    
  





  4
  4
  
    
    <script src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>

  		




  5
  5
  
    
    <link rel="stylesheet" href="{% static "fargo/css/style.css" %}" />

  		




  6
  6
  
    
    {% if css_variant %}

  		




  7
  
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">

  		




  
  7
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{start_timestamp}}">

  		




  8
  8
  
    
    {% else %}

  		




  9
  
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{statics_hash}}">

  		




  
  9
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{start_timestamp}}">

  		




  10
  10
  
    
    {% endif %}

  		




  11
  11
  
    
    {% block extra_head %}

  		




  12
  12
  
    
    {% endblock %}

  		












  

    
      templates/gadjo/base.html
    
  





  1
  1
  
    
{% extends "gadjo/root.html" %}

  		




  
  2
  
    
{% load gadjo %}

  		




  2
  3
  
    

  		




  3
  4
  
    
{% block site-header %}

  		




  4
  5
  
    
  <h1 class="breadcrumbs">{% block breadcrumb %}{% endblock %}</h1>

  		




  ......




  10
  11
  
    
{% block extrascripts %}

  		




  11
  12
  
    
{% if manager_homepage_url %}

  		




  12
  13
  
    
<script src="{{manager_homepage_url}}__services.js"></script>

  		




  13
  
  
    
<script src="{{manager_homepage_url}}static/js/publik.js?{{statics_hash}}"></script>

  		




  
  14
  
    
<script src="{{manager_homepage_url}}static/js/publik.js?{{start_timestamp}}"></script>

  		




  14
  15
  
    
{% endif %}

  		




  15
  16
  
    
{% endblock %}

  		




  16
  17
  
    

  		












  

    
      templates/includes/tracking.html
    
  





  1
  
  
    
{% load static %}

  		




  
  1
  
    
{% load gadjo static %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% if cnil_compliant_visits_tracking_js %}

  		




  4
  4
  
    
   <script type="text/javascript">

  		




  ......




  7
  7
  
    
   }

  		




  8
  8
  
    
   </script>

  		




  9
  9
  
    
 {% elif visits_tracking_js %}

  		




  10
  
  
    
   <script type="text/javascript" src="{{ site_base }}{% static 'js/cookie_usage_consent.js' %}?{{statics_hash}}"></script>

  		




  
  10
  
    
   <script type="text/javascript" src="{{ site_base }}{% static 'js/cookie_usage_consent.js' %}?{{start_timestamp}}"></script>

  		




  11
  11
  
    
   <script type="text/javascript">

  		




  12
  12
  
    
     if (has_consent()) {

  		




  13
  13
  
    
      {{ visits_tracking_js|safe }}

  		












  

    
      templates/theme.html
    
  





  1
  1
  
    
<!DOCTYPE html>

  		




  2
  
  
    
{% load i18n static %}

  		




  
  2
  
    
{% load gadjo i18n static %}

  		




  3
  3
  
    
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

  		




  4
  4
  
    
  <head>

  		




  5
  5
  
    
    <meta charset="UTF-8"><!-- 🔥 -->

  		




  ......




  28
  28
  
    
    {% endblock %}

  		




  29
  29
  
    
    {{ media }}

  		




  30
  30
  
    
    {% if css_variant %}

  		




  31
  
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">

  		




  
  31
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{start_timestamp}}">

  		




  32
  32
  
    
    {% else %}

  		




  33
  
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{statics_hash}}">

  		




  
  33
  
    
      <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{start_timestamp}}">

  		




  34
  34
  
    
    {% endif %}

  		




  35
  35
  
    
    {% block extra_css %}

  		




  36
  36
  
    
    {% endblock %}

  		












  

    
      templates/variants/alfortville/prepare-template.py
    
  





  12
  12
  
    

  		




  13
  13
  
    
URL = 'https://www.alfortville.fr/?page=gru'

  		




  14
  14
  
    
subprocess.call(['wget', '--quiet', '-O', FILENAME, '--convert-links', URL])

  		




  15
  
  
    
content = '{% load i18n static combo %}' + open(FILENAME).read().strip()

  		




  
  15
  
    
content = '{% load gadjo i18n static combo %}' + open(FILENAME).read().strip()

  		




  16
  16
  
    
if len(content) < 500:

  		




  17
  17
  
    
    sys.exit(0)

  		




  18
  18
  
    

  		




  ......




  36
  36
  
    
    {% block extra_top_head %}

  		




  37
  37
  
    
    {% endblock %}

  		




  38
  38
  
    
    {{ media }}

  		




  39
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'alfortville/style.css' %}?{{statics_hash}}">

  		




  
  39
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'alfortville/style.css' %}?{{start_timestamp}}">

  		




  40
  40
  
    
    {% block extra_css %}

  		




  41
  41
  
    
    {% endblock %}

  		




  42
  42
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/grenoble-metropole/theme.html
    
  





  1
  1
  
    
{% extends 'base-theme.html' %}

  		




  2
  
  
    
{% load i18n static combo %}

  		




  
  2
  
    
{% load gadjo i18n static combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block global_title %}

  		




  5
  5
  
    
{% firstof global_title "Grenoble-Alpes Métropole" %} {% block title %}{% endblock %}

  		




  ......




  17
  17
  
    
    {% block extra_top_head %}

  		




  18
  18
  
    
    {% endblock %}

  		




  19
  19
  
    
    {{ media }}

  		




  20
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'grenoble-metropole/style.css' %}?{{statics_hash}}">

  		




  
  20
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'grenoble-metropole/style.css' %}?{{start_timestamp}}">

  		




  21
  21
  
    
    {% block extra_css %}

  		




  22
  22
  
    
    {% endblock %}

  		




  23
  23
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/hautes-alpes-2018/combo/page_template_neutre.html
    
  





  9
  9
  
    
{% endblock %}

  		




  10
  10
  
    

  		




  11
  11
  
    
{% block extra_scripts %}

  		




  12
  
  
    
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{statics_hash}}"></script>

  		




  13
  
  
    
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{statics_hash}}"></script>

  		




  
  12
  
    
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{start_timestamp}}"></script>

  		




  
  13
  
    
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{start_timestamp}}"></script>

  		




  14
  14
  
    
<script src="{{site_base}}/__services.js"></script>

  		




  15
  15
  
    
{% if not no_extra_js %}

  		




  16
  
  
    
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{statics_hash}}"></script>

  		




  
  16
  
    
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{start_timestamp}}"></script>

  		




  17
  17
  
    
{% endif %}

  		




  18
  18
  
    
{% skeleton_extra_placeholder extra-head %}

  		




  19
  19
  
    
{% end_skeleton_extra_placeholder %}

  		












  

    
      templates/variants/hautes-alpes-2018/theme.html
    
  





  1
  1
  
    
{% extends 'base-theme.html' %}

  		




  2
  
  
    
{% load i18n static combo %}

  		




  
  2
  
    
{% load gadjo i18n static combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block global_title %}

  		




  5
  5
  
    
{% firstof global_title "Hautes-Alpes le département" %} {% block title %}{% endblock %}

  		




  ......




  14
  14
  
    
    {% block extra_top_head %}

  		




  15
  15
  
    
    {% endblock %}

  		




  16
  16
  
    
    {{ media }}

  		




  17
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'hautes-alpes-2018/style.css' %}?{{statics_hash}}">

  		




  
  17
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'hautes-alpes-2018/style.css' %}?{{start_timestamp}}">

  		




  18
  18
  
    
    {% block extra_css %}

  		




  19
  19
  
    
    {% endblock %}

  		




  20
  20
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/montpellier/theme.html
    
  





  1
  1
  
    
<!DOCTYPE html>

  		




  2
  
  
    
{% load i18n staticfiles %}

  		




  
  2
  
    
{% load gadjo i18n staticfiles %}

  		




  3
  3
  
    
<html>

  		




  4
  4
  
    
  <head>

  		




  5
  5
  
    
    <meta charset="UTF-8"><!-- 🔥 -->

  		




  ......




  16
  16
  
    
    {% endif %}

  		




  17
  17
  
    
    {% block extra_top_head %}

  		




  18
  18
  
    
    {% endblock %}

  		




  19
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'montpellier/style.css' %}?{{statics_hash}}">

  		




  
  19
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'montpellier/style.css' %}?{{start_timestamp}}">

  		




  20
  20
  
    
    {% if theme_color %}

  		




  21
  21
  
    
    <meta name="theme-color" content="{{theme_color}}">

  		




  22
  22
  
    
    <meta name="msapplication-navbutton-color" content="{{theme_color}}">

  		












  

    
      templates/variants/nancy-2017/prepare-template.py
    
  





  12
  12
  
    

  		




  13
  13
  
    
URL = 'https://services.nancy.fr/static/_s/skeleton.html'

  		




  14
  14
  
    
subprocess.call(['wget', '--quiet', '-O', FILENAME, '--convert-links', URL])

  		




  15
  
  
    
content = '{% load i18n static combo %}' + open(FILENAME).read().strip()

  		




  
  15
  
    
content = '{% load gadjo i18n static combo %}' + open(FILENAME).read().strip()

  		




  16
  16
  
    
if len(content) < 500:

  		




  17
  17
  
    
    sys.exit(0)

  		




  18
  18
  
    

  		




  ......




  27
  27
  
    
    {% block extra_top_head %}

  		




  28
  28
  
    
    {% endblock %}

  		




  29
  29
  
    
    {{ media }}

  		




  30
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{{statics_hash}}">

  		




  
  30
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{{start_timestamp}}">

  		




  31
  31
  
    
    {% block extra_css %}

  		




  32
  32
  
    
    {% endblock %}

  		




  33
  33
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/nancy-2017/theme.html
    
  





  1
  
  
    
{% load i18n static combo %}<!doctype html>

  		




  
  1
  
    
{% load gadjo i18n static combo %}<!doctype html>

  		




  2
  2
  
    
<html lang="fr">

  		




  3
  3
  
    
<head>

  		




  4
  4
  
    
  <meta charset="utf-8"/>

  		




  ......




  27
  27
  
    
    {% block extra_top_head %}

  		




  28
  28
  
    
    {% endblock %}

  		




  29
  29
  
    
    {{ media }}

  		




  30
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{{statics_hash}}">

  		




  
  30
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{{start_timestamp}}">

  		




  31
  31
  
    
    {% block extra_css %}

  		




  32
  32
  
    
    {% endblock %}

  		




  33
  33
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/strasbourg-2018/combo/page_template.html
    
  





  9
  9
  
    
{% endblock %}

  		




  10
  10
  
    

  		




  11
  11
  
    
{% block extra_scripts %}

  		




  12
  
  
    
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{statics_hash}}"></script>

  		




  13
  
  
    
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{statics_hash}}"></script>

  		




  
  12
  
    
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{start_timestamp}}"></script>

  		




  
  13
  
    
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{start_timestamp}}"></script>

  		




  14
  14
  
    
<script src="{{site_base}}/__services.js"></script>

  		




  15
  15
  
    
{% if not no_extra_js %}

  		




  16
  
  
    
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{statics_hash}}"></script>

  		




  
  16
  
    
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{start_timestamp}}"></script>

  		




  17
  17
  
    
{% endif %}

  		




  18
  18
  
    
{% skeleton_extra_placeholder extra-head %}

  		




  19
  19
  
    
{% end_skeleton_extra_placeholder %}

  		












  

    
      templates/variants/strasbourg-2018/theme.html
    
  





  1
  
  
    
<!DOCTYPE html>{% load i18n static %}

  		




  
  1
  
    
<!DOCTYPE html>{% load gadjo i18n static %}

  		




  2
  2
  
    
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="mseu">

  		




  3
  3
  
    
<head>

  		




  4
  4
  
    
    <meta charset="UTF-8">

  		




  ......




  23
  23
  
    
    <link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static-2018/stylesheets/bootstrap.min.css">

  		




  24
  24
  
    
    <link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static-2018/stylesheets/bootstrap-theme.min.css">

  		




  25
  25
  
    
    <link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static-2018/stylesheets/screen.css">

  		




  26
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">

  		




  
  26
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{start_timestamp}}">

  		




  27
  27
  
    
    {% block extra_css %}

  		




  28
  28
  
    
    {% endblock %}

  		




  29
  29
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/strasbourg/theme.html
    
  





  1
  
  
    
<!DOCTYPE html>{% load i18n static %}

  		




  
  1
  
    
<!DOCTYPE html>{% load gadjo i18n static %}

  		




  2
  2
  
    
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="seu">

  		




  3
  3
  
    
<head>

  		




  4
  4
  
    
    <meta charset="UTF-8">

  		




  ......




  23
  23
  
    
    <link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static/stylesheets/bootstrap.min.css">

  		




  24
  24
  
    
    <link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static/stylesheets/bootstrap-theme.min.css">

  		




  25
  25
  
    
    <link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static/stylesheets/screen.css">

  		




  26
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">

  		




  
  26
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{start_timestamp}}">

  		




  27
  27
  
    
    {% block extra_css %}

  		




  28
  28
  
    
    {% endblock %}

  		




  29
  29
  
    
    {% block extra_scripts %}

  		












  

    
      templates/variants/villeurbanne-2018/theme.html
    
  





  1
  1
  
    
{% extends 'base-theme.html' %}

  		




  2
  
  
    
{% load i18n static combo %}

  		




  
  2
  
    
{% load gadjo i18n static combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block global_title %}

  		




  5
  5
  
    
{% firstof global_title "Villeurbanne" %} {% block title %}{% endblock %}

  		




  ......




  20
  20
  
    
    {% block extra_top_head %}

  		




  21
  21
  
    
    {% endblock %}

  		




  22
  22
  
    
    {{ media }}

  		




  23
  
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'villeurbanne-2018/style.css' %}?{{statics_hash}}">

  		




  
  23
  
    
    <link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'villeurbanne-2018/style.css' %}?{{start_timestamp}}">

  		




  24
  24
  
    

  		




  25
  25
  
    
    {% block extra_css %}

  		




  26
  26
  
    
    {% endblock %}

  		




  27
  
  
    
-