Merge pull request #3 from sbutcher/tweak

First pass at tidying up content
ubuntu-uk · Feb 21, 2024 · a947b90 · a947b90
2 parents c32b8bd + 0685d26
commit a947b90
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 164 deletions.
diff --git a/config.yaml b/config.yaml
@@ -5,16 +5,11 @@ theme: "ubuntukr"
 buildFuture: true
 #googleAnalytics: ""
 params:
-  contact: [email protected]
-  #facebook: ubuntukorea
-  #twitter: UbuntuKrOrg
+  contact: [email protected]
   github: ubuntu-uk
   launchpad: ubuntu-uk
   mastodon: https://floss.social/@ubuntu_UK
-  #youtube: https://www.youtube.com/user/UbuntuKorea
-  #linkedin: https://www.linkedin.com/company/ubuntu-kr/
   source_repo: https://github.com/ubuntu-uk/ubuntu-uk.github.io
-  #privacyPolicy: https://disclosures.ubuntu-kr.org/privacy-policy/
 defaultContentLanguage: en
 languages:
   en:
@@ -24,10 +19,10 @@ languages:
     params:
       description: >-
         Ubuntu UK Community is a Ubuntu LoCo (Local Community) in the UK. 
-        It is a place for everyone who intrested in using, developing with Ubuntu, or contributing to Ubuntu projects.
+        It is a place for everyone who is interested in using, developing with Ubuntu, or contributing to Ubuntu projects.
       copyright: >-
-        © 2021 Ubuntu Korea Community (Ubuntu Korean LoCo Team).
-        © 2023 Ubuntu UK Community (Ubuntu UK LoCo Team)
+        Original template © 2021 Ubuntu Korean LoCo Team.
+        © 2024 Ubuntu UK LoCo Team.
         Except where otherwise noted, Website source code licensed under MIT, Contents licensed under CC BY-SA 4.0. 
         Ubuntu and Canonical are registered trademarks of Canonical Ltd.
       main_slide:
@@ -48,16 +43,6 @@ languages:
         parent: try
         url: https://ubuntu.com/certified
         weight: 20
-      # - identifier: wiki-ko
-      #   parent: try
-      #   name: Wiki (Korean)
-      #   url: https://wiki.ubuntu-kr.org
-      #   weight: 20
-      # - identifier: tutorials-ko
-      #   parent: try
-      #   name: Tutorials (Korean)
-      #   url: https://ubuntu-kr.github.io/workshops/
-      #   weight: 21
       - identifier: docs-en
         parent: try
         name: Docs
@@ -81,16 +66,6 @@ languages:
       #   name: About our community
       #   url: about
       #   weight: 24
-      # - identifier: bylaws
-      #   parent: about-group
-      #   name: Bylaws
-      #   url: bylaws
-      #   weight: 25
-      # - identifier: sponsors
-      #   parent: about-group
-      #   name: Sponsors
-      #   url: sponsors
-      #   weight: 26
       - identifier: community
         name: Community
         url: community
@@ -100,11 +75,6 @@ languages:
         name: Forum (Discourse)
         url: https://discourse.ubuntu.com/c/locos/ubuntu-uk
         weight: 32
-      # - identifier: fb-group
-      #   parent: community
-      #   name: Facebook Group
-      #   url: https://www.facebook.com/groups/ubuntu.ko
-      #   weight: 34
       - identifier: lists
         parent: community
         name: Mailing list
@@ -115,60 +85,11 @@ languages:
         name: Chat 
         url: chat
         weight: 36
-      # - identifier: partandcontrib
-      #   name: Participate & Contribute
-      #   url: partandcontrib
-      #   weight: 4
-      # - identifier: events
-      #   parent: partandcontrib
-      #   name: Join events
-      #   url: https://event.ubuntu-kr.org
-      #   weight: 4
-      # - identifier: study_projects
-      #   parent: partandcontrib
-      #   name: Group Studies/Projects
-      #   url: projects
-      #   weight: 4
-      # - identifier: translate
-      #   parent: partandcontrib
-      #   name: Translate Ubuntu
-      #   url: translate
-      #   weight: 4
-      # - identifier: paid-membership
-      #   parent: partandcontrib
-      #   name: Contribute Membership fee
-      #   url: https://github.com/sponsors/ubuntu-kr
-      #   weight: 4
       - identifier: follow
         name: Follow us
         weight: 5
