Merge pull request #5 from sbutcher/tidyup

Make a more relevant About page

config.yaml

@@ -58,9 +58,6 @@ languages:
         name: Wiki
         url: https://wiki.ubuntu.com
         weight: 24
-      - identifier: about-group
-        name: About
-        weight: 2
       # - identifier: about
       #   parent: about-group
       #   name: About our community
@@ -85,11 +82,17 @@ languages:
         name: Chat 
         url: chat
         weight: 36
-      - identifier: follow
-        name: Follow us
-        weight: 5
       - identifier: mastodon
-        parent: follow
+        parent: community
         name: Mastodon
         url: https://floss.social/@ubuntu_UK
         weight: 4
+      - identifier: wiki
+        parent: community
+        name: Wiki
+        url: https://wiki.ubuntu.com/UKTeam/
+        weight: 7
+      - identifier: about-group
+        name: About
+        weight: 10
+        url: /about

themes/ubuntukr/i18n/en.toml

@@ -34,39 +34,30 @@ other = "Group Studies/Projects"
 other = "Localization (Translation)"
 
 [about_online_title]
-other = "Meet people online & Find information you need"
+other = "More information"
 [about_online_desc]
 other = "Connect with community people on various channels like Forums, Discourse, IRC. Find information you need on the official documentation and wiki."
 [about_networking_title]
-other = "Networking, Exchange and Research & Development activities"
+other = "Activities"
 [about_networking_desc]
 other = "We organize diverse activities on Ubuntu and its related open source technologies. Meet and exchange with people and share your experience beyond online activities." 
 [about_networking_events_title]
-other = "Seminars, Workshops and Conferences"
+other = "In-person events and conferences"
 [about_networking_events_desc]
 other = """
-We organize seminars, conferences periodically to share Ubuntu related knowledges,
-and Workshop events to train and make people familiar with Ubuntu and its related open source technologies.
+Details of upcoming conferences and events will appear here
 """
 [about_networking_events_button]
 other = "See event schedules"
 
-[about_exchange_title]
-other = "Exchange with Domestic & Foreign Open source/IT Communities"
-[about_exchange_desc]
+[about_social_title]
+other = "Social events"
+[about_social_desc]
 other = """
-We frequently collaborate with domestic open source communties like OpenStack Korea, WSL Korea User Group and more.
-Cowork with foreign open source communities such as Ubuntu Japan, Debian Japan, Ubuntu Taiwan, Ubuntu Malaysia.
-We also participate <a href="https://www.ubucon.asia">UbuCon Asia</a>, a place to meet Ubuntu LoCos around Asia.
-"""
-
-[about_projects_title]
-other = "Group studies, Projects, Open source contribution activities"
-[about_projects_desc]
-other = """
-We organize group studies and projeces on Ubuntu and its related open source technologies.
-We also organize activieis for contributing to Ubuntu projects such as translating Ubuntu. 
+The Real Ale Train is an old steam train pulling carriages in which people socialise and consume beer/food. The ale and hot food can be purchased and consumed onboard or pre-ordered in advance.
 """
+[about_social_button]
+other= "Find out more"
 
 [about_organizing_title]
 other = "Get involved as Community Organizer"
@@ -80,7 +71,7 @@ other = "About our Community Organizers"
 [about_organizers_list]
 other = "List of Organizers"
 [about_organizers_join]
-other = "Wanna get involved as Organizer?"
+other = "Want to get involved as Organizer?"
 
 [forums_discourse]
 other = "Forums (Discourse)"
@@ -92,6 +83,8 @@ other = "Tutorials"
 other = "Chat"
 [mailing_list]
 other = "Mailing List"
+[mastodon]
+other = "Fediverse (Mastodon)"
 [group_studies_projects]
 other = "Group studies/Projects"
 [translate_ubuntu]

themes/ubuntukr/layouts/about/list.html

@@ -33,6 +33,9 @@ <h1>{{i18n "about_online_title"}}</h1>
         <a href="https://discourse.ubuntu.com/c/locos/ubuntu-uk"><button class="p-button">{{i18n "forums_discourse"}}</button></a>
         <a href="../chat"><button class="p-button">{{i18n "chat"}}</button></a>
         <a href="https://wiki.ubuntu.com/UKTeam/"><button class="p-button">{{i18n "wiki"}}</button></a>
+        <a href="https://lists.ubuntu.com/archives/ubuntu-uk/"><button class="p-button">{{i18n "mailing_list"}}</button></a>
+        <a href="https://lists.ubuntu.com/archives/ubuntu-uk/"><button class="p-button">{{i18n "mailing_list"}}</button></a>
+        <a href="https://floss.social/@ubuntu_UK"><button class="p-button">{{i18n "mastodon"}}</button></a>
       </div>
       <div class="col-4">
           <img src="{{ .RelPermalink }}/community.svg" alt="">
@@ -54,32 +57,22 @@ <h3 class="p-matrix__title">{{i18n "about_networking_events_title"}}</h3>
                   {{i18n "about_networking_events_desc"}}
                 </p>
               </div>
-              <div>
+<!--              <div>
                 <a href="https://event.ubuntu-kr.org"><button class="p-button is-dark">{{i18n "about_networking_events_button"}}</button></a>
-              </div>
+</div> -->
             </div>
           </li>
           <li class="p-matrix__item">
             <div class="p-matrix__content">
-              <img src="{{ .RelPermalink }}/DrakeSongAtOSCKyoto.jpg" alt="">
-              <h3 class="p-matrix__title">{{i18n "about_exchange_title"}}</h3>
+              <img src="{{ .RelPermalink }}/train.jpg" alt="">
+              <h3 class="p-matrix__title">{{i18n "about_social_title"}}</h3>
               <div class="p-matrix__desc">
                 <p>
-                  {{i18n "about_exchange_desc" | safeHTML}}
+                  {{i18n "about_social_desc" | safeHTML}}
                 </p>
               </div>
-            </div>
-          </li>
-          <li class="p-matrix__item">
-            <div class="p-matrix__content">
-              <img src="{{ .RelPermalink }}/projects.png" alt="">
-              <h3 class="p-matrix__title">{{i18n "about_projects_title"}}</h3>
-              <p class="p-matrix__desc">
-                {{i18n "about_projects_desc"}}
-              </p>
               <div>
-                <a href="../projects"><button class="p-button is-dark">{{i18n "group_studies_projects"}}</button></a>
-                <a href="../translate"><button class="p-button is-dark">{{i18n "translate_ubuntu"}}</button></a>
+                <a href="https://discourse.ubuntu.com/t/ubuntu-uk-real-ale-train/42210"><button class="p-button is-dark">{{i18n "about_social_button"}}</button></a>
               </div>
             </div>
           </li>
@@ -95,7 +88,7 @@ <h1>{{i18n "about_organizing_title"}}</h1>
           {{i18n "about_organizing_desc"}}
         </p>
         <a href="https://wiki.ubuntu.com/UKTeam"><button class="p-button">{{i18n "about_organizers_en"}}</button></a>
-        <a href="mailto:{{.Site.Params.contact}}"><button class="p-button">{{i18n "about_organizers_join"}}</button></a>
+        <a href="https://discourse.ubuntu.com/c/locos/ubuntu-uk"><button class="p-button">{{i18n "about_organizers_join"}}</button></a>
       </div>
     </div>
   </section>