import .drone.yml from master

.drone.yml

@@ -1,30 +1,101 @@
+---
 kind: pipeline
-name: Opytex 2021-2022
+name: Opytex Main
 type: docker
 
 trigger:
   branch:
-    - 2021-2022
+    - master
 
 steps:
-  - name: Deploy
+  - name: Build Opytex base
     image: python:3.8-alpine
+    volumes:
+      - name: pelican-output
+        path: /output
     commands:
-      - apk add --no-cache openssh-client ca-certificates bash rsync git imagemagick-dev imagemagick
+      - apk add --no-cache git imagemagick-dev imagemagick
       - git submodule init
       - git submodule update
-      - git clone https://git.opytex.org/lafrite/2021-2022.git content
       - pip install --no-cache-dir -r requirements.txt
       - export MAGICK_HOME=/usr
-      - pelican ./content/ -o output -s publishconf.py --relative-urls
+      - pelican ./content/ -o /output -s publishconf.py --relative-urls
-      - eval `ssh-agent -s`
+      - ls /output
-      - echo "$SSH_KEY" | ssh-add -
+
-      - mkdir -p ~/.ssh
+  - name: Push to bucket opytex.org
-      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+    image: plugins/s3
-      - ssh sshcontent@91.121.90.228 'mkdir -p ~/opytex.org/www/enseignements/2021-2022/'
+    volumes:
-      - rsync -rv --delete -e "ssh -p 22" ./output/ sshcontent@91.121.90.228:~/opytex.org/www/enseignements/2021-2022/ --checksum
+      - name: pelican-output
-    environment:
+        path: /output
-      SSH_KEY:
+    settings:
-        from_secret: sshcontent-key
+      bucket: opytex.org
+      endpoint: https://storage.opytex.org
+      access_key:
+        from_secret: minio_access_key
+      secret_key:
+        from_secret: minio_secret_key
+      source: /output/**/*
+      target: /
+      path_style: true
+      strip_prefix: /output
 
 
+volumes:
+  - name: pelican-output
+    temp: {}
+
+---
+kind: pipeline
+name: Opytex Year
+type: docker
+
+trigger:
+  branch:
+    - 2022-2023
+    - 2021-2022
+    - 2020-2021
+    - 2019-2020
+    - 2018-2019
+    - 2017-2018
+    - 2016-2017
+    - 2015-2016
+
+steps:
+  - name: Build Opytex ${DRONE_BRANCH}
+    image: python:3.8-alpine
+    volumes:
+      - name: pelican-output
+        path: /output
+    commands:
+      - apk add --no-cache git imagemagick-dev imagemagick
+      - git submodule init
+      - git submodule update
+      - git clone https://git.opytex.org/lafrite/${DRONE_BRANCH}.git content
+      - pip install --no-cache-dir -r requirements.txt
+      - apk add --no-cache git imagemagick-dev imagemagick
+      - pip install --no-cache-dir -r requirements.txt
+      - export MAGICK_HOME=/usr
+      - pelican ./content/ -o /output -s publishconf.py --relative-urls
+      - ls /output
+
+  - name: Push to bucket opytex.org
+    image: plugins/s3-sync:1
+    volumes:
+      - name: pelican-output
+        path: /drone/src/output
+    settings:
+      bucket: opytex.org
+      endpoint: https://storage.opytex.org
+      access_key:
+        from_secret: minio_access_key
+      secret_key:
+        from_secret: minio_secret_key
+      source: /output
+      target: /enseignements/${DRONE_BRANCH}
+      path_style: true
+      delete: true
+
+
+volumes:
+  - name: pelican-output
+    temp: {}

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "pelican-plugins"]
 	path = pelican-plugins
 	url = https://github.com/getpelican/pelican-plugins
+[submodule "plugins/peertube"]
+	path = plugins/peertube
+	url = https://git.melonbread.xyz/rain/pelican-peertube.git

.pre-commit-config.yaml

