entrouvert
/
publik-base-theme
15
1
Fork 1
Code Issues Pull Requests 12 Releases Wiki Activity

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

This commit is contained in:
Frédéric Péters 2018-12-20 09:48:46 +01:00
parent 7b8ae3beea
commit d836073379
17 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Homepage: http://git.entrouvert.org/publik-base-theme.git
Package: publik-base-theme
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, python-xstatic-abrilfatface
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo, python-xstatic-abrilfatface
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0)
Breaks: combo (< 0.7.1)
Description: Publik Base Theme

6
templates/combo/page_template.html
View File

@ -16,11 +16,11 @@
{% endblock %}
{% block extra_scripts %}
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{statics_hash}}" async></script>
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{statics_hash}}" async></script>
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{% start_timestamp %}" async></script>
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{% start_timestamp %}" async></script>
<script src="{{site_base}}/__services.js"></script>
{% if not no_extra_js %}
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{statics_hash}}" async></script>
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{% start_timestamp %}" async></script>
{% endif %}
{% skeleton_extra_placeholder extra-head %}
{% end_skeleton_extra_placeholder %}

4
templates/fargo/base_iframe.html
View File

@ -4,9 +4,9 @@
<script src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>
<link rel="stylesheet" href="{% static "fargo/css/style.css" %}" />
{% if css_variant %}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{% start_timestamp %}">
{% else %}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{% start_timestamp %}">
{% endif %}
{% block extra_head %}
{% endblock %}

3
templates/gadjo/base.html
View File

@ -1,4 +1,5 @@
{% extends "gadjo/root.html" %}
{% load gadjo %}
{% block site-header %}
<h1 class="breadcrumbs">{% block breadcrumb %}{% endblock %}</h1>
@ -10,7 +11,7 @@
{% block extrascripts %}
{% if manager_homepage_url %}
<script src="{{manager_homepage_url}}__services.js"></script>
<script src="{{manager_homepage_url}}static/js/publik.js?{{statics_hash}}"></script>
<script src="{{manager_homepage_url}}static/js/publik.js?{% start_timestamp %}"></script>
{% endif %}
{% endblock %}

4
templates/includes/tracking.html
View File

@ -1,4 +1,4 @@
{% load static %}
{% load gadjo static %}
{% if cnil_compliant_visits_tracking_js %}
<script type="text/javascript">
@ -7,7 +7,7 @@
}
</script>
{% elif visits_tracking_js %}
<script type="text/javascript" src="{{ site_base }}{% static 'js/cookie_usage_consent.js' %}?{{statics_hash}}"></script>
<script type="text/javascript" src="{{ site_base }}{% static 'js/cookie_usage_consent.js' %}?{% start_timestamp %}"></script>
<script type="text/javascript">
if (has_consent()) {
{{ visits_tracking_js|safe }}

6
templates/theme.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
{% load i18n static %}
{% load gadjo i18n static %}
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
<meta charset="UTF-8"><!-- 🔥 -->
@ -28,9 +28,9 @@
{% endblock %}
{{ media }}
{% if css_variant %}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{% start_timestamp %}">
{% else %}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "style.css" %}?{% start_timestamp %}">
{% endif %}
{% block extra_css %}
{% endblock %}

4
templates/variants/alfortville/prepare-template.py
View File

@ -12,7 +12,7 @@ if os.path.exists(FILENAME):
URL = 'https://www.alfortville.fr/?page=gru'
subprocess.call(['wget', '--quiet', '-O', FILENAME, '--convert-links', URL])
content = '{% load i18n static combo %}' + open(FILENAME).read().strip()
content = '{% load gadjo i18n static combo %}' + open(FILENAME).read().strip()
if len(content) < 500:
sys.exit(0)
@ -36,7 +36,7 @@ content = content.replace('</head>',
{% block extra_top_head %}
{% endblock %}
{{ media }}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'alfortville/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'alfortville/style.css' %}?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

4
templates/variants/grenoble-metropole/theme.html
View File

@ -1,5 +1,5 @@
{% extends 'base-theme.html' %}
{% load i18n static combo %}
{% load gadjo i18n static combo %}
{% block global_title %}
{% firstof global_title "Grenoble-Alpes Métropole" %} {% block title %}{% endblock %}
@ -17,7 +17,7 @@
{% block extra_top_head %}
{% endblock %}
{{ media }}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'grenoble-metropole/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'grenoble-metropole/style.css' %}?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

6
templates/variants/hautes-alpes-2018/combo/page_template_neutre.html
View File

@ -9,11 +9,11 @@
{% endblock %}
{% block extra_scripts %}
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{statics_hash}}"></script>
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{statics_hash}}"></script>
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{% start_timestamp %}"></script>
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{% start_timestamp %}"></script>
<script src="{{site_base}}/__services.js"></script>
{% if not no_extra_js %}
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{statics_hash}}"></script>
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{% start_timestamp %}"></script>
{% endif %}
{% skeleton_extra_placeholder extra-head %}
{% end_skeleton_extra_placeholder %}

