update merge branch

config/_default/params.yaml

@@ -17,44 +17,45 @@ footerEnableTextWidget: true
 footerEnableLangWidget: true
 
 social:
-  - title: twitter
-    url: 'https://twitter.com/RLadiesGlobal'
-    icon: fab fa-twitter-square
+  - title: mastodon
+    handle: '@RLadiesGlobal@hachyderm.io'
+    relme: true
     footer: true
     sharethis: true
+    network: ''
+  - title: twitter
+    handle: 'RLadiesGlobal'
+    footer: false
+    sharethis: false
     network: twitter
   - title: instagram
-    url: 'https://www.instagram.com/rladiesglobal'
-    icon: fab fa-instagram
+    handle: 'rladiesglobal'
     footer: true
     sharethis: false
     network: ''
   - title: github
-    url: 'https://github.com/rladies'
-    icon: fab fa-github-square
+    handle: 'rladies'
     footer: true
     sharethis: false
     network: ''
   - title: meetup
-    url: 'https://www.meetup.com/pro/rladies/'
+    handle: 'pro/rladies/'
     footer: true
     sharethis: true
-    icon: fab fa-meetup
     network: ''
   - title: youtube
-    url: 'https://www.youtube.com/channel/UCDgj5-mFohWZ5irWSFMFcng'
+    handle: 'channel/UCDgj5-mFohWZ5irWSFMFcng'
     footer: true
     sharethis: true
-    icon: fab fa-youtube
     network: ''
 twitter:
   - title: We are R-Ladies
-    url: 'https://twitter.com/WeAreRLadies'
+    handle: 'WeAreRLadies'
     footer: true
     sharethis: false
     network: ''
   - title: IWD R-Ladies
-    url: 'https://twitter.com/rladies_iwd'
+    handle: 'rladies_iwd'
     footer: true
     sharethis: false
     network: ''

content/directory/index.en.md

@@ -7,6 +7,4 @@ type: "directory"
 Please fill out [our form](/directory-update)! 
 It only takes a few minutes, and soon your profile will be online.
 
-If you want to **update** your profile just fill the same form and drop us a line in the comment box saying you want to update your profile!
-
-Or you can just email us at speakers[at]rladies[dot]org with any relevant info about yourself – easy!
+If you want to **update** your profile, fill out the same form and choose the "Update directory entry" option. 

content/posit23/index.en.md

@@ -0,0 +1,5 @@
+---
+type: redirect
+redirect: https://app.sli.do/event/eugGEUP3oRHabkNiTBEhm6
+title: "R-Ladies Posit::Conf 2023 meetup"
+---

data/chapters/canada-ontario-ottawa.json

@@ -10,8 +10,8 @@
       "email": "[email protected]"
     },
     "organizers": {
-      "current": ["Michelle Fairbrother", "Stephanie Houle"],
-      "former": []
+      "current": ["Melissa Van Bussel", "Alexandra McSween"],
+      "former": ["Michelle Fairbrother", "Stephanie Houle"]
     }
   }
 ]

data/chapters/ghana-kumasi.json

@@ -0,0 +1,15 @@
+[
+  {
+    "urlname": "rladies-kumasi",
+    "status": "prospective",
+    "country": "Ghana",
+    "city": "Kumasi",
+    "social_media": {
+      "meetup": "rladies-kumasi",
+      "email": "[email protected]"
+    },
+    "organizers": {
+      "current": ["Jane Esi Monkah"]
+    }
+  }
+]

data/chapters/kyrgyzstan-bishkek.json

@@ -1,6 +1,6 @@
 [
   {
-    "status": "prospective",
+    "status": "active",
     "country": "Kyrgyzstan",
     "city": "Bishkek",
     "social_media": {},

data/chapters/norway-oslo.json

@@ -11,8 +11,8 @@
       "github": "rladies/meetup-presentations_oslo"
     },
     "organizers": {
-      "current": ["Anne Claire Fouilloux", "Athanasia Monika Mowinckel", "Lene Norderhaug Drosdal", "Aurora Voje", "Isabelle Valette"],
-      "former": []
+      "current": ["Athanasia Monika Mowinckel", "Lene Norderhaug Drosdal", "Aurora Voje"],
+      "former": ["Anne Claire Fouilloux", "Isabelle Valette"]
     }
   }
 ]

