updating templates to handle alts in photo posts

4 years ago · e8b9e01fa8
18 changed files with 26 additions and 243 deletions
--- a/content/photo/5eb2768f/index.md
+++ b/content/photo/5eb2768f/index.md
@ -1,13 +0,0 @@
---
-date: '2020-05-06 09:34:23'
-draft: false
-photo:
-    - /images/2020/05/1588754061638-782637-800.jpeg
-posttype: photo
-slug: 5eb2768f
-thumbnail:
-    - /images/2020/05/1588754061638-782637-300.jpeg
---
-I think I have found the issue
-
-Fingers crossed
--- a/content/photo/5eb5377e/index.md
+++ b/content/photo/5eb5377e/index.md
@ -6,7 +6,8 @@ category:
 date: '2020-05-08 11:42:06'
 draft: false
 photo:
-    - /images/2020/05/1588934524323-092934-800.jpeg
+    - value: /images/2020/05/1588934524323-092934-800.jpeg
+      alt: 'Photo of garden on a sunny day with some childrens toys lying about and a small child, mother and dog looking away from the camera in the background'
 posttype: photo
 slug: 5eb5377e
 thumbnail:
--- a/content/photo/5eb53f5f/index.md
+++ b/content/photo/5eb53f5f/index.md
@ -6,7 +6,8 @@ category:
    - scotland
    - squirrel
 photo:
-    - /images/2020/05/1588936542093-514188-800.jpeg
+    - value: /images/2020/05/1588936542093-514188-800.jpeg
+      alt: 'Close up shot of a grey squirrel facing downwards on the bark of a tree'
 posttype: photo
 slug: 5eb53f5f
 thumbnail:
--- a/content/photo/5eb5408c/index.md
+++ b/content/photo/5eb5408c/index.md
@ -8,8 +8,10 @@ category:
 date: '2020-05-08 12:20:44'
 draft: false
 photo:
-    - /images/2020/05/1588936842397-165081-800.jpeg
-    - /images/2020/05/1588936842545-520978-800.jpeg
+    - value: /images/2020/05/1588936842397-165081-800.jpeg
+      alt: 'A 2 year old girl, wearing a blue cardigan and dandelion crown, stands in front of a plate with carrots, broccoli and onigiri - eating onigiri'
+    - value: /images/2020/05/1588936842545-520978-800.jpeg
+      alt: 'A 2 year old girl, wearing a blue cardigan and dandelion crown, stands with her hands up, all covered in rice from onigiri'
 posttype: photo
 slug: 5eb5408c
 thumbnail:
--- a/content/photo/5eb84e82/index.md
+++ b/content/photo/5eb84e82/index.md
@ -1,11 +0,0 @@
---
-date: '2020-05-10 19:57:06'
-draft: false
-photo:
-    - /images/2020/05/1589137024117-759754-800.jpeg
-posttype: photo
-slug: 5eb84e82
-thumbnail:
-    - /images/2020/05/1589137024117-759754-300.jpeg
---
-Quick test 
--- a/content/photo/5ecc3cb5/index.md
+++ b/content/photo/5ecc3cb5/index.md
@ -1,11 +0,0 @@
---
-date: '2020-05-25 22:46:29'
-draft: false
-photo:
-    - /images/2020/05/1590443186940-612500-800.jpeg
-posttype: photo
-slug: 5ecc3cb5
-thumbnail:
-    - /images/2020/05/1590443186940-612500-300.jpeg
---
-Photo test..
--- a/content/photo/5ecc42b3/index.md
+++ b/content/photo/5ecc42b3/index.md
@ -1,11 +0,0 @@
---
-date: '2020-05-25 23:12:03'
-draft: false
-photo:
-    - /images/2020/05/1590444720310-103175-800.jpeg
-posttype: photo
-slug: 5ecc42b3
-thumbnail:
-    - /images/2020/05/1590444720310-103175-300.jpeg
---
-Let's test again.. 
--- a/content/photo/5ee01b61/index.md
+++ b/content/photo/5ee01b61/index.md
@ -2,7 +2,8 @@
 date: '2020-06-10 00:29:37'
 draft: false
 photo:
-    - 'https://jk.nipponalba.scot/media/../media/file-20200610002936-9294.jpg'
+    - value: 'https://jk.nipponalba.scot/media/../media/file-20200610002936-9294.jpg'
+      alt: 'Close up selfie of a smiling two year old girls face, looking adoringly at her papa. Her long brown hair is lit up by the sun, she is wearing a white t-shirt'
 posttype: photo
 slug: 5ee01b61
 thumbnail:
--- a/content/photo/5ee27be8/index.md
+++ b/content/photo/5ee27be8/index.md
@ -2,7 +2,8 @@
 date: '2020-06-11 19:46:00'
 draft: false
 photo:
-    - 'https://jk.nipponalba.scot/media/file-20200611194559-5699.jpg'
+    - value: 'https://jk.nipponalba.scot/media/file-20200611194559-5699.jpg'
+      alt: 'A photo of a black and white, medium sized dog with living room furniture and a kids easel in the background'
 posttype: photo
 slug: 5ee27be8
 thumbnail:
@ -10,8 +11,4 @@ thumbnail:
 visibility: public
 title: "Photo"
 ---
-Html tags begone!
-
-* Bullet point?
-
-So how do I get images to display?
+Tosh, patiently waiting for something..
--- a/content/photo/5ee5f1d0/bridgy.json
+++ b/content/photo/5ee5f1d0/bridgy.json
@ -1,176 +0,0 @@
-{
-  "account":{
-    "acct":"jk",
-    "avatar":"https://social.nipponalba.scot/media/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg?name=profile.jpg",
-    "avatar_static":"https://social.nipponalba.scot/media/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg?name=profile.jpg",
-    "bot":false,
-    "created_at":"2018-12-22T02:47:00.000Z",
-    "display_name":"J K \ud83c\uddef\ud83c\uddf5\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc73\udb40\udc63\udb40\udc74\udb40\udc7f",
-    "emojis":[
-
-    ],
-    "fields":[
-      {
-        "name":"homepage",
-        "value":"<a href=\"https://jk.nipponalba.scot\" rel=\"me\">jk.nipponalba.scot</a>"
-      },
-      {
-        "name":"pixelfed",
-        "value":"<a href=\"https://px.nipponalba.scot/jk\" rel=\"me\">jk@px.nipponalba.scot</a>"
-      },
-      {
-        "name":"pronouns",
-        "value":"he/him"
-      },
-      {
-        "name":"politics-y (fairly dormant atm) me",
-        "value":"<a href=\"https://social.nipponalba.scot/users/albannach\" rel=\"ugc\">@albannach</a>"
-      }
-    ],
-    "follow_requests_count":0,
-    "followers_count":301,
-    "following_count":363,
-    "header":"https://social.nipponalba.scot/media/0838527e6395e51213310a61e4fe5a297efe3b1bd0f96ec4ca9f668dbef65d3f.jpg?name=IMAG0613-edited.jpg",
-    "header_static":"https://social.nipponalba.scot/media/0838527e6395e51213310a61e4fe5a297efe3b1bd0f96ec4ca9f668dbef65d3f.jpg?name=IMAG0613-edited.jpg",
-    "id":"1",
-    "locked":false,
-    "note":"Quintessentially Celtic, vehemently Viking, passionately European, unashamedly, proudly Scottish, craft beer and single malt whisky lover, enthusiastic cook, vegan, perpetually exhausted dad.<br/><br/><a href=\"https://jk.nipponalba.scot\">https://jk.nipponalba.scot</a><br/><br/><a class=\"hashtag\" data-tag=\"nobot\" href=\"https://social.nipponalba.scot/tag/nobot\">#nobot</a>",
-    "pleroma":{
-      "allow_following_move":true,
-      "background_image":"https://social.nipponalba.scot/media/570bb010636742daca3b3255b0043f3a3b7be8b3921b10135de239a5ff4cdf8c.png?name=fatherline-haplogroup-frequencies.png",
-      "confirmation_pending":false,
-      "deactivated":false,
-      "hide_favorites":true,
-      "hide_followers":true,
-      "hide_followers_count":false,
-      "hide_follows":true,
-      "hide_follows_count":false,
-      "is_admin":true,
-      "is_moderator":true,
-      "notification_settings":{
-        "followers":true,
-        "follows":true,
-        "non_followers":true,
-        "non_follows":true,
-        "privacy_option":false
-      },
-      "relationship":{
-        "blocked_by":false,
-        "blocking":false,
-        "domain_blocking":false,
-        "endorsed":false,
-        "followed_by":false,
-        "following":false,
-        "id":"1",
-        "muting":false,
-        "muting_notifications":false,
-        "requested":false,
-        "showing_reblogs":true,
-        "subscribing":false
-      },
-      "skip_thread_containment":false,
-      "tags":[
-
-      ],
-      "unread_conversation_count":12693
-    },
-    "source":{
-      "fields":[
-        {
-          "name":"homepage",
-          "value":"<a href=\"https://jk.nipponalba.scot\" rel=me>jk.nipponalba.scot</a>"
-        },
-        {
-          "name":"pixelfed",
-          "value":"<a href=\"https://px.nipponalba.scot/jk\" rel=me>jk@px.nipponalba.scot</a>"
-        },
-        {
-          "name":"pronouns",
-          "value":"he/him"
-        },
-        {
-          "name":"politics-y (fairly dormant atm) me",
-          "value":"@albannach"
-        }
-      ],
-      "note":"Quintessentially Celtic, vehemently Viking, passionately European, unashamedly, proudly Scottish, craft beer and single malt whisky lover, enthusiastic cook, vegan, perpetually exhausted dad.\n\nhttps://jk.nipponalba.scot\n\n#nobot",
-      "pleroma":{
-        "actor_type":"Person",
-        "discoverable":true,
-        "no_rich_text":false,
-        "show_role":true
-      },
-      "privacy":"public",
-      "sensitive":false
-    },
-    "statuses_count":1382,
-    "url":"https://social.nipponalba.scot/users/jk",
-    "username":"jk"
-  },
-  "application":{
-    "name":"Web",
-    "website":null
-  },
-  "bookmarked":false,
-  "card":null,
-  "content":"My daughter\u2019s morning in 3 acts..<br/><br/><br/><br/> (<a href=\"https://jk.nipponalba.scot/media/file-20200614104551-9558.jpg\">https://jk.nipponalba.scot/media/file-20200614104551-9558.jpg</a>)",
-  "created_at":"2020-06-14T09:45:59.000Z",
-  "emojis":[
-
-  ],
-  "favourited":false,
-  "favourites_count":0,
-  "id":"9w4OLKtfsmjvzqgeDg",
-  "in_reply_to_account_id":null,
-  "in_reply_to_id":null,
-  "language":null,
-  "media_attachments":[
-    {
-      "description":"file.jpg",
-      "id":"-643834558",
-      "pleroma":{
-        "mime_type":"image/jpeg"
-      },
-      "preview_url":"https://social.nipponalba.scot/media/93f8bc241e6962cfb3b476037bd6facdda0e2a462a600942238cc14278c24550.jpg?name=file.jpg",
-      "remote_url":"https://social.nipponalba.scot/media/93f8bc241e6962cfb3b476037bd6facdda0e2a462a600942238cc14278c24550.jpg?name=file.jpg",
-      "text_url":"https://social.nipponalba.scot/media/93f8bc241e6962cfb3b476037bd6facdda0e2a462a600942238cc14278c24550.jpg?name=file.jpg",
-      "type":"image",
-      "url":"https://social.nipponalba.scot/media/93f8bc241e6962cfb3b476037bd6facdda0e2a462a600942238cc14278c24550.jpg?name=file.jpg"
-    }
-  ],
-  "mentions":[
-
-  ],
-  "muted":false,
-  "pinned":false,
-  "pleroma":{
-    "content":{
-      "text/plain":"My daughter\u2019s morning in 3 acts.. (https://jk.nipponalba.scot/media/file-20200614104551-9558.jpg)"
-    },
-    "conversation_id":11238153,
-    "direct_conversation_id":null,
-    "emoji_reactions":[
-
-    ],
-    "expires_at":null,
-    "in_reply_to_account_acct":null,
-    "local":true,
-    "spoiler_text":{
-      "text/plain":""
-    },
-    "thread_muted":false
-  },
-  "poll":null,
-  "reblog":null,
-  "reblogged":false,
-  "reblogs_count":0,
-  "replies_count":0,
-  "sensitive":false,
-  "spoiler_text":"",
-  "tags":[
-
-  ],
-  "uri":"https://social.nipponalba.scot/objects/293eb2ce-314d-4371-90c9-e1e834eb87a1",
-  "url":"https://social.nipponalba.scot/notice/9w4OLKtfsmjvzqgeDg",
-  "visibility":"public"
-}
--- a/content/photo/5ee5f1d0/index.md
+++ b/content/photo/5ee5f1d0/index.md
@ -2,11 +2,13 @@
 date: '2020-06-14 10:45:52'
 draft: false
 photo:
-    - 'https://jk.nipponalba.scot/media/file-20200614104551-9558.jpg'
+    - value: 'https://jk.nipponalba.scot/media/file-20200614104551-9558.jpg'
+      alt: 'A photo of three hand-drawn piece of art, by a 2 year old'
 posttype: photo
 slug: 5ee5f1d0
 thumbnail:
    - 'https://jk.nipponalba.scot/media/file-20200614104551-9558.jpg'
+
 visibility: public
 title: 'Photo'
 ---
--- a/content/photo/5f170a25/index.md
+++ b/content/photo/5f170a25/index.md
@ -2,7 +2,8 @@
 date: '2020-07-21 16:30:45'
 draft: false
 photo:
-    - /images/2020/07/1595345443971-143184-800.jpeg
+    - value: /images/2020/07/1595345443971-143184-800.jpeg
+      alt: 'Selfie of two year old girl, wearing a woolen hat and white pajamas with a giraffe on them, accidentally posing in the style of Zoolanders blue steel'
 posttype: photo
 slug: 5f170a25
 thumbnail:
--- a/content/photo/5f170cc7/index.md
+++ b/content/photo/5f170cc7/index.md
@ -2,7 +2,7 @@
 date: '2020-07-21 16:41:59'
 draft: false
 photo:
-    - 'https://jon.kelbie.scot/media/file-20200721164158-1594.jpg'
+    - {value: 'https://jon.kelbie.scot/media/file-20200721164158-1594.jpg', alt: 'A waist up selfie of a 2 year old girl with long brown hair and a white t-shirt leaning her head against her papa, a middle-aged man with a ginger and white beard, greying straggly hair wearing a dark grey wooly jumper'}
 posttype: photo
 slug: 5f170cc7
 thumbnail:
@ -10,4 +10,4 @@ thumbnail:
 visibility: public
 title: photo
 ---
-Testing alt text via media server
+Islay & Papa chilling!
--- a/content/photo/5f173ea5/index.md
+++ b/content/photo/5f173ea5/index.md
@ -2,11 +2,11 @@
 date: '2020-07-21 20:14:45'
 draft: false
 photo:
-    - { value: 'https://micropub.rocks/media/sunset.jpg', alt: 'Photo of a sunset' }
+    - {value: 'https://micropub.rocks/media/sunset.jpg', alt: 'Photo of a sunset'}
 posttype: photo
 slug: 5f173ea5
 thumbnail:
-    - Array
+    - 'https://micropub.rocks/media/sunset.jpg'
 title: photo
 ---
 Micropub test of creating a photo referenced by URL with alt text. This post should include a photo of a sunset.
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@ -21,7 +21,7 @@
                  {{$link := .Permalink}}
                  {{$summary := .Content}}
                    {{ range .Page.Params.Photo }}
-                      <a href="{{ $link }}" class="u-url"><img class="u-photo thumb" src="{{ replace . "800." "300."}}" title="{{ $summary }}"/></a>
+                      <a href="{{ $link }}" class="u-url"><img class="u-photo thumb" src="{{ replace .value "800." "300."}}" title="{{ $summary }}" alt="{{ .alt }}"/></a>
                    {{end}}
                    </section>
                      {{end}}
--- a/themes/nipponalba/layouts/_default/list.html
+++ b/themes/nipponalba/layouts/_default/list.html
@ -40,7 +40,7 @@
            <section class="e-content">
                <section class="photos">
                {{ range first 1 .Page.Params.Photo }}
-                  <img class="u-photo thumb" src="{{ replace . "800." "300."}}"/>
+                  <img class="u-photo thumb" src="{{ replace .value "800." "300."}}" alt="{{ .alt }}"/>
                {{end}}
                </section>

--- a/themes/nipponalba/layouts/_default/single.html
+++ b/themes/nipponalba/layouts/_default/single.html
@ -15,7 +15,7 @@
  {{ if eq .Type "photo"}}
    <section class="photogrid">
    {{ range .Page.Params.Photo }}
-      <a href="{{ . }}"><img class="u-photo" src="{{ . }}"/></a>
+      <a href="{{ . }}"><img class="u-photo" src="{{ .value }}" alt="{{ .alt }}"/></a>
    {{end}}
    </section>
    {{end}}
--- a/themes/nipponalba/layouts/index.html
+++ b/themes/nipponalba/layouts/index.html
@ -34,7 +34,7 @@
          <section class="photos">
        {{ $summary := .Content }}
          {{ range first 1 .Page.Params.Photo }}
-            <img class="u-photo thumb" src="{{ replace . "800." "300."}}" title="{{$summary}}"/>
+            <img class="u-photo thumb" src="{{ replace .value "800." "300."}}" title="{{$summary}}" alt="{{ .alt }}"/>
          {{end}}
          </section>
          {{end}}