Add pelican-themes, fix doc

diff --git a/.gitmodules b/.gitmodules
index e76719e0a91c9c64a34c828bbdc2a2038efc4975..a3c18e80adff02b8e31adb5fe35079b667df772a 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,3 +8,6 @@
        path = lib/TimeSide
        url = https://github.com/Parisson/TimeSide.git
     ignore = dirty
+[submodule "doc/pelican-themes"]
+       path = doc/pelican-themes
+       url = https://github.com/getpelican/pelican-themes.git

diff --git a/doc/content/TM-CREM.rst b/doc/content/TM-CREM.rst
index e372b8fa0e987eb43ac40549ac7b1faa8b2ffc16..ea756703206370c16b4db140d38c47a4ed033330 100644 (file)
--- a/doc/content/TM-CREM.rst
+++ b/doc/content/TM-CREM.rst
@@ -26,7 +26,7 @@ The CREM has been the major partner of the Telemeta project from the beginning i
 From 2011, a mean of 400 Go/year of audio data and metadata are imported in the instance.
 
 Related research projects
-==========================
+--------------------------
 
 * DIADEMS_ : Description, Indexation, Access to Sound and Ethnomusicological Documents, funded by the French Research Agency (ANR_ CONTINT 2012), involving IRIT_, CREM_, LAM_, LABRI_, LIMSI_, MNHN_, Parisson_
 * TimeSide-DIADEMS_ : a set of Timeside plugins for hich level music analysis developed during the DIADEMS_ project

diff --git a/doc/pelican-themes b/doc/pelican-themes
new file mode 160000 (submodule)
index 0000000..2066cb0
--- /dev/null
+++ b/doc/pelican-themes
@@ -0,0 +1 @@
+Subproject commit 2066cb022da2ed06a6ed035b99f960f2034aa415

diff --git a/doc/pelicanconf.py b/doc/pelicanconf.py
index cd959f4645fb3cb8389454b84129072c956cc434..816cdaed8e40c53aa88d1a4e4995c7664dff0811 100644 (file)
--- a/doc/pelicanconf.py
+++ b/doc/pelicanconf.py
@@ -9,13 +9,13 @@ TIMEZONE = 'Europe/Paris'
 DEFAULT_LANG = u'en'
 DEFAULT_DATE = 'fs'
 
-SITEURL = 'http://parisson.github.io/Telemeta/'
+SITEURL = 'https://parisson.github.io/Telemeta/'
 RELATIVE_URLS = True
 
 PATH = 'content/'
 DELETE_OUTPUT_DIRECTORY = False
 
-THEME = 'themes/pelican-bootstrap3'
+THEME = 'pelican-themes/pelican-bootstrap3'
 BOOTSTRAP_THEME = 'united'
 
 SUMMARY_MAX_LENGTH = 127
@@ -46,10 +46,14 @@ SOCIAL = (('GitHub', 'https://github.com/Parisson/Telemeta'),
 
 PLUGIN_PATHS = ['pelican-plugins']
 PLUGINS = ['pin_to_top', 'sitemap', 'gallery', 'render_math',
-            'liquid_tags.img', 'liquid_tags.video',
+           'i18n_subsites', 'liquid_tags.img', 'liquid_tags.video',
            'liquid_tags.youtube', 'liquid_tags.vimeo',
            'liquid_tags.include_code', ]
 
+JINJA_ENVIRONMENT = {
+   'extensions': ['jinja2.ext.i18n'],
+}
+
 STATIC_PATHS = ['images', 'css']
 CUSTOM_CSS = 'css/custom.css'
 

diff --git a/doc/publishconf.py b/doc/publishconf.py
index 92a9260b152be5e5bf652537a6905aec0077ba99..59f4f6b27ffb9d2da748227cb24d781171ca187c 100644 (file)
--- a/doc/publishconf.py
+++ b/doc/publishconf.py
@@ -10,7 +10,7 @@ import sys
 sys.path.append(os.curdir)
 from pelicanconf import *
 
-SITEURL = 'http://parisson.github.io/Telemeta'
+SITEURL = 'https://parisson.github.io/Telemeta'
 RELATIVE_URLS = True
 
 FEED_ALL_ATOM = 'feeds/all.atom.xml'