data/chapters/usa-colorado-aurora.json

@@ -0,0 +1,15 @@
+[
+  {
+    "urlname": "rladies-aurora",
+    "status": "prospective",
+    "country": "usa",
+    "city": "colorado",
+    "social_media": {
+      "meetup": "rladies-aurora",
+      "email": "[email protected]"
+    },
+    "organizers": {
+      "current": ["Janani Ravi"]
+    }
+  }
+]

data/chapters_meetup.json

@@ -1228,8 +1228,8 @@
       "email": "[email protected]"
     },
     "organizers": {
-      "current": ["Michelle Fairbrother", "Stephanie Houle"],
-      "former": []
+      "current": ["Melissa Van Bussel", "Alexandra McSween"],
+      "former": ["Michelle Fairbrother", "Stephanie Houle"]
     },
     "name": "R-Ladies Ottawa, ON",
     "id": "30655714",
@@ -2016,6 +2016,20 @@
     "lon": -0.2,
     "timezone": "Africa/Accra"
   },
+  {
+    "urlname": "rladies-kumasi",
+    "status": "prospective",
+    "country": "Ghana",
+    "social_media": {
+      "meetup": "rladies-kumasi",
+      "email": "[email protected]"
+    },
+    "organizers": {
+      "current": ["Jane Esi Monkah"],
+      "former": []
+    },
+    "name": "R-Ladies NA"
+  },
   {
     "urlname": "rladies-athens-gr",
     "status": "active",
@@ -3159,8 +3173,8 @@
       "github": "rladies/meetup-presentations_oslo"
     },
     "organizers": {
-      "current": ["Anne Claire Fouilloux", "Athanasia Monika Mowinckel", "Lene Norderhaug Drosdal", "Aurora Voje", "Isabelle Valette"],
-      "former": []
+      "current": ["Athanasia Monika Mowinckel", "Lene Norderhaug Drosdal", "Aurora Voje"],
+      "former": ["Anne Claire Fouilloux", "Isabelle Valette"]
     },
     "name": "R-Ladies Oslo",
     "id": "27651457",
@@ -4439,6 +4453,20 @@
     "lon": -119.71,
     "timezone": "America/Los_Angeles"
   },
