diff --git a/assets/sass/footer.scss b/assets/sass/footer.scss index ccb2fb8..d67b959 100644 --- a/assets/sass/footer.scss +++ b/assets/sass/footer.scss @@ -1,4 +1,34 @@ -footer { - margin-top: 1rem; - background-color: blue; +html { + height: 100%; +} +body { + min-height: 100%; + display: flex; + flex-direction: column; +} +.footer-push { + flex-grow: 1; + +} + +.site-footer { + border-top: .5rem solid #eeeeee; + margin-top: 1rem; + padding-top: 2rem; + padding-bottom: 4rem; + background-color: $background; + color: white; + + a { + color: white; + text-decoration: none; + } + a:hover { + opacity: 0.8; + text-decoration: underline; + } +} + +.site-footer__content { + } diff --git a/assets/sass/general.scss b/assets/sass/general.scss index 7f6792f..100b951 100644 --- a/assets/sass/general.scss +++ b/assets/sass/general.scss @@ -1,3 +1,20 @@ body { -font-family: sans-serif; + // font-family: 'Trebuchet MS', Tahoma,sans-serif; + font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; + margin: 0; +} + +h1 { + font-size: 1.75rem; +} + +h2 { + font-size: 1.4rem; +} + +a { + color: $secondary; +} +a:hover { + opacity: 0.8; } diff --git a/assets/sass/header.scss b/assets/sass/header.scss index aeb6197..03f8f30 100644 --- a/assets/sass/header.scss +++ b/assets/sass/header.scss @@ -1,4 +1,47 @@ -header { - background: #d35400; +$header-height: 6.5rem; + +.site-header { + background: $background; margin-bottom: 1rem; + color: white; + height: $header-height; +} + +.site-header__content { + height: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} + +.site-header__nav { + a { + color: white; + text-decoration: none; + } + a:hover { + opacity: 0.8; + text-decoration: underline; + } +} + +.site-header__title { + height: 100%; +} + +.site-header__logo { + width: $header-height; + height: 100%; +} + +@media (max-width: $md-breakpoint) { + .site-header .page-container { + width: 100% !important; + } + .site-header__title { + padding-right: 1rem; + } + .site-header__nav { + line-height: 2rem; + } } diff --git a/assets/sass/main.scss b/assets/sass/main.scss index c9d18c9..9ff43ee 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -3,8 +3,10 @@ $md-breakpoint: 1100px; $sm-breakpoint: 900px; $xs-breakpoint: 400px; -$primary: #ff00ff; -$secondary: red; + +$background: #4f607a; +$primary: #ffb500; +$secondary: #f15a24; .pagination-nav { margin-top: 1em; diff --git a/assets/sass/page_container.scss b/assets/sass/page_container.scss index 1d56355..c3f24cd 100644 --- a/assets/sass/page_container.scss +++ b/assets/sass/page_container.scss @@ -2,32 +2,38 @@ width: 80%; margin: 0 auto; } +.page-full { + padding: 0 2rem; +} @media (min-width: $lg-breakpoint) { - .page-container { - width: 58%; - } + .page-container { + width: 58%; + } } @media (min-width: $md-breakpoint) { - .page-container { - width: 65%; - } + .page-container { + width: 65%; + } } @media (max-width: $md-breakpoint) { - .page-container { - width: 75%; - } + .page-container { + width: 75%; + } } @media (max-width: $sm-breakpoint) { - .page-container { - width: 90%; - } + .page-container { + width: 90%; + } + .page-full { + padding: 0; + } } @media (max-width: $xs-breakpoint) { - + } diff --git a/content/contact/index.md b/content/contact/index.md new file mode 100644 index 0000000..9c94d55 --- /dev/null +++ b/content/contact/index.md @@ -0,0 +1,21 @@ +--- +title: Nous contacter +--- + +## Par courrier électronique + +Pour l'instant, nous disposons de l'adresse e-mail : [](mailto:) + +## Par voie postale + +``` +7 Allée des sources +27940 Le Val d'Hazey +``` + +## Sur le groupe facebook + +C'est là ou l'association s'est initialement formé, si vous avez un compte facebook et que vous n'avez pas de soucis avec cette plate-forme : + +[facebook.com/groups/bethleemaubevoye](https://www.facebook.com/groups/bethleemaubevoye) + diff --git a/content/images/1/index.md b/content/images/1/index.md index e668264..257e986 100644 --- a/content/images/1/index.md +++ b/content/images/1/index.md @@ -11,6 +11,6 @@ L'autel principal dans enfoncement en demi-lune photographié du temps de M. et On apperçoit un mini-tabernacle sur l'autel avec une croix et deux chandeliers. -Le Tabernacle est plus petit que celui disposé sur le même autel sur une [photo de l'ensemble de la crypte](/images/00006/). +Le Tabernacle est plus petit que celui disposé sur le même autel sur une [photo de l'ensemble de la crypte](/images/6/). On remarque la précense de l'étoile encore intacte. diff --git a/content/images/23/index.md b/content/images/23/index.md new file mode 100644 index 0000000..31a3d98 --- /dev/null +++ b/content/images/23/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: CP_vieille_eglise_de_Bethleem_monique_poree.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/23/original.jpg b/content/images/23/original.jpg new file mode 100755 index 0000000..45cb554 Binary files /dev/null and b/content/images/23/original.jpg differ diff --git a/content/images/24/index.md b/content/images/24/index.md new file mode 100644 index 0000000..21a93f3 --- /dev/null +++ b/content/images/24/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: IMG_2561.JPG +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/24/original.jpg b/content/images/24/original.jpg new file mode 100755 index 0000000..ae7493b Binary files /dev/null and b/content/images/24/original.jpg differ diff --git a/content/images/25/index.md b/content/images/25/index.md new file mode 100644 index 0000000..b9f7758 --- /dev/null +++ b/content/images/25/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 474_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/25/original.jpg b/content/images/25/original.jpg new file mode 100755 index 0000000..ba8b312 Binary files /dev/null and b/content/images/25/original.jpg differ diff --git a/content/images/26/index.md b/content/images/26/index.md new file mode 100644 index 0000000..4cc5d51 --- /dev/null +++ b/content/images/26/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 174_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/26/original.jpg b/content/images/26/original.jpg new file mode 100755 index 0000000..36ac965 Binary files /dev/null and b/content/images/26/original.jpg differ diff --git a/content/images/27/index.md b/content/images/27/index.md new file mode 100644 index 0000000..5b09f2f --- /dev/null +++ b/content/images/27/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: SFI290.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/27/original.jpg b/content/images/27/original.jpg new file mode 100755 index 0000000..258192f Binary files /dev/null and b/content/images/27/original.jpg differ diff --git a/content/images/28/index.md b/content/images/28/index.md new file mode 100644 index 0000000..0e31b38 --- /dev/null +++ b/content/images/28/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: WhatsApp Image 2022-01-14 at 14.05.16.jpeg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/28/original.jpg b/content/images/28/original.jpg new file mode 100755 index 0000000..6cfd584 Binary files /dev/null and b/content/images/28/original.jpg differ diff --git a/content/images/29/index.md b/content/images/29/index.md new file mode 100644 index 0000000..e9757c3 --- /dev/null +++ b/content/images/29/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 47FI2.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/29/original.jpg b/content/images/29/original.jpg new file mode 100755 index 0000000..bdd14e7 Binary files /dev/null and b/content/images/29/original.jpg differ diff --git a/content/images/3/index.md b/content/images/3/index.md index 0ccc312..506e30a 100644 --- a/content/images/3/index.md +++ b/content/images/3/index.md @@ -3,8 +3,8 @@ title: Dalle de la crypte cassée original_name: dalle-crypte-bethleem1.jpg mime_type: image/jpeg imtags: -- crypte -- etoile + - crypte + - etoile #inception: 2000-10-08 --- diff --git a/content/images/30/index.md b/content/images/30/index.md new file mode 100644 index 0000000..94f2b28 --- /dev/null +++ b/content/images/30/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: Bethleem1959.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/30/original.jpg b/content/images/30/original.jpg new file mode 100755 index 0000000..1b98c52 Binary files /dev/null and b/content/images/30/original.jpg differ diff --git a/content/images/31/index.md b/content/images/31/index.md new file mode 100644 index 0000000..8979808 --- /dev/null +++ b/content/images/31/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: WhatsApp Image 2022-01-14 at 14.02.33.jpeg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/31/original.jpg b/content/images/31/original.jpg new file mode 100755 index 0000000..785ca04 Binary files /dev/null and b/content/images/31/original.jpg differ diff --git a/content/images/32/index.md b/content/images/32/index.md new file mode 100644 index 0000000..2f48519 --- /dev/null +++ b/content/images/32/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: Extérieur de derrière la Vierge.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/32/original.jpg b/content/images/32/original.jpg new file mode 100755 index 0000000..ae99f4e Binary files /dev/null and b/content/images/32/original.jpg differ diff --git a/content/images/33/index.md b/content/images/33/index.md new file mode 100644 index 0000000..5150cae --- /dev/null +++ b/content/images/33/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 791_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/33/original.jpg b/content/images/33/original.jpg new file mode 100755 index 0000000..a79010e Binary files /dev/null and b/content/images/33/original.jpg differ diff --git a/content/images/34/index.md b/content/images/34/index.md new file mode 100644 index 0000000..d034298 --- /dev/null +++ b/content/images/34/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: Bethleem1950.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/34/original.jpg b/content/images/34/original.jpg new file mode 100755 index 0000000..886e7f9 Binary files /dev/null and b/content/images/34/original.jpg differ diff --git a/content/images/35/index.md b/content/images/35/index.md new file mode 100644 index 0000000..ad758f9 --- /dev/null +++ b/content/images/35/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 057_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/35/original.jpg b/content/images/35/original.jpg new file mode 100755 index 0000000..cff7525 Binary files /dev/null and b/content/images/35/original.jpg differ diff --git a/content/images/36/index.md b/content/images/36/index.md new file mode 100644 index 0000000..591e615 --- /dev/null +++ b/content/images/36/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 294_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/36/original.jpg b/content/images/36/original.jpg new file mode 100755 index 0000000..93ebdde Binary files /dev/null and b/content/images/36/original.jpg differ diff --git a/content/images/37/index.md b/content/images/37/index.md new file mode 100644 index 0000000..ebb7318 --- /dev/null +++ b/content/images/37/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 260_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/37/original.jpg b/content/images/37/original.jpg new file mode 100755 index 0000000..c79d174 Binary files /dev/null and b/content/images/37/original.jpg differ diff --git a/content/images/38/index.md b/content/images/38/index.md new file mode 100644 index 0000000..1d7e55f --- /dev/null +++ b/content/images/38/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 760_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/38/original.jpg b/content/images/38/original.jpg new file mode 100755 index 0000000..5b2ad94 Binary files /dev/null and b/content/images/38/original.jpg differ diff --git a/content/images/39/index.md b/content/images/39/index.md new file mode 100644 index 0000000..de94a0f --- /dev/null +++ b/content/images/39/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: SFI289.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/39/original.jpg b/content/images/39/original.jpg new file mode 100755 index 0000000..7dc21b8 Binary files /dev/null and b/content/images/39/original.jpg differ diff --git a/content/images/40/index.md b/content/images/40/index.md new file mode 100644 index 0000000..0afbdba --- /dev/null +++ b/content/images/40/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 498_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/40/original.jpg b/content/images/40/original.jpg new file mode 100755 index 0000000..8d5d64a Binary files /dev/null and b/content/images/40/original.jpg differ diff --git a/content/images/41/index.md b/content/images/41/index.md new file mode 100644 index 0000000..321bc86 --- /dev/null +++ b/content/images/41/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: bethleemcouleur.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/41/original.jpg b/content/images/41/original.jpg new file mode 100755 index 0000000..2ce9b74 Binary files /dev/null and b/content/images/41/original.jpg differ diff --git a/content/images/42/index.md b/content/images/42/index.md new file mode 100644 index 0000000..ab86a92 --- /dev/null +++ b/content/images/42/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 642_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/42/original.jpg b/content/images/42/original.jpg new file mode 100755 index 0000000..123a0de Binary files /dev/null and b/content/images/42/original.jpg differ diff --git a/content/images/43/index.md b/content/images/43/index.md new file mode 100644 index 0000000..297da8c --- /dev/null +++ b/content/images/43/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: c5c7b7e1072fb95616855f2803341202.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/43/original.jpg b/content/images/43/original.jpg new file mode 100755 index 0000000..a683152 Binary files /dev/null and b/content/images/43/original.jpg differ diff --git a/content/images/44/index.md b/content/images/44/index.md new file mode 100644 index 0000000..c77a49f --- /dev/null +++ b/content/images/44/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 741_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/44/original.jpg b/content/images/44/original.jpg new file mode 100755 index 0000000..8d1ca52 Binary files /dev/null and b/content/images/44/original.jpg differ diff --git a/content/images/45/index.md b/content/images/45/index.md new file mode 100644 index 0000000..f2462f8 --- /dev/null +++ b/content/images/45/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: SFI287_Bethleem_sept_1903.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/45/original.jpg b/content/images/45/original.jpg new file mode 100755 index 0000000..086ff30 Binary files /dev/null and b/content/images/45/original.jpg differ diff --git a/content/images/46/index.md b/content/images/46/index.md new file mode 100644 index 0000000..2f4e5b8 --- /dev/null +++ b/content/images/46/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 378_001.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/46/original.jpg b/content/images/46/original.jpg new file mode 100755 index 0000000..bfa1dc6 Binary files /dev/null and b/content/images/46/original.jpg differ diff --git a/content/images/47/index.md b/content/images/47/index.md new file mode 100644 index 0000000..9694f35 --- /dev/null +++ b/content/images/47/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: carte-postale-ancienne-27-aubevoye-chapelle-de-bethleem-animation-1912.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/47/original.jpg b/content/images/47/original.jpg new file mode 100755 index 0000000..372c70a Binary files /dev/null and b/content/images/47/original.jpg differ diff --git a/content/images/48/index.md b/content/images/48/index.md new file mode 100644 index 0000000..134fffd --- /dev/null +++ b/content/images/48/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: carte_postale.jpg +mime_type: image/jpeg +imtags: + - facade +--- + diff --git a/content/images/48/original.jpg b/content/images/48/original.jpg new file mode 100755 index 0000000..306f46a Binary files /dev/null and b/content/images/48/original.jpg differ diff --git a/content/images/49/index.md b/content/images/49/index.md new file mode 100644 index 0000000..7c0ea53 --- /dev/null +++ b/content/images/49/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: Crucifix au faite de la chapelle.jpg +mime_type: image/jpeg +imtags: + - interieur-nef +--- + diff --git a/content/images/49/original.jpg b/content/images/49/original.jpg new file mode 100755 index 0000000..0306ac6 Binary files /dev/null and b/content/images/49/original.jpg differ diff --git a/content/images/50/index.md b/content/images/50/index.md new file mode 100644 index 0000000..bc41547 --- /dev/null +++ b/content/images/50/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: Autel dans la chapelle au dessus de la grotte.jpg +mime_type: image/jpeg +imtags: + - interieur-nef +--- + diff --git a/content/images/50/original.jpg b/content/images/50/original.jpg new file mode 100755 index 0000000..280391f Binary files /dev/null and b/content/images/50/original.jpg differ diff --git a/content/images/51/index.md b/content/images/51/index.md new file mode 100644 index 0000000..b967084 --- /dev/null +++ b/content/images/51/index.md @@ -0,0 +1,8 @@ +--- +title: Image +original_name: 358_001.jpg +mime_type: image/jpeg +imtags: + - interieur-nef +--- + diff --git a/content/images/51/original.jpg b/content/images/51/original.jpg new file mode 100755 index 0000000..d1ff229 Binary files /dev/null and b/content/images/51/original.jpg differ diff --git a/content/images/52/index.md b/content/images/52/index.md new file mode 100644 index 0000000..f75a43b --- /dev/null +++ b/content/images/52/index.md @@ -0,0 +1,8 @@ +--- +title: Visite de Mgr Colomb (1) +mime_type: image/jpeg +imtags: + - visite-mgr-colomb +inception: 1897-09 +--- + diff --git a/content/images/52/original.jpg b/content/images/52/original.jpg new file mode 100755 index 0000000..cceb8fa Binary files /dev/null and b/content/images/52/original.jpg differ diff --git a/content/images/53/index.md b/content/images/53/index.md new file mode 100644 index 0000000..f01a89e --- /dev/null +++ b/content/images/53/index.md @@ -0,0 +1,7 @@ +--- +title: Visite de Mgr Colomb (2) +mime_type: image/jpeg +imtags: + - visite-mgr-colomb +inception: 1897-09 +--- diff --git a/content/images/53/original.jpg b/content/images/53/original.jpg new file mode 100755 index 0000000..e9fade8 Binary files /dev/null and b/content/images/53/original.jpg differ diff --git a/content/images/54/index.md b/content/images/54/index.md new file mode 100644 index 0000000..311c771 --- /dev/null +++ b/content/images/54/index.md @@ -0,0 +1,8 @@ +--- +title: Visite de Mgr Colomb (3) +mime_type: image/jpeg +imtags: + - visite-mgr-colomb +inception: 1897-09 +--- + diff --git a/content/images/54/original.jpg b/content/images/54/original.jpg new file mode 100755 index 0000000..1ed9cea Binary files /dev/null and b/content/images/54/original.jpg differ diff --git a/content/images/_index.md b/content/images/_index.md index 407f3f1..f875ebd 100644 --- a/content/images/_index.md +++ b/content/images/_index.md @@ -1,4 +1,4 @@ # Images -Vous trouverez ici une liste d'images. +Vous trouverez ici une liste d'images. N'hésitez pas à [nous contacter](/contact) pour envoyer vos photos ! diff --git a/import_mess/import_into_category.py b/import_mess/import_into_category.py index b1949bd..82b1b45 100644 --- a/import_mess/import_into_category.py +++ b/import_mess/import_into_category.py @@ -7,32 +7,44 @@ import os import shutil import magic import mimetypes +import json -DEFAULT_TAGS = ['crypte'] -SOURCE_DIR = './to_import_crypte/' +DEFAULT_TAGS = ['interieur-nef'] +SOURCE_DIR = './to_import_interieur_nef/' CONTENT_DIR = '../content/images/' # get the current index for the outputdir content_dir_files = os.listdir(CONTENT_DIR) current_index = 1 if len(content_dir_files) > 0: - current_index = max(sorted([int(r) for r in content_dir_files]))+1 + id_lists = [] + for dir in content_dir_files: + try: + dir_as_integer = int(dir) + except ValueError: + continue + id_lists.append(dir_as_integer) + current_index = max(sorted(id_lists))+1 print(f"current index is {current_index}") processed_images = [] to_import_files = os.listdir(SOURCE_DIR) +created_dirs = [] +final_image_list = [] for original_file_name in to_import_files: print(f'> {current_index} loading {original_file_name}') - new_dir_name = str(current_index).zfill(5) + '/' + # new_dir_name = str(current_index).zfill(5) + '/' + new_dir_name = str(current_index) + '/' if os.path.exists(CONTENT_DIR + new_dir_name): continue os.mkdir(CONTENT_DIR + new_dir_name) + created_dirs.append(new_dir_name) image_old_path = SOURCE_DIR + original_file_name mime_type = magic.from_file(image_old_path, mime=True) @@ -65,14 +77,19 @@ for original_file_name in to_import_files: image_md.write("title: Image\n") image_md.write(f"original_name: {img['original_name']}\n") image_md.write(f"mime_type: {img['mime_type']}\n") - image_md.write(f"tags: {img['tags']}\n") + image_md.write(f"imtags:\n") + for t in img['tags']: + image_md.write(f" - {t}\n") image_md.write("---\n") image_md.write("\n") # description about the image goes after (like the legend) image_md.close() + final_image_list.append(img) current_index += 1 +print(json.dumps(created_dirs)) +print(json.dumps(final_image_list)) # import json # import pathlib diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 5cbbb14..774ad61 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -21,8 +21,10 @@ +
{{ partial "header" . }} {{ block "main" . }}{{ end }} +
{{ partial "footer" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1a1abce..eeb4745 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+
{{ $listtitle := .Title }} {{ if or .Title .Content }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 83d814c..69b3639 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,16 +1,16 @@ {{ define "main" }} -
+

{{ .Title }}

-
Publié le
- {{ range .Params.tags }} - {{ . }} - {{ end }} - + {{ with .Date }} +
Publié le
+ {{ end }} + {{ range .Params.tags }} + {{ . }} + {{ end }}
{{ .Content }}
-{{ partial "sidebar.html" . }} {{ end }} diff --git a/layouts/images/list.html b/layouts/images/list.html index d8e5bfa..c665a96 100644 --- a/layouts/images/list.html +++ b/layouts/images/list.html @@ -1,4 +1,6 @@ {{ define "main" }} +
{{ .Scratch.Set "image_list_context" "all" }} {{ partial "images-list.html" . }} +
{{ end }} diff --git a/layouts/images/single.html b/layouts/images/single.html index fec4490..026bbb3 100644 --- a/layouts/images/single.html +++ b/layouts/images/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+
@@ -18,10 +18,12 @@ {{ end }}
+ {{ with .Params.original_name }}
Nom original :
- 
{{ .Params.original_name }}
+ 
{{ . }}
+ {{ end }}
{{ with .Params.inception }} @@ -67,10 +69,10 @@ {{ if or .Next .Prev -}}
{{- with .Prev }} -
Previous
 +
Précédente
 {{ end -}} {{- with .Next -}} -
Next
 +
Suivante
 {{ end -}}
{{ end -}} diff --git a/layouts/imtags/term.html b/layouts/imtags/term.html index 134d62c..a6ffd74 100644 --- a/layouts/imtags/term.html +++ b/layouts/imtags/term.html @@ -1,4 +1,6 @@ {{ define "main" }} +
{{ .Scratch.Set "image_list_context" "imtags" }} {{ partial "images-list.html" . }} +
{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 713d012..8176ab6 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,6 +1,7 @@ {{ define "main" }} -
+

Reconstruison pierre après pierre...

+ 🚧   Site en construction...   🚧 {{/* {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} {{ range $paginator.Pages }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index c4475df..86a69f2 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,4 +1,7 @@ -
- {{ .Site.Title }} - A propos de ce site + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index a2ddbd7..e30537e 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,15 +1,20 @@ -
- {{ strings.Repeat ( .Site.Title | len | add 5 ) "=" }}
- == {{ .Site.Title }} ==
- {{ strings.Repeat ( .Site.Title | len | add 5 ) "=" }} -
{{ .Site.Params.subtitle }}

- +
+
+ + + + +
diff --git a/layouts/partials/images-list.html b/layouts/partials/images-list.html index 3931503..fde0cd1 100644 --- a/layouts/partials/images-list.html +++ b/layouts/partials/images-list.html @@ -1,33 +1,31 @@ -
- -
-
- {{ $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 -}} -
-
+
+
+ {{ $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 $item := (.Paginator 8).Pages }} {{ $image := .Resources.GetMatch "original.jpg" }} @@ -52,8 +50,7 @@ {{ end }} -
- {{ partial "pagination.html" . }}
+ {{ partial "pagination.html" . }}
-
+
diff --git a/static/etoile_de_bethleem.svg b/static/etoile_de_bethleem.svg deleted file mode 100644 index 3e0d481..0000000 --- a/static/etoile_de_bethleem.svg +++ /dev/null @@ -1 +0,0 @@ -LOGO_BETHLEEM_V12 \ No newline at end of file diff --git a/static/logo.svg b/static/logo.svg new file mode 100644 index 0000000..e7ac97a --- /dev/null +++ b/static/logo.svg @@ -0,0 +1,129 @@ + + + + + LOGO_BETHLEEM_V12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +