38 Commits

Author SHA1 Message Date
29a9a51543 import .drone.yml from master
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 16:51:17 +02:00
e6642eaeaa change source for pelican
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 16:27:51 +02:00
8674186937 fix: variable substition
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:25:59 +02:00
61bf2af24c fix: variable...
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:25:03 +02:00
ae080680ad Fix: variable syntax
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:22:14 +02:00
b87388939f feat: drone for 2022-2023 branch
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-25 16:20:06 +02:00
340f10a023 Fix: change source-link base url 2023-04-15 05:57:15 +02:00
435c787b2e Fix: pelicanconf import
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 14:44:55 +02:00
cb9820afa5 Fix: add __init__.py
Some checks failed
continuous-integration/drone/push Build is failing
2023-04-14 14:43:10 +02:00
5f7dea074e Fix: formating
Some checks failed
continuous-integration/drone/push Build is failing
2023-04-14 14:41:25 +02:00
0194eb763e Fix: years 2023-04-14 14:40:51 +02:00
0d4e4d74b0 Feat(core): update .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 14:29:07 +02:00
1ae89f63d0 Feat(plugin): enable source-link plugin 2023-04-14 14:26:11 +02:00
d90ed8149d Feat(plugin): add link to sources in template 2023-04-14 14:25:52 +02:00
dab40dddd0 Fix: " et ' 2023-04-14 13:57:39 +02:00
9a2d687434 Feat(core): add css build command 2023-04-14 13:56:58 +02:00
7ea7fba87c Feat(plugin): add source-link plugin 2023-04-14 13:56:29 +02:00
ae45ff7d42 Feat: add pre-commit config 2023-04-14 13:56:14 +02:00
75060070b9 Feat: change border size for toctree 2022-08-31 06:52:14 +02:00
0607f2a69a Feat: hamburger button for phonemode 2022-08-31 06:29:42 +02:00
1764489028 Feat: remove nav and toctree in small screen 2022-08-31 05:58:33 +02:00
b6b089542e Feat: add big-button plugin 2022-08-29 08:01:10 +02:00
735cd0bd59 Feat: improve img readability 2022-08-28 22:17:35 +02:00
dc470aec10 Feat: Update nav bar 2022-08-28 21:21:02 +02:00
f2adf72aa0 Feat: start 2022-2023 from 2021-2022 2022-08-21 08:40:09 +02:00
0653ac2bf8 Feat: add umami js code for analytics:
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-15 09:21:40 +02:00
5b9910bb0f Feat: adapt drone.yml to 2021-2022
Some checks failed
continuous-integration/drone/push Build is failing
2021-08-23 14:34:58 +02:00
dbbb0b5ecf Feat: Adapt to year 2021-2022 2021-08-22 18:02:57 +02:00
6060a52717 Feat: filter article in pagetree.
All checks were successful
continuous-integration/drone/push Build is passing
If "Semaine" in tags, it does not show up
2020-12-05 06:53:01 +01:00
12d10e6ace Feat: remove pelican-page-hierarchy
All checks were successful
continuous-integration/drone/push Build is passing
2020-08-25 10:54:59 +02:00
abe52dd5c9 Merge branch '2020-2021' of git_opytex:lafrite/site_opytex into 2020-2021 2020-08-25 10:50:12 +02:00
1c92eedfb2 Feat: activation pdf-img 2020-08-25 10:49:49 +02:00
1f34a326ad Feat: activate pdf-img
All checks were successful
continuous-integration/drone/push Build is passing
2020-08-25 10:43:02 +02:00
d6e575ea45 Fix: link to projets-informatiques
All checks were successful
continuous-integration/drone/push Build is passing
2020-08-16 10:33:41 +02:00
438251f75d Feat: remove link to bopytex and mapytex
All checks were successful
continuous-integration/drone/push Build is passing
2020-08-16 10:28:43 +02:00
b720e17c61 Fix: add requirements
All checks were successful
continuous-integration/drone/push Build is passing
2020-08-07 18:27:22 +02:00
02dbc94f31 Feat: add .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2020-08-07 18:24:12 +02:00
dd92f1a77e Feat: adapt to year 2019-2020 2020-08-07 18:22:40 +02:00
22 changed files with 822 additions and 438 deletions

101
.drone.yml Normal file
View File

@@ -0,0 +1,101 @@
---
kind: pipeline
name: Opytex Main
type: docker
trigger:
branch:
- master
steps:
- name: Build Opytex base
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
- 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
volumes:
- name: pelican-output
path: /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: /
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: {}

1
.gitignore vendored
View File

@@ -6,3 +6,4 @@ content
__pycache__
*.pid
venv/
.vim/

15
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,15 @@
---
# 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

View File

@@ -49,8 +49,10 @@ help:
@echo 'Set the RELATIVE variable to 1 to enable relative urls '
@echo ' '
html:
css:
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:

0
__init__.py Normal file
View File

View File

@@ -10,9 +10,8 @@ MENUITEMS = [
#("Dernières modifications", SITEURL+"blog_index.html"),
("Accueil", "/"),
("Contenus de cours", "/pages/tout-sur-mes-cours.html"),
('blog', '/blog_index.html'),
('Opytex', "/opytex/"),
("pyMath", "/pymath/"),
('Blog', '/blog_index.html'),
('Informatique', "/pages/projets-informatiques.html"),
('À propos', "/pages/a-propos.html"),
]

View File

@@ -3,35 +3,35 @@
from __future__ import unicode_literals
import os
import sys
sys.path.append(os.curdir)
from globalconf import *
AUTHOR = 'Benjamin Bertrand'
SITENAME = 'OpyTex'
SITETITLE = 'OpyTex'
SITESUBTITLE = "DEV"
#SITEURL = 'https://0.0.0.0:8000/enseignements/DEV'
SITEURL = ''
AUTHOR = "Benjamin Bertrand"
SITENAME = "OpyTex"
SITETITLE = "OpyTex"
SITESUBTITLE = "2022-2023"
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']
ARTICLE_PATHS = ['.']
STATIC_PATHS = ['.']
INDEX_SAVE_AS = 'blog_index.html'
# PAGE_PATHS = ['pages']
ARTICLE_PATHS = ["."]
STATIC_PATHS = ["."]
INDEX_SAVE_AS = "blog_index.html"
#
USE_FOLDER_AS_CATEGORY = False
@@ -39,18 +39,19 @@ USE_FOLDER_AS_CATEGORY = False
# Plugins
PLUGIN_PATHS = ["plugins"]
PLUGINS = [
'i18n_subsites',
"pelican-page-hierarchy",
"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>.*)\..*'
ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = '{path_no_ext}.html'
PATH_METADATA = "(?P<path_no_ext>.*)\..*"
ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = "{path_no_ext}.html"
# USE_FOLDER_AS_CATEGORY = True
# DEFAULT_CATEGORY = "Autre"
@@ -58,7 +59,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.
@@ -80,7 +81,7 @@ DISPLAY_PAGES_ON_SIDE = False
TOCTREE = True
TAG_CLOUD = True
#SITELOGO = ""
# SITELOGO = ""
LINKS = ()
DEFAULT_PAGINATION = 10
@@ -90,3 +91,7 @@ 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/spazz/2022-2023/src/branch/main"
SOURCE_ICON_URL = "https://git.opytex.org/assets/img/logo.svg"

View File

@@ -5,16 +5,18 @@ 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)

View File

View File

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

View File

@@ -0,0 +1,66 @@
# -*- 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)

View File

@@ -0,0 +1,31 @@
# 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.

View File

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

View File

@@ -0,0 +1,37 @@
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)

View File

@@ -7,19 +7,21 @@ from __future__ import unicode_literals
import os
import sys
sys.path.append(os.curdir)
from pelicanconf import *
# If your site is available via HTTPS, make sure SITEURL begins with https://
SITEURL = 'n'
SITEURL = "https://opytex.org/enseignements/2022-2023/"
RELATIVE_URLS = False
FEED_ALL_ATOM = 'feeds/all.atom.xml'
CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
FEED_ALL_ATOM = "feeds/all.atom.xml"
CATEGORY_FEED_ATOM = "feeds/{slug}.atom.xml"
DELETE_OUTPUT_DIRECTORY = True
# Following items are often useful when publishing
#DISQUS_SITENAME = ""
#GOOGLE_ANALYTICS = ""
# DISQUS_SITENAME = ""
# GOOGLE_ANALYTICS = ""

15
requirements.txt Normal file
View File

@@ -0,0 +1,15 @@
beautifulsoup4==4.9.1
blinker==1.4
bs4==0.0.1
docutils==0.16
feedgenerator==1.9.1
Jinja2==2.11.2
MarkupSafe==1.1.1
pelican==4.2.0
Pygments==2.6.1
python-dateutil==2.8.1
pytz==2020.1
six==1.15.0
soupsieve==2.0.1
Unidecode==1.1.1
Wand==0.6.2

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

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

View File

@@ -48,6 +48,16 @@
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 %}

View File

@@ -86,6 +86,9 @@
</div>
<nav>
<label for="toggle"></label>
<input type="checkbox" id="toggle">
{% if TOCTREE %}
{% include "partial/toctree.html" %}
{% endif %}
@@ -143,5 +146,6 @@
</main>
{% block additional_js %}{% endblock %}
<script type="text/javascript" async defer data-website-id="2cb9cd4c-66da-4e4f-9e84-a2d53c7b07bc" src="https://stat.opytex.org/umami.js"></script>
</body>
</html>

View File

@@ -1,13 +1,16 @@
<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>
<ul>
{% for art in articles | sort(attribute="date") %}
{% if article == art %}
<li class="toctree-l2 current"><span>{{ art.title }}</span></li>
{% else %}
<li class="toctree-l2"><a href="{{ SITEURL }}/{{ art.url }}">{{ art.title }}</a></li>
{% if "Semaine" not in art.tags%}
{% if article == art %}
<li class="toctree-l2 current"><span>{{ art.title }}</span></li>
{% else %}
<li class="toctree-l2"><a href="{{ SITEURL }}/{{ art.url }}">{{ art.title }}</a></li>
{% endif %}
{% endif %}
{% endfor %}
</ul>