+  {
+    "urlname": "rladies-aurora",
+    "status": "prospective",
+    "country": "usa",
+    "social_media": {
+      "meetup": "rladies-aurora",
+      "email": "[email protected]"
+    },
+    "organizers": {
+      "current": ["Janani Ravi"],
+      "former": []
+    },
+    "name": "R-Ladies NA"
+  },
   {
     "urlname": "rladies-boulder",
     "status": "active",

themes/hugo-rladies/layouts/_default/single.html

@@ -26,7 +26,6 @@ <h1 class="section-title">{{ .Title }}</h1>
 
 {{ define "main" }}
 <div class="entry-content">
-  here
 	{{ .Content }}
 </div>
 {{ end }}

themes/hugo-rladies/layouts/partials/footer/footer.html

@@ -26,7 +26,10 @@ <h3 class="widget-title">{{ i18n "footer_followme_title" . | markdownify }}</h3>
   					<p class="follow-me-icons">
               {{ range .Site.Params.social }}
                   {{ if .footer }}
-                      <a href="{{ .url }}" target="_blank"><i class="{{ .icon }} fa-2x"></i></a>
+                    {{ $some:= partial "funcs/social_media.html" (dict "type" .title "handle" .handle ) }}
+                    <a href="{{ $some.url }}" target="_blank" {{ if .relme }} rel="me" {{ end }} >
+                      <i class="{{ $some.fa }} fa-2x"></i>
+                    </a>
                   {{ end }}
               {{ end }}
   					</p>

themes/hugo-rladies/layouts/partials/funcs/directory/card.html

@@ -3,7 +3,7 @@
 {{ $dir.Set "title" .data.name }} 
 {{ $dir.Add "title" "<span><small>"}}
 {{ with .data.social_media }}
-  {{ $some := partial "some.html" (dict "data" . ) }}
+  {{ $some := partial "social_media.html" (dict "data" . ) }}
   {{ $dir.Add "title" $some }} 
 {{ end }}
 {{ $dir.Add "title" "</small></span>"}}
@@ -59,4 +59,4 @@
 {{ $foot := (partial "funcs/directory/foot.html" .data ) }}
 {{ $shuffle := merge $interests $languages $location }}
 
-{{ partial "funcs/card-expand.html" (dict "title" $title "subtitle" $subtitle "size" .size  "img" ($dir.Get "img") "category" .data.honorific "descr" $descr "foot" $foot "footcol" 2 "id" .name  "shuffle" $shuffle ) }}
+{{ partial "funcs/card-expand.html" (dict "title" $title "subtitle" $subtitle "size" .size  "img" ($dir.Get "img") "category" .data.honorific "descr" $descr "foot" $foot "footcol" 2 "id" .name  "shuffle" $shuffle ) }}

themes/hugo-rladies/layouts/partials/funcs/some.html → themes/hugo-rladies/layouts/partials/funcs/social_media.html

@@ -73,4 +73,4 @@
   {{ $data.Set "url" (replaceRE "@(.*?)@(.+)" "https://$2/@$1" .handle) }}
 {{ end }}
 
-{{ return (dict "url" ($data.Get "url") "fa" ($data.Get "fa") ) }}
+{{ return (dict "url" ($data.Get "url") "fa" ($data.Get "fa") "type" .type ) }}

themes/hugo-rladies/layouts/partials/head/head.html

@@ -20,3 +20,4 @@
 
 <!-- plausible -->
 <script defer data-domain="rladies.org" src="https://plausible.io/js/script.js"></script>
+

themes/hugo-rladies/layouts/partials/home/chapters.html

@@ -28,7 +28,7 @@ <h2 class="section-title"><span>{{ .Title }}</span></h2>
 
               <td class="text-right"> 
                 {{ with .social_media }}
-                    {{ partial "some.html" (dict "data" . "relme" true) }}
+                    {{ partial "social_media.html" (dict "data" . "relme" true) }}
                 {{ end }}
               </td>
                 </tr>
@@ -111,7 +111,7 @@ <h2 class="section-title"><span>{{ .Title }}</span></h2>
       {
         "name": "{{ .name }}",
         "members": "{{ .members }}",
-        "socials": {{ with .social_media }}{{ partial "some.html" . }}{{ end }},
+        "socials": {{ with .social_media }}{{ partial "social_media.html" . }}{{ end }},
         "latitude": {{ .lat }},
         "longitude": {{ .lon }},
         "color": "#88398acc"
@@ -121,4 +121,4 @@ <h2 class="section-title"><span>{{ .Title }}</span></h2>
   }); // end am4core.ready()
 </script>
 
-
+

themes/hugo-rladies/layouts/partials/some.html → themes/hugo-rladies/layouts/partials/social_media.html

@@ -22,8 +22,8 @@
 
 {{ range $index, $v := first ($data.Get "range") ($data.Get "value" ) }}
   {{ $selection := index ($data.Get "key") $index }}
-  {{ $some:= partial "funcs/some.html" (dict "type" $selection "handle" $v ) }}
-    <a href="{{ $some.url }}" target="_blank" {{ if ( $data.Get "rel") }} rel="me" {{ end }} >
+  {{ $some:= partial "funcs/social_media.html" (dict "type" $selection "handle" $v ) }}
+    <a title="{{$some.type}}: {{ $some.url}}" href="{{ $some.url }}" target="_blank" {{ if ( $data.Get "rel") }} rel="me" {{ end }} >
       <i class="{{ $some.fa }}"></i>
     </a>
 {{ end }}

themes/hugo-rladies/layouts/rladies-blogs/single.html

@@ -13,7 +13,7 @@
           {{ $data.Add "descr" .name }}
             {{ with .social_media }}
               {{ range . }}
-                {{ $data.Add "descr" (partial "some.html" (dict "data" . "range" 3)) }}
+                {{ $data.Add "descr" (partial "social_media.html" (dict "data" . "range" 3)) }}
               {{ end }}
             {{ end }}
           {{ $data.Add "descr" "</p>" }}