diff --git a/config.toml b/config.toml index f7b5237..026c2e3 100644 --- a/config.toml +++ b/config.toml @@ -4,7 +4,7 @@ defaultContentLanguage = 'fr' title = "L'Étoile de Bethléem" [taxonomies] -image-tag = 'image-tags' +imtag = 'imtags' # theme = "custom" diff --git a/content/images/1/index.md b/content/images/1/index.md index 41a4605..e668264 100644 --- a/content/images/1/index.md +++ b/content/images/1/index.md @@ -2,7 +2,7 @@ title: Autel principal original_name: L'autel à l'intérieur.jpg mime_type: image/jpeg -tags: +imtags: - crypte - autel-principal --- diff --git a/content/images/10/index.md b/content/images/10/index.md index bd29955..7aede62 100644 --- a/content/images/10/index.md +++ b/content/images/10/index.md @@ -2,7 +2,7 @@ title: Avant de la crypte original_name: crypte_carte_postale.jpg mime_type: image/jpeg -tags: +imtags: - crypte --- diff --git a/content/images/11/index.md b/content/images/11/index.md index 6d76b48..dc3752f 100644 --- a/content/images/11/index.md +++ b/content/images/11/index.md @@ -2,7 +2,7 @@ title: Ensemble mangeoir, étable original_name: etable.jpg mime_type: image/jpeg -tags: +imtags: - crypte - mangeoir # etable diff --git a/content/images/12/index.md b/content/images/12/index.md index a4dcc1f..d59e93c 100644 --- a/content/images/12/index.md +++ b/content/images/12/index.md @@ -2,7 +2,7 @@ title: Entrée de la crypte en 1896 original_name: Aubevoye_-_Bethléem_-_entrée_de_la_crypte_-_1896.jpg mime_type: image/jpeg -tags: +imtags: - crypte - entrée-crypte inception: 1896 diff --git a/content/images/13/index.md b/content/images/13/index.md index 01479ad..f403131 100644 --- a/content/images/13/index.md +++ b/content/images/13/index.md @@ -2,6 +2,6 @@ title: La vierge éclairée original_name: 935_001.jpg mime_type: image/jpeg -tags: ['crypte', 'loge-vierge'] +imtags: ['crypte', 'loge-vierge'] --- diff --git a/content/images/14/index.md b/content/images/14/index.md index 15345f6..d398c62 100644 --- a/content/images/14/index.md +++ b/content/images/14/index.md @@ -2,6 +2,6 @@ title: Ensemble crypte original_name: 47FI3.jpg mime_type: image/jpeg -tags: ['crypte', 'ensemble-crypte'] +imtags: ['crypte', 'ensemble-crypte'] --- diff --git a/content/images/14/original.jpg b/content/images/14/original.jpg old mode 100755 new mode 100644 index 6bbb1e9..7dc5a3a Binary files a/content/images/14/original.jpg and b/content/images/14/original.jpg differ diff --git a/content/images/16/index.md b/content/images/16/index.md index e8a4838..ec917fc 100644 --- a/content/images/16/index.md +++ b/content/images/16/index.md @@ -2,6 +2,6 @@ title: Mangeoir, Étable original_name: 629_001.jpg mime_type: image/jpeg -tags: ['crypte', 'mangeoir'] +imtags: ['crypte', 'mangeoir'] --- diff --git a/content/images/17/index.md b/content/images/17/index.md index 6b5aa00..6260771 100644 --- a/content/images/17/index.md +++ b/content/images/17/index.md @@ -2,6 +2,6 @@ title: Mangeoir, étable original_name: 865_001.jpg mime_type: image/jpeg -tags: ['crypte', 'mangeoir'] +imtags: ['crypte', 'mangeoir'] --- diff --git a/content/images/18/index.md b/content/images/18/index.md index 2ea9318..eacd2d3 100644 --- a/content/images/18/index.md +++ b/content/images/18/index.md @@ -2,7 +2,7 @@ title: Dessin de l'entrée de la crypte original_name: Bethleem-pot-crypte.jpg mime_type: image/jpeg -tags: +imtags: - crypte - entrée-crypte --- diff --git a/content/images/19/index.md b/content/images/19/index.md index 3735d59..bee331f 100644 --- a/content/images/19/index.md +++ b/content/images/19/index.md @@ -2,7 +2,7 @@ title: Le plafond de la grotte avec ses lampes original_name: Le plafond de la grotte avec ses lampes.jpg mime_type: image/jpeg -tags: +image_imtags: - crypte - lampes - ensemble-crypte diff --git a/content/images/2/index.md b/content/images/2/index.md index f648460..6b4e0c3 100644 --- a/content/images/2/index.md +++ b/content/images/2/index.md @@ -2,7 +2,7 @@ title: Ensemble crypte original_name: Aubevoye_-_Bethléem_-_la_crypte_en_1896.jpg mime_type: image/jpeg -tags: +imtags: - crypte - ensemble-crypte inception: 1896 diff --git a/content/images/20/index.md b/content/images/20/index.md index 5d11b86..3de6b99 100644 --- a/content/images/20/index.md +++ b/content/images/20/index.md @@ -2,6 +2,6 @@ title: Entrée de la crypte aujourd'hui original_name: entree-crypte-bethleem-2.jpg mime_type: image/jpeg -tags: ['crypte', 'entrée-crypte'] +imtags: ['crypte', 'entrée-crypte'] --- diff --git a/content/images/21/index.md b/content/images/21/index.md index 633e5b5..28cc766 100644 --- a/content/images/21/index.md +++ b/content/images/21/index.md @@ -2,7 +2,7 @@ title: Autel des rois mages original_name: Une petite statue de la Vierge à l'intérieur de la grotte.jpg mime_type: image/jpeg -tags: +imtags: - crypte - autel-rois-mages --- diff --git a/content/images/22/index.md b/content/images/22/index.md index bed5d67..f4dad6c 100644 --- a/content/images/22/index.md +++ b/content/images/22/index.md @@ -2,6 +2,6 @@ title: Statue de la Vierge original_name: WhatsApp Image 2022-01-14 at 14.04.04.jpeg mime_type: image/jpeg -tags: ['crypte', 'loge-vierge'] +imtags: ['crypte', 'loge-vierge'] --- diff --git a/content/images/3/index.md b/content/images/3/index.md index 8592059..a62059b 100644 --- a/content/images/3/index.md +++ b/content/images/3/index.md @@ -2,7 +2,7 @@ title: Dalle de la crypte cassée original_name: dalle-crypte-bethleem1.jpg mime_type: image/jpeg -tags: +imtags: - crypte - etoile --- diff --git a/content/images/5/index.md b/content/images/5/index.md index be82984..d402817 100644 --- a/content/images/5/index.md +++ b/content/images/5/index.md @@ -2,7 +2,7 @@ title: Entrée de la crypte original_name: entree-crypte-bethleem-11.jpg mime_type: image/jpeg -tags: ['crypte', 'entrée-crypte'] +imtags: ['crypte', 'entrée-crypte'] --- diff --git a/content/images/6/index.md b/content/images/6/index.md index f77bcc8..e668e80 100644 --- a/content/images/6/index.md +++ b/content/images/6/index.md @@ -2,7 +2,7 @@ title: Ensemble crypte original_name: WhatsApp Image 2022-01-14 at 14.03.06.jpeg mime_type: image/jpeg -tags: ['crypte', 'ensemble-crypte'] +imtags: ['crypte', 'ensemble-crypte'] inception: from: 1950 to: 2000 diff --git a/content/images/7/index.md b/content/images/7/index.md index 33c3853..a70f273 100644 --- a/content/images/7/index.md +++ b/content/images/7/index.md @@ -2,7 +2,7 @@ title: Mangeoir, étable original_name: WhatsApp Image 2022-01-14 at 14.05.16.jpeg mime_type: image/jpeg -tags: +imtags: - crypte - mangeoir --- diff --git a/content/images/8/index.md b/content/images/8/index.md index efaccf9..1572a95 100644 --- a/content/images/8/index.md +++ b/content/images/8/index.md @@ -2,6 +2,6 @@ title: Mangeoir, étable original_name: Reproduction de la grotte de la nativité.jpg mime_type: image/jpeg -tags: ['crypte', 'mangeoir'] +imtags: ['crypte', 'mangeoir'] --- diff --git a/content/images/9/index.md b/content/images/9/index.md index 0cb7765..079f772 100644 --- a/content/images/9/index.md +++ b/content/images/9/index.md @@ -2,7 +2,7 @@ title: Statue de la Vierge original_name: La statue de la Vierge à l'intérieur de la grotte.jpg mime_type: image/jpeg -tags: +imtags: - crypte - loge-vierge --- diff --git a/import_mess/rebuild_current_images.py b/import_mess/rebuild_current_images.py index 3967515..c9d3450 100644 --- a/import_mess/rebuild_current_images.py +++ b/import_mess/rebuild_current_images.py @@ -15,12 +15,11 @@ for dir in images_dirs: # change tags to image-tags path = CONTENT_DIR + dir + '/index.md' print(path) - index_file = open(path, 'w+') - - content = index_file.read() - print(content) - content = content.replace('tags:', 'image-tags:') - print(content) + # index_file = open(path, 'w+') + # content = index_file.read() + # print(content) + # content = content.replace('tags:', 'image-tags:') + # print(content) break index_file.write(content) index_file.close() diff --git a/layouts/image-tags/term.html b/layouts/image-tags/term.html deleted file mode 100644 index a3177d3..0000000 --- a/layouts/image-tags/term.html +++ /dev/null @@ -1 +0,0 @@ -Term page for image tag diff --git a/layouts/image-tags/terms.html b/layouts/image-tags/terms.html deleted file mode 100644 index 6155017..0000000 --- a/layouts/image-tags/terms.html +++ /dev/null @@ -1 +0,0 @@ -List of images tags diff --git a/layouts/images/list.html b/layouts/images/list.html index 5b89967..d8e5bfa 100644 --- a/layouts/images/list.html +++ b/layouts/images/list.html @@ -1,55 +1,4 @@ {{ define "main" }} -
- -
-
- {{ $listtitle := .Title }} - {{ if or .Title .Content }} -
- {{ with .Title }}