@@ -1,15 +0,0 @@
----
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-yaml
-      - id: check-added-large-files
-  - repo: https://github.com/psf/black
-    rev: 22.6.0
-    hooks:
-      - id: black

Makefile

@@ -49,10 +49,8 @@ help:
 	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
 	@echo '                                                                          '
 
-css:
+html:
 	lessc $(BASEDIR)/theme/static/stylesheet/style.less $(BASEDIR)/theme/static/stylesheet/style.min.css -x
-
-html: css
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
 
 clean:

pelicanconf.py

@@ -3,35 +3,34 @@
 from __future__ import unicode_literals
 import os
 import sys
-
 sys.path.append(os.curdir)
 from globalconf import *
 
-AUTHOR = "Benjamin Bertrand"
+AUTHOR = 'Benjamin Bertrand'
-SITENAME = "OpyTex"
+SITENAME = 'OpyTex'
-SITETITLE = "OpyTex"
+SITETITLE = 'OpyTex'
-SITESUBTITLE = "2022-2023"
+SITESUBTITLE = "2020-2021"
-SITEURL = ""
+SITEURL = ''
 
 CC_LICENSE_COMMERCIAL = True
 CC_LICENSE = True
 
-PATH = "./content"
+PATH = './content'
 
-TIMEZONE = "Europe/Paris"
+TIMEZONE = 'Europe/Paris'
 
-DEFAULT_LANG = "fr"
+DEFAULT_LANG = 'fr'
 
 # Uncomment following line if you want document-relative URLs when developing
-# RELATIVE_URLS = True
+#RELATIVE_URLS = True
 
 # Files places
-IGNORE_FILES = ["venv", ".git", "tools"]
+IGNORE_FILES = ['venv', '.git', 'tools']
 # Pages, articles and static
-# PAGE_PATHS = ['pages']
+#PAGE_PATHS = ['pages']
-ARTICLE_PATHS = ["."]
+ARTICLE_PATHS = ['.']
-STATIC_PATHS = ["."]
+STATIC_PATHS = ['.']
-INDEX_SAVE_AS = "blog_index.html"
+INDEX_SAVE_AS = 'blog_index.html'
 
 #
 USE_FOLDER_AS_CATEGORY = False
@@ -39,19 +38,17 @@ USE_FOLDER_AS_CATEGORY = False
 # Plugins
 PLUGIN_PATHS = ["plugins"]
 PLUGINS = [
-    "i18n_subsites",
+    'i18n_subsites',
     "always_modified",
     "tag_cloud",
-    "pdf-img",
+    'pdf-img',
-    "big-button",
-    "source-link",
 ]
 
 ALWAYS_MODIFIED = True
 
 # Mirror source structure
-PATH_METADATA = "(?P<path_no_ext>.*)\..*"
+PATH_METADATA = '(?P<path_no_ext>.*)\..*'
-ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = "{path_no_ext}.html"
+ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = '{path_no_ext}.html'
 
 # USE_FOLDER_AS_CATEGORY = True
 # DEFAULT_CATEGORY = "Autre"
@@ -59,7 +56,7 @@ ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = "{path_no_ext}.html"
 # Readers
 READERS = {"html": None}
 # Everythings in french
-JINJA_ENVIRONMENT = {"extensions": ["jinja2.ext.i18n"]}
+JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']}
 # Default theme language.
 I18N_TEMPLATES_LANG = "en"
 # Your language.
@@ -81,7 +78,7 @@ DISPLAY_PAGES_ON_SIDE = False
 TOCTREE = True
 TAG_CLOUD = True
 
-# SITELOGO = ""
+#SITELOGO = ""
 LINKS = ()
 DEFAULT_PAGINATION = 10
 
@@ -91,7 +88,3 @@ CATEGORY_FEED_ATOM = None
 TRANSLATION_FEED_ATOM = None
 AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
-
-# SOURCE LINK
-GIT_SOURCE_BASE_URL = "https://git.opytex.org/lafrite/2022-2023/src/branch/main"
-SOURCE_ICON_URL = "https://git.opytex.org/assets/img/logo.svg"