-      # - identifier: blog
-      #   parent: follow
-      #   name: Blog
-      #   url: https://blog.ubuntu-kr.org
-      #   weight: 4
-      # - identifier: facebook
-      #   parent: follow
-      #   name: Facebook
-      #   url: https://fb.com/ubuntukorea
-      #   weight: 4
-      # - identifier: twitter
-      #   parent: follow
-      #   name: Twitter
-      #   url: https://twitter.com/UbuntuKrOrg
-        weight: 4
-      # - identifier: youtube
-      #   parent: follow
-      #   name: YouTube
-      #   url: https://www.youtube.com/user/UbuntuKorea
-      #   weight: 4
       - identifier: mastodon
         parent: follow
         name: Mastodon
         url: https://floss.social/@ubuntu_UK
         weight: 4
-      # - identifier: linkedin
-      #   parent: follow
-      #   name: LinkedIn
-      #   url: https://www.linkedin.com/company/ubuntu-kr/
-      #   weight: 4
diff --git a/content/about/_index.en.md b/content/about/_index.en.md
@@ -1,8 +1,7 @@
 ---
 title: "About the Community"
 description: >-
-   Ubuntu Korea Community, established late 2005 is an Ubuntu Local community verified by Ubuntu Community Council.
-   We organize various activities sucs as: Providing online community and documentation service, Organizing events like seminars and conferences, Group studies and projects on Ubuntu and its related open source technologies. 
+   We believe that everyone has something to contribute to the Ubuntu community. Whether you are a passionate user, a developer, or a translator, you are invited to get involved in the Ubuntu-UK LoCo. We aim to provide free community support to users of the various flavours of Ubuntu as well as advocating the use of Ubuntu to individuals and organisations alike. Ubuntu-UK LoCo is in the rebuilding stage. This is part of the LoCo rejuvenation that is happening throughout the world.
 image: "logo.png"
 backgroundType: image #light, dark, accent, suru, suru-topped, image
 backgroundImage: "people.jpg"

diff --git a/content/about/logo.png b/content/about/logo.png
diff --git a/static/img/ubuntuUKlogo.png b/static/img/ubuntuUKlogo.png
diff --git a/static/img/ubuntuUKlogoheader.png b/static/img/ubuntuUKlogoheader.png
diff --git a/themes/ubuntukr/i18n/en.toml b/themes/ubuntukr/i18n/en.toml
@@ -4,22 +4,14 @@ other = "Next"
 other = "Previous"
 
 [main_ubuntu_title]
-other = "Most widely used Linux distro"
+other = "About Ubuntu"
 [main_ubuntu_desc]
 other = """
-Ubuntu is one of the most widely used Linux distributon in the world.
-It is well known as easy to use linux desktop, and easy to configure linux distribution for server and other infrastructures.
+Ubuntu is one of the most widely used Linux distributions in the world.
+It is well known as an easy to use desktop and server distribution.
 Ubuntu is optimized for various devices and environment such as Desktop, Laptop, Server, Cloud, Internet of Things, Raspberry Pi, Appliances, Kiosks and much more.
 """
 
-[main_kr_loco_title]
-other = "Verified Ubuntu LoCo(Local Community)"
-[main_kr_loco_desc]
-other = """
-Ubuntu Korea Community is a Ubuntu LoCo(Local Community) in South Korea verified by Ubuntu Community Council.
-We provide localized forums and documentations, Plan and host various seminars and conferences.
-We also organize group studies, research/development projects on Ubuntu and its related open source projects.
-"""
 [main_kr_loco_about]
 other = "About the community"
 [main_kr_loco_community_title]
@@ -42,9 +34,9 @@ other = "Group Studies/Projects"
 other = "Localization (Translation)"
 
 [about_online_title]
