diff --git a/Makefile b/Makefile index db5961e..6ce9261 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ $(foreach size, $(IMG_SIZES), \ define convert-rule $(1):$(2) mkdir -p $(dir $(1)) - convert $(2) -resize $(3) $(1) + convert $(2) -resize $(3)x$(3) $(1) endef diff --git a/content/.gitignore b/content/.gitignore new file mode 100644 index 0000000..c291c09 --- /dev/null +++ b/content/.gitignore @@ -0,0 +1 @@ +images diff --git a/content/images_org/de.jpg b/content/extra/de.jpg similarity index 100% rename from content/images_org/de.jpg rename to content/extra/de.jpg diff --git a/content/images_org/en.jpg b/content/extra/en.jpg similarity index 100% rename from content/images_org/en.jpg rename to content/extra/en.jpg diff --git a/content/extra/lightgallery.css b/content/extra/lightgallery.css index ea35129..2dcd891 100644 --- a/content/extra/lightgallery.css +++ b/content/extra/lightgallery.css @@ -976,3 +976,4 @@ body:not(.lg-from-hash) .lg-outer.lg-start-zoom .lg-item.lg-complete .lg-object -o-transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s; transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s; } + diff --git a/content/images/.gitignore b/content/images/.gitignore deleted file mode 100644 index 88cc107..0000000 --- a/content/images/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.jpg -*.png diff --git a/content/images_org/quad/motor.jpg b/content/images_org/quad/motor.jpg index 4f02345..74f9283 100644 Binary files a/content/images_org/quad/motor.jpg and b/content/images_org/quad/motor.jpg differ diff --git a/content/pages/gallery/index_de.md b/content/pages/gallery/index_de.md index 347e80d..097ff2c 100644 --- a/content/pages/gallery/index_de.md +++ b/content/pages/gallery/index_de.md @@ -5,9 +5,29 @@ save_as: gallery/index.html lang: en template: page - Here you find latest pictures i am willing to share. Enjoy the views. + + +
+

Dynamic Tabs

+
+ + + + +
+

[lightgallery /images/gallery/IMG_3184.jpg, neighbour cat ; /images/gallery/IMG_3364.jpg, red-tailed bumblebee at a cornflower ; @@ -23,5 +43,36 @@ Here you find latest pictures i am willing to share. Enjoy the views. /images/gallery/IMG_9137.jpg, sunrise in Denmark ; /images/gallery/IMG_9393.jpg, harbour of grömitz at night; lightgalleryend] +
+

+[lightgallery + /images/gallery/IMG_3364.jpg, red-tailed bumblebee at a cornflower ; + /images/gallery/IMG_3386.jpg, garden bumblebee at a cornflower ; + /images/gallery/IMG_3414.jpg, garden bumblebee at a cornflower ; + /images/gallery/IMG_3477.jpg ; + /images/gallery/IMG_3483.jpg, thistle ; + /images/gallery/IMG_3559.jpg, carolina rose ; +lightgalleryend] +
+

+

nature

+[lightgallery + /images/gallery/IMG_8722.jpg, hotel in south denmark ; + /images/gallery/IMG_9037.jpg, sailingboat of the fisherman ; + /images/gallery/IMG_9097.jpg, sailingboat ; + /images/gallery/IMG_9136.jpg, sunrise in Denmark ; + /images/gallery/IMG_9137.jpg, sunrise in Denmark ; + /images/gallery/IMG_9393.jpg, harbour of grömitz at night; +lightgalleryend] +
+
+
+ -this is some gallery: + diff --git a/content/pages/gallery/index_en.md b/content/pages/gallery/index_en.md index 712f83a..5bc03b3 100644 --- a/content/pages/gallery/index_en.md +++ b/content/pages/gallery/index_en.md @@ -23,5 +23,3 @@ Here you find latest pictures i am willing to share. Enjoy the views. /images/gallery/IMG_9137.jpg, Sonnenaufgang in Dänemark ; /images/gallery/IMG_9393.jpg, Grömitzer Hafen bei Nacht ; lightgalleryend] - -this is some gallery: diff --git a/pelicanconf.py b/pelicanconf.py index b64821f..830c3c1 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -28,6 +28,8 @@ EXTRA_PATH_METADATA = { 'extra/lg-zoom.js': {'path': 'js/lg-zoom.js'}, 'extra/lightgallery.js': {'path': 'js/lightgallery.js'}, + 'extra/en.jpg': {'path': 'images/en.jpg'}, + 'extra/de.jpg': {'path': 'images/de.jpg'}, 'extra/lightgallery_setup.css': {'path': 'css/lightgallery_setup.css'}, 'extra/lightgallery.css': {'path': 'css/lightgallery.css'}, } @@ -129,8 +131,8 @@ INDEX_SAVE_AS = 'blog/index.html' SECTIONS = [ ('Blog', '/blog/', None), ('Projects', '/category/projects', [ - ('Projects', 'quadrocopter', '/category/projects/quadrocopter'), - ('Projects', '3d Printer', '/category/projects/3d-printer'), + ('quadrocopter', '/category/projects/quadrocopter'), + ('3d Printer', '/category/projects/3d-printer'), ]), ('less plastic', '/category/plasticfree/', None), ('Gallery', '/gallery', None), diff --git a/plugins/extended-sitemap_ b/plugins/extended-sitemap_ new file mode 160000 index 0000000..fb9e867 --- /dev/null +++ b/plugins/extended-sitemap_ @@ -0,0 +1 @@ +Subproject commit fb9e8672643bc1e103980bc3b10556f55ab52bee diff --git a/plugins/lightgallery/lightgallery.py b/plugins/lightgallery/lightgallery.py index 7f679dc..6e06917 100644 --- a/plugins/lightgallery/lightgallery.py +++ b/plugins/lightgallery/lightgallery.py @@ -73,7 +73,7 @@ def process_content(article): imgs_text += "\"> " imgs_text += "" - imgs_text += " " diff --git a/plugins/sitemap/sitemap.pyc b/plugins/sitemap/sitemap.pyc deleted file mode 100644 index 631bac1..0000000 Binary files a/plugins/sitemap/sitemap.pyc and /dev/null differ diff --git a/themes/bootstrap-4-blog-theme/LICENSE.md b/themes/bootstrap-4-blog-theme/LICENSE.md index f9fe8a7..a8abc8b 100644 --- a/themes/bootstrap-4-blog-theme/LICENSE.md +++ b/themes/bootstrap-4-blog-theme/LICENSE.md @@ -6,4 +6,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/themes/bootstrap-4-blog-theme/templates/article.html b/themes/bootstrap-4-blog-theme/templates/article.html index 815b337..c3a2b73 100644 --- a/themes/bootstrap-4-blog-theme/templates/article.html +++ b/themes/bootstrap-4-blog-theme/templates/article.html @@ -78,26 +78,4 @@
- - - - {% endblock %} diff --git a/themes/bootstrap-4-blog-theme/templates/base.html b/themes/bootstrap-4-blog-theme/templates/base.html index 8337336..b5c997b 100644 --- a/themes/bootstrap-4-blog-theme/templates/base.html +++ b/themes/bootstrap-4-blog-theme/templates/base.html @@ -74,6 +74,7 @@ +