plugins/always_modified.py

@@ -5,18 +5,16 @@ If "modified" date/time is not defined in article metadata, fall back to the "cr
 from pelican import signals
 from pelican.contents import Content, Article
 
-
 def add_modified(content):
     if not isinstance(content, Article):
         return
-
+    
-    if not content.settings.get("ALWAYS_MODIFIED", False):
+    if not content.settings.get('ALWAYS_MODIFIED', False):
         return
 
-    if hasattr(content, "date") and not hasattr(content, "modified"):
+    if hasattr(content, 'date') and not hasattr(content, 'modified'):
         content.modified = content.date
         content.locale_modified = content.locale_date
-
+    
-
 def register():
     signals.content_object_init.connect(add_modified)

plugins/big-button/__init__.py

@@ -1 +0,0 @@
-from .big_button import *

plugins/big-button/big_button.py

@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-big_button tags for reStructuredText
-==============================
-This plugin allows you to use big_button tags from within reST documents.
-
-.. big_button::
-    :title: Title
-    :link: ""
-    :color: default
-
-    Description
-
-"""
-
-from __future__ import unicode_literals
-from docutils import nodes
-from docutils.parsers.rst import directives, Directive
-
-
-class BigButton(Directive):
-    optional_arguments = 0
-    final_argument_whitespace = True
-    has_content = True
-    required_arguments = 0
-    optional_arguments = 0
-    final_argument_whitespace = False
-    option_spec = {
-        "title": directives.unicode_code,
-        "link": directives.path,
-    }
-
-    def settings(self):
-        self.options['content'] = '\n'.join(self.content)
-
-        if not self.options.get('title'):
-            self.options['title'] = 0
-        if not self.options.get('link'):
-            self.options['link'] = 0
-
-    def html(self):
-        html = "<div class='button'>\n"
-        if self.options["link"]:
-            html += f"<a href={self.options['link']}>"
-        else:
-            html += f"<div class='nolink'>"
-        if self.options["title"]:
-            html += f"<h3> {self.options['title']}</h3>"
-        if self.content:
-            html += "<div class='content'>"
-            html += f"{self.options['content']}"
-            html += "</div>"
-        if self.options["link"]:
-            html += "</a>"
-        else:
-            html += "</div>"
-        html += "</div>"
-        return html
-
-    def run(self):
-        self.settings()
-        return [nodes.raw('', self.html(), format='html')]
-
-
-def register():
-    directives.register_directive("big_button", BigButton)

plugins/source-link/README.md

@@ -1,31 +0,0 @@
-# Pelican source link plugin
-
-This plugin for [Pelican](https://github.com/getpelican/pelican/) generate two attributes for articles:
-
-- `source_link`: link to the source of the article from your forge
-- `path_source_link`: link to the path of the article from your forge
-
-## Installation
-
-Then, add the plugin to your pelicanconf.py file:
-
-```python
-PLUGINS = [
-    # other plugins...
-    "source_link",
-]
-```
-
-## Usage
-
-To use the plugin, define a constant named `GIT_SOURCE` in your pelicanconf.py file:
-
-```python
-GIT_SOURCE_BASE_URLL = "https://github.com/your-username/your-repo"
-```
-
-This constant should contain the base URL of your Git repository where your source code is stored.
-
-Once the constant is defined, the plugin will generate a `source_link` and a `path_source_link` attributes for each article in your Pelican project.
-
-Those links are generated based on the article's source path relative to the root directory of your Pelican project. If the constant PATH is defined in pelicanconf.py, the plugin will use this value as the root directory. Otherwise, it will use the default value of "", which assumes that your Pelican project is located in the same directory as your pelicanconf.py file.

plugins/source-link/__init__.py

@@ -1 +0,0 @@
-from .source_link import *

plugins/source-link/source_link.py

@@ -1,37 +0,0 @@
-from pelican import signals
-import logging
-import os
-
-logger = logging.getLogger(__name__)
-from pelican.settings import DEFAULT_CONFIG
-
-
-def set_default_settings(settings):
-    settings.setdefault("GIT_SOURCE_BASE_URL", None)
-
-
-def init_default_config(pelican):
-    set_default_settings(DEFAULT_CONFIG)
-    if pelican:
-        set_default_settings(pelican.settings)
-
-
-def source_link_generator(article_generator):
-    git_source = article_generator.settings.get(
-        "GIT_SOURCE_BASE_URL", DEFAULT_CONFIG["GIT_SOURCE_BASE_URL"]
-    )
-    root_path = article_generator.settings.get("PATH", DEFAULT_CONFIG.get("PATH", ""))
-    for article in article_generator.articles:
-        article_path = os.path.abspath(os.path.join(root_path, article.source_path))
-        relative_path = os.path.relpath(article_path, root_path)
-        if git_source.endswith("/"):
-            article.source_link = f"{git_source}{relative_path}"
-        else:
-            article.source_link = f"{git_source}/{relative_path}"
-
-        article.path_source_link = "/".join(article.source_link.split("/")[:-1])
-
-
-def register():
-    signals.initialized.connect(init_default_config)
-    signals.article_generator_finalized.connect(source_link_generator)

publishconf.py

@@ -11,7 +11,7 @@ sys.path.append(os.curdir)
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = 'https://opytex.org/enseignements/2022-2023/'
+SITEURL = 'https://opytex.org/enseignements/2020-2021/'
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = 'feeds/all.atom.xml'

theme/static/stylesheet/variables.less

@@ -4,7 +4,6 @@
 @white:  #ffffff;
 @grey: #333333;
 @light-grey:  #eeeeee;
-@med-light-grey: #d9d8d8;
 @med-grey:  #999999;
 @dark-grey: #242121;
 
@@ -21,7 +20,7 @@
 @link-hover-color: @light-orange;
 
 // Sidebar (aside)
-@sidebar-bg: @dark-grey;
+@sidebar-bg: @grey;
 @sidebar-text-color: @white;
 @sidebar-link-color: @white;
 @sidebar-link-hover-color: @light-grey;
@@ -29,10 +28,8 @@
 // NavBar
 @navbar-bg: @dark-grey;
 @navbar-text-color: @white;
-
+@navbar-toctree-l1-sel-bg: @dark-grey;
-@navbar-toctree-l1-sel-bg: @med-light-grey;
+@navbar-toctree-l1-sel-txt: @light-grey;
-@navbar-toctree-l1-sel-txt: @grey;
-
 @navbar-toctree-l2-bg: @med-grey;
 @navbar-toctree-l2-txt: @grey;
 @navbar-toctree-l2-sel-bg: @light-grey;

theme/templates/article.html

@@ -48,16 +48,6 @@
       mod=article.locale_modified,
       category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }}
   </div>
-
-  {% if 'GIT_SOURCE_BASE_URL' %}
-  <div class="source">
-      <a href="{{ article.path_source_link}}">
-      <img src={{ SOURCE_ICON_URL }} alt="source icon" ario>
-      source et documents
-      </a>
-  </div>
-  {% endif %}
-
   <div class="tag-cloud">
       <p>
           {% if 'post_stats' in PLUGINS %}

theme/templates/base.html

@@ -86,9 +86,6 @@
     </div>
 
       <nav>
-        <label for="toggle">☰</label>
-        <input type="checkbox" id="toggle">
-
       {% if TOCTREE %}
           {% include "partial/toctree.html" %}
       {% endif %}

theme/templates/partial/toctree.html

@@ -1,5 +1,4 @@
 <ul class="toctree">
-    <h2>Niveaux</h2>
     {% for cat, articles in categories|sort %}
     {% if (article and article.category == cat) or category == cat %}
     <li class="toctree-l1 current"><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat | upper }}</a>