diff --git a/Makefile b/Makefile index bf9bf73..0071170 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,9 @@ ifneq ($(PORT), 0) PELICANOPTS += -p $(PORT) endif +SSH_HOST = ciccio +SSH_TARGET_DIR = /var/lib/nethserver/vhost/conference + help: @echo 'Makefile for a pelican Web site ' @@ -70,6 +73,6 @@ publish: "$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS) rsync_upload: publish - rsync -avz $(OUTPUTDIR)/ $(SSH_HOST=:$(SSH_TARGET_DIR) + rsync -avz $(OUTPUTDIR)/ $(SSH_HOST):$(SSH_TARGET_DIR) .PHONY: html help clean regenerate serve serve-global devserver publish diff --git a/content/pages/2020.md b/content/pages/2020.md index ea15064..7e3e47c 100644 --- a/content/pages/2020.md +++ b/content/pages/2020.md @@ -24,11 +24,13 @@ disponibile. Per il momento, ecco il programma di massima: **Mattina**: + * 09:30 - 10:00 — Introduzione, accoglienza, *caffè digitale* * 10:00 - 10:30 — Saluti, rendicontazione, prospettive - LibreItalia * 10:30 - 13:00 — Interventi **Pomeriggio**: + * 14:00 - 16:30 — Tavola rotonda - Prima Parte * 16:30 - 17:00 — *Tè digitale* * 17:00 - 18:00 — Tavola rotonda - Seconda Parte diff --git a/output/2020/index.html b/output/2020/index.html index daea4f0..26854ce 100644 --- a/output/2020/index.html +++ b/output/2020/index.html @@ -46,14 +46,18 @@ Online definito. Questa pagina sarà aggiornata quando il programma definitivo sarà disponibile.

Per il momento, ecco il programma di massima:

-

Mattina: -* 09:30 - 10:00 — Introduzione, accoglienza, caffè digitale -* 10:00 - 10:30 — Saluti, rendicontazione, prospettive - LibreItalia -* 10:30 - 13:00 — Interventi

-

Pomeriggio: -* 14:00 - 16:30 — Tavola rotonda - Prima Parte -* 16:30 - 17:00 — Tè digitale -* 17:00 - 18:00 — Tavola rotonda - Seconda Parte

+

Mattina:

+ +

Pomeriggio:

+

— Registrazione

La partecipazione alla conferenza è gratuita e aperta al pubblico; a differenza delle edizioni precedenti, vista la modalità di partecipazione @@ -72,6 +76,12 @@ durante la giornata e una stanza Chillout, in cui incontrare gli altri partecipanti durante le pause o quando vorrete staccare dagli interventi.

+
+
diff --git a/output/archives.html b/output/archives.html index e53c47a..1ff08b6 100644 --- a/output/archives.html +++ b/output/archives.html @@ -31,6 +31,12 @@ +
+
diff --git a/output/authors.html b/output/authors.html index 2e347c7..8a45eb7 100644 --- a/output/authors.html +++ b/output/authors.html @@ -30,6 +30,12 @@ +
+
diff --git a/output/categories.html b/output/categories.html index a5fecaa..64bb162 100644 --- a/output/categories.html +++ b/output/categories.html @@ -30,6 +30,12 @@ +
+
diff --git a/output/feeds/all.atom.xml b/output/feeds/all.atom.xml index 6b3f7c4..47d80c2 100644 --- a/output/feeds/all.atom.xml +++ b/output/feeds/all.atom.xml @@ -1,2 +1,2 @@ -Conferenze - LibreItalia/2020-11-23T01:23:31Z \ No newline at end of file +Conferenze - LibreItalia/2020-11-23T01:44:03Z \ No newline at end of file diff --git a/output/live/index.html b/output/live/index.html index 9ba33d8..21e34d5 100644 --- a/output/live/index.html +++ b/output/live/index.html @@ -40,6 +40,15 @@ +
+
diff --git a/output/tags.html b/output/tags.html index dcd2e4d..3e9db9d 100644 --- a/output/tags.html +++ b/output/tags.html @@ -29,6 +29,12 @@
+
+
diff --git a/pelicanconf.py b/pelicanconf.py index 19f16a7..1e25886 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -28,8 +28,8 @@ DISPLAY_CATEGORIES_ON_MENU = False # Blue Penguin theme THEME = 'themes/blue-penguin' -DISPLAY_FOOTER = False DISPLAY_HOME = False +FOOTER = "Contenuti rilasciati con licenza CC-SA-BY 4.0" # Gum theme #THEME = 'themes/gum' @@ -67,7 +67,3 @@ AUTHOR_FEED_RSS = None # Uncomment following line if you want document-relative URLs when developing #RELATIVE_URLS = True - -# Deploy -SSH_HOST = "ciccio" -SSH_TARGET_DIR = "/var/lib/nethserver/vhost/conference" diff --git a/themes/blue-penguin/templates/base.html b/themes/blue-penguin/templates/base.html index 57ce1b0..bc3a7c4 100644 --- a/themes/blue-penguin/templates/base.html +++ b/themes/blue-penguin/templates/base.html @@ -80,23 +80,12 @@
{%- block content -%}{%- endblock %} - {% if DISPLAY_FOOTER or DISPLAY_FOOTER is not defined %} -
- - {% endif %} +
+