{{ . }}

{{ end }} - {{ with .Content }}
{{ . }}
{{ end }} -
- {{ end }} -
Filtrer par étiquettes
-
- -
-
- -
-
- {{ range (.Paginator 8).Pages }} - - {{ $image := .Resources.GetMatch "original.jpg" }} - {{ $image := $image.Resize "x350" }} - {{ with $image }} - - {{ end }} - - {{/* -
- {{ if eq $listtitle "Posts" }} - {{ .Date.Format "2006-01-02" }} {{.Title }} - {{ else }} - {{.Title }} - {{ end }} -
- */}} - - - {{ end }} -
- {{ partial "pagination.html" . }} -
-
-
+{{ .Scratch.Set "image_list_context" "all" }} +{{ partial "images-list.html" . }} {{ end }} diff --git a/layouts/images/single.html b/layouts/images/single.html index 86b909e..8ddc6da 100644 --- a/layouts/images/single.html +++ b/layouts/images/single.html @@ -13,8 +13,8 @@ diff --git a/layouts/imtags/term.html b/layouts/imtags/term.html new file mode 100644 index 0000000..134d62c --- /dev/null +++ b/layouts/imtags/term.html @@ -0,0 +1,4 @@ +{{ define "main" }} +{{ .Scratch.Set "image_list_context" "imtags" }} +{{ partial "images-list.html" . }} +{{ end }} diff --git a/layouts/partials/images-list.html b/layouts/partials/images-list.html new file mode 100644 index 0000000..0f6a5ad --- /dev/null +++ b/layouts/partials/images-list.html @@ -0,0 +1,58 @@ +
+ +
+
+ {{ $listtitle := .Title }} + {{ if or .Title .Content }} +
+ {{ with .Title }}

{{ . }}

{{ end }} + {{ with .Content }}
{{ . }}
{{ end }} +
+ {{ end }} +
Filtrer par étiquettes
+
+
    + {{- if eq (.Scratch.Get "image_list_context") "imtags" -}} +
  • + Tout +
    • + {{- end -}} + {{- range .Site.Taxonomies.imtags -}} +
  • + {{ .Page.Title }} +
    • + {{- end -}} +
+
+
+ +
+
+ {{ range (.Paginator 8).Pages }} + + {{ $image := .Resources.GetMatch "original.jpg" }} + {{ $image := $image.Resize "x350" }} + {{ with $image }} + + {{ end }} + + {{/* +
+ {{ if eq $listtitle "Posts" }} + {{ .Date.Format "2006-01-02" }} {{.Title }} + {{ else }} + {{.Title }} + {{ end }} +
+ */}} + + + {{ end }} +
+ {{ partial "pagination.html" . }} +
+
+