4
templates/variants/hautes-alpes-2018/theme.html
View File

@ -1,5 +1,5 @@
{% extends 'base-theme.html' %}
{% load i18n static combo %}
{% load gadjo i18n static combo %}
{% block global_title %}
{% firstof global_title "Hautes-Alpes le département" %} {% block title %}{% endblock %}
@ -14,7 +14,7 @@
{% block extra_top_head %}
{% endblock %}
{{ media }}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'hautes-alpes-2018/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'hautes-alpes-2018/style.css' %}?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

4
templates/variants/montpellier/theme.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
{% load i18n staticfiles %}
{% load gadjo i18n staticfiles %}
<html>
<head>
<meta charset="UTF-8"><!-- 🔥 -->
@ -16,7 +16,7 @@
{% endif %}
{% block extra_top_head %}
{% endblock %}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'montpellier/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'montpellier/style.css' %}?{% start_timestamp %}">
{% if theme_color %}
<meta name="theme-color" content="{{theme_color}}">
<meta name="msapplication-navbutton-color" content="{{theme_color}}">

4
templates/variants/nancy-2017/prepare-template.py
View File

@ -12,7 +12,7 @@ if os.path.exists(FILENAME):
URL = 'https://services.nancy.fr/static/_s/skeleton.html'
subprocess.call(['wget', '--quiet', '-O', FILENAME, '--convert-links', URL])
content = '{% load i18n static combo %}' + open(FILENAME).read().strip()
content = '{% load gadjo i18n static combo %}' + open(FILENAME).read().strip()
if len(content) < 500:
sys.exit(0)
@ -27,7 +27,7 @@ content = content.replace('<!-- @@HEAD@@ -->',
{% block extra_top_head %}
{% endblock %}
{{ media }}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

4
templates/variants/nancy-2017/theme.html
View File

@ -1,4 +1,4 @@
{% load i18n static combo %}<!doctype html>
{% load gadjo i18n static combo %}<!doctype html>
<html lang="fr">
<head>
<meta charset="utf-8"/>
@ -27,7 +27,7 @@
{% block extra_top_head %}
{% endblock %}
{{ media }}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'nancy-2017/style.css' %}?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

6
templates/variants/strasbourg-2018/combo/page_template.html
View File

@ -9,11 +9,11 @@
{% endblock %}
{% block extra_scripts %}
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{{statics_hash}}"></script>
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{{statics_hash}}"></script>
<script src="{{site_base}}{% static 'js/combo.public.js' %}?{% start_timestamp %}"></script>
<script src="{{site_base}}{% static 'js/combo.back.js' %}?{% start_timestamp %}"></script>
<script src="{{site_base}}/__services.js"></script>
{% if not no_extra_js %}
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{{statics_hash}}"></script>
<script src="{{site_base}}{% static "" %}{{css_variant}}/extra.js?{% start_timestamp %}"></script>
{% endif %}
{% skeleton_extra_placeholder extra-head %}
{% end_skeleton_extra_placeholder %}

4
templates/variants/strasbourg-2018/theme.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>{% load i18n static %}
<!DOCTYPE html>{% load gadjo i18n static %}
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="mseu">
<head>
<meta charset="UTF-8">
@ -23,7 +23,7 @@
<link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static-2018/stylesheets/bootstrap.min.css">
<link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static-2018/stylesheets/bootstrap-theme.min.css">
<link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static-2018/stylesheets/screen.css">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

4
templates/variants/strasbourg/theme.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>{% load i18n static %}
<!DOCTYPE html>{% load gadjo i18n static %}
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="seu">
<head>
<meta charset="UTF-8">
@ -23,7 +23,7 @@
<link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static/stylesheets/bootstrap.min.css">
<link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static/stylesheets/bootstrap-theme.min.css">
<link type="text/css" rel="stylesheet" href="{{site_base}}/static/seu-static/stylesheets/screen.css">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "" %}{{css_variant}}/style.css?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}
{% block extra_scripts %}

4
templates/variants/villeurbanne-2018/theme.html
View File

@ -1,5 +1,5 @@
{% extends 'base-theme.html' %}
{% load i18n static combo %}
{% load gadjo i18n static combo %}
{% block global_title %}
{% firstof global_title "Villeurbanne" %} {% block title %}{% endblock %}
@ -20,7 +20,7 @@
{% block extra_top_head %}
{% endblock %}
{{ media }}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'villeurbanne-2018/style.css' %}?{{statics_hash}}">
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static 'villeurbanne-2018/style.css' %}?{% start_timestamp %}">
{% block extra_css %}
{% endblock %}