-other = "Meet people online & Find informations you need"
+other = "Meet people online & Find information you need"
 [about_online_desc]
-other = "Meet community people on various channels like Forums, Facebook Group, IRC. And find informations you need on official documentations and wiki."
+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"
 [about_networking_desc]
@@ -80,11 +72,9 @@ We also organize activieis for contributing to Ubuntu projects such as translati
 other = "Get involved as Community Organizer"
 [about_organizing_desc]
 other = """
-People who enthusiast on Ubuntu, Linux and open source are actively participating as organizers.
-If you are actively participating Ubuntu community and interested to join as organizer, Why don't you get involced today?
+People who are enthusiastic about Ubuntu, Linux and open source are actively participating as organizers.
+If you are actively participating in the Ubuntu community and interested to join as an organizer, Why don't you get in touch?
 """
-[about_organizers_ko]
-other = "About our Community Organizers (Korean)"
 [about_organizers_en]
 other = "About our Community Organizers"
 [about_organizers_list]
@@ -94,8 +84,6 @@ other = "Wanna get involved as Organizer?"
 
 [forums_discourse]
 other = "Forums (Discourse)"
-[fb_groups]
-other = "Facebook Groups"
 [wiki]
 other = "Wiki"
 [tutorials]
@@ -110,8 +98,8 @@ other = "Group studies/Projects"
 other = "Translate Ubuntu"
 
 [footer_contact]
-other = "Contact with Organizers (Email)"
+other = "Contact us (Email)"
 [footer_src_repo]
 other = "Source code on GitHub"
 [privacy_policy]
-other = "Privacy policy"
+other = "Privacy policy"
diff --git a/themes/ubuntukr/layouts/about/list.html b/themes/ubuntukr/layouts/about/list.html
@@ -30,9 +30,9 @@ <h1>{{.Title}}</h1>
       <div class="col-8">
         <h1>{{i18n "about_online_title"}}</h1>
         <p>{{i18n "about_online_desc"}}</p>
-        <a href="https://discourse.ubuntu-kr.org"><button class="p-button">{{i18n "forums_discourse"}}</button></a>
+        <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-kr.org/"><button class="p-button">{{i18n "wiki"}}</button></a>
+        <a href="https://wiki.ubuntu.com/UKTeam/"><button class="p-button">{{i18n "wiki"}}</button></a>
       </div>
       <div class="col-4">
           <img src="{{ .RelPermalink }}/community.svg" alt="">
@@ -94,12 +94,11 @@ <h1>{{i18n "about_organizing_title"}}</h1>
         <p>
           {{i18n "about_organizing_desc"}}
         </p>
-        <a href="https://disclosures.ubuntu-kr.org/organizers/"><button class="p-button">{{i18n "about_organizers_ko"}}</button></a>
-        <a href="https://wiki.ubuntu.com/KoreanTeam"><button class="p-button">{{i18n "about_organizers_en"}}</button></a>
+        <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>
       </div>
     </div>
   </section>
-  {{- partial "sponsors.html" . -}}
+  <!--  {{- partial "sponsors.html" . -}} -->
 </main>
 {{ end }}
diff --git a/themes/ubuntukr/layouts/index.html b/themes/ubuntukr/layouts/index.html
@@ -19,7 +19,7 @@ <h1>{{.Site.Title}}</h1>
           <a href="{{.Site.Params.main_slide.link}}"><button>{{.Site.Params.main_slide.label}}</button></a>
         </div>
         <div class="col-4 right-section">
-          <img src='{{ "/img/UbuntuKrCircleTag.svg" | relURL }}' style="width: 200px;" alt="" />
+          <img src='{{ "/img/ubuntuUKlogo.png" | relURL }}' style="width: 200px;" alt="" />
         </div>
       </div>
   </section>
@@ -175,4 +175,4 @@ <h2>
   </section>
 -->
 </main>
-{{ end }}
+{{ end }}
diff --git a/themes/ubuntukr/layouts/partials/footer.html b/themes/ubuntukr/layouts/partials/footer.html
@@ -6,30 +6,9 @@ <h2>{{.Site.Title}}</h2>
         <li class="p-inline-list__item">
           <a href="mailto:{{.Site.Params.contact}}">{{ i18n "footer_contact" }}</a>
         </li>
-        <li class="p-inline-list__item">
-          <a href="mailto:{{.Site.Params.privacyPolicy}}">{{ i18n "privacy_policy" }}</a>
-        </li>
-        <li class="p-inline-list__item">
-          <a href="https://fb.com/{{.Site.Params.facebook}}">Facebook</a>
-        </li>
-        <li class="p-inline-list__item">
-          <a href="https://twitter.com/{{.Site.Params.twitter}}">Twitter</a>
-        </li>
-        <li class="p-inline-list__item">
-          <a href="{{.Site.Params.youtube}}">YouTube</a>
-        </li>
-        <li class="p-inline-list__item">
-          <a href="https://github.com/{{.Site.Params.github}}">GitHub</a>
-        </li>
-        <li class="p-inline-list__item">
-          <a href="https://launchpad.net/~{{.Site.Params.launchpad}}">Launchpad</a>
-        </li>
         <li class="p-inline-list__item">
           <a rel="me" href="{{.Site.Params.mastodon}}">Mastodon</a>
         </li>
-        <li class="p-inline-list__item">
-          <a rel="me" href="{{.Site.Params.linkedin}}">LinkedIn</a>
-        </li>
       </ul>
       <p>{{.Site.Params.copyright}}</p>
       <a href="{{.Site.Params.source_repo}}">{{ i18n "footer_src_repo" }}</a>

diff --git a/themes/ubuntukr/layouts/partials/header.html b/themes/ubuntukr/layouts/partials/header.html
@@ -4,7 +4,7 @@
       <div class="p-navigation__tagged-logo">
         <a class="p-navigation__link" href="{{ .Site.LanguagePrefix | relURL }}">
           <div class="p-navigation__logo-tag">
-            <img class="p-navigation__logo-icon" src="{{ "/img/UbuntuKrCircleWhite.svg" | relURL }}" alt="">
+            <img class="p-navigation__logo-icon" src="{{ "/img/ubuntuUKlogoheader.png" | relURL }}" alt="">
           </div>
           <span class="p-navigation__logo-title">{{.Site.Title}}</span>
         </a>
@@ -36,33 +36,6 @@
         {{ end }}
       </ul>
 
-     <ul class="p-navigation__items">
-        <li class="p-navigation__item--dropdown-toggle" id="link-4">
-          <a class="p-navigation__link" aria-controls="account-menu">
-            🌏
-          </a>
-          <ul class="p-navigation__dropdown--right" id="account-menu" aria-hidden="true">
-            {{ if eq (len .AllTranslations) (len $.Site.Home.AllTranslations) }}
-            {{ range .AllTranslations }}
-            <li>
-              <a href="{{ .Permalink }}" class="p-navigation__dropdown-item">{{ .Language.LanguageName }}</a>
-            </li>
-            {{ end }}
-            {{ else }}
-            {{ range .AllTranslations }}
-            <li>
-              <a href="{{ .Permalink }}" class="p-navigation__dropdown-item">📄 {{ .Language.LanguageName }}</a>
-            </li>
-            {{ end }}
-            {{ range $.Site.Home.AllTranslations }}
-            <li>
-              <a href="{{ .Permalink }}" class="p-navigation__dropdown-item">🏠 {{ .Language.LanguageName }}</a>
-            </li>
-            {{ end }}
-            {{ end }}
-          </ul>
-        </li>
-      </ul>
     </nav>
   </div>
 </header>
diff --git a/themes/ubuntukr/layouts/partials/scripts.html b/themes/ubuntukr/layouts/partials/scripts.html
@@ -22,7 +22,6 @@
     setSlideIndex(index - 1);
 }
 setSlideIndex(0);
-setInterval(nextSlide, 5000);
+setInterval(nextSlide, 10000);
 </script>
 
-{{ template "_internal/google_analytics.html" . }}