Merge pull request #70 from ASKnetCommunity/development into main

Development into main

README.md

@@ -124,7 +124,13 @@ $ docker-compose down
 
 ## License
 
-The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+All content is licensed under CC-BY-SA 4.0 
+
+Theme used: [Agency Theme (Jekyll version)](https://github.com/raviriley/agency-jekyll-theme). The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+Technologies used: 
+- [Bootstrap](https://getbootstrap.com/) which is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+- FontAwesome - [License here](https://fontawesome.com/license/free)  (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
 
 
 [demo-page]: https://asknetcommunity.github.io/ASKnet.Community/

_config.yml

@@ -11,15 +11,15 @@
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
 
-theme: jekyll-agency
+#theme: jekyll-agency
 
 url    : "https://asknetcommunity.github.io" # the base hostname & protocol for your site, e.g. http://example.com
 baseurl: "/ASKnet.Community" # the subpath of your site, e.g. /blog
 
 title      : "#ASKnet"
-email      : [email protected] #this is also the email contact forms will go to
-description: "Access to Skills & Knowledge"
-author     : ASKnet
+email      :  #this is also the email contact forms will go to
+description: "Access to Skills & Knowledge network"
+author     : '#ASKnet'
 logo:     #optional, defaults to site title
   path: assets/img/asknet-logo.png
   height: 60 #height in px, defaults to 52px

_data/sitetext.yml

@@ -18,7 +18,30 @@ en: &DEFAULT_EN
 
   services:
     title: "#ASKnet<br />Access to Skills & Knowledge Network"
-    text: "The #ASKnet community aims to build a sustainable network of trainers and empowered individuals, to address specific challenges their communities are facing and transform cultural patterns that fuel conflict and inequality."
+    text: ' 
+    The #ASKnet community aims to build a sustainable network of trainers and empowered individuals, to address specific challenges their communities are facing and transform cultural patterns that fuel conflict and inequality.  <br> <br>   
+    
+    <div class="row my-3 justify-content-center no-gutters">
+      <div class="col-auto"><i class="fas fa-project-diagram fa-2x"></i> &nbsp; </div> 
+      <div class="col-md-2 col-7 text-left text-nowrap">#ASKnet is a <b>network of hubs <br />and community members</b> </div>
+    </div>
+    <div class="row my-3 justify-content-center no-gutters">
+      <div class="col-md-2 col-7 text-right text-nowrap"><div style="float: right;">who subscribe to the <b>vision of <br />educating on media literacy </b> </div></div>
+      <div class="col-auto"> &nbsp; <i class="fas fa-graduation-cap fa-2x"></i></div> 
+    </div>
+    <div class="row my-3 justify-content-center no-gutters">
+      <div class="col-auto"><i class="fas fa-users fa-2x"></i> &nbsp; </div> 
+      <div class="col-md-2 col-7 text-left text-nowrap">and <b>creating communities <br />with hands-on experience,</b> </div>
+    </div>
+    <div class="row my-3 justify-content-center no-gutters">
+      <div class="col-md-2 col-7 text-right text-nowrap"><div style="float: right;">while providing <b>open access <br />to skills and knowledge <br />that can impact a community,</b></div></div>
+      <div class="col-auto"> &nbsp; <i class="fas fa-book-open fa-2x"></i></div> 
+    </div>
+    <div class="row my-3 justify-content-center no-gutters">
+      <div class="col-auto"><i class="fas fa-cogs fa-2x"></i> &nbsp; </div> 
+      <div class="col-md-2 col-7 text-left text-nowrap">using the <b>available resources.</b> </div>
+    </div>
+    '
     submit: https://github.com/ASKnetCommunity/ASKnet.Community/issues/30
     section: about
     list:
@@ -44,7 +67,7 @@ en: &DEFAULT_EN
 
   askotec:
     title: "#ASKotec<br />Open Tech Emergency Case"
-    text: "#ASKotec; the Access to Skills and Knowledge Open Tech Emergency Case is a resource kit for community trainers, created for mobile field-use where there is neither easy power nor internet connectivity such as refugee camps, low-infrastructure regions or rural areas. Intended as Open Tech for Good, #ASKotec was created through a series of hub development workshops by a community of young innovators intent on bringing skills training and peace-building together in the effort to end the South Sudan conflict."
+    text: "#ASKotec; the Access to Skills and Knowledge Open Tech Emergency Case is a resource kit for community trainers."
     section: askotec
     image: assets/img/projects/askotec-website.png
     website: https://askotec.openculture.agency
@@ -105,57 +128,57 @@ en: &DEFAULT_EN
         submit: https://github.com/ASKnetCommunity/ASKnet.Community/issues/22
 
   timeline:
-      title: "Timeline"
-      text: "Projects, Trainings and Activities"
-      section: timeline
-      # left is the default
-      #start_align: "left"
-      events:
-        - title: "The Pioneers"
-          year: "2015"
-          desc: "The program started in South Sudan with the creation of a community-based media training center, Juba’s Open Knowledge and Innovation Hub (jHUB). The program has since evolved into a collection of smaller hubs and local initiatives in South Sudan and Uganda known as #ASKnet."
-          image: assets/img/timeline/2015.jpg
-          alt: 
-          url: 
-        - title: "#ASKnet Pilot Workshop"
-          year: "2016"
-          desc: 'Pilot Workshop with trainers, 3 training kits (<a href="https://askotec.asknet.community/" target="_blank">#ASKotec</a>) and 30 students were developed in Uganda.'
-          image: assets/img/timeline/2016.jpg
-          alt:
-          url: https://github.com/ASKnetCommunity/ASKnet.Community
-        - title: "First Hubs Launched"
-          year: "2017"
-          desc: 'Four hubs already established and launched; training participants in different skills. More emerging through initiatives of the "jHUB Pioneers" Community members'
-          image: assets/img/timeline/2017.jpg
-          alt: 
-          url: 
-        - title: "Official #ASKnet Kickoff"
-          year: "2018"
-          desc: "Intense trainings on organisational development and #OpenTech in Uganda Rhino Camp with the first amazing Community Repair Café event. This is were #ASKnet emerged as an official program and the network of hubs and experts started to grow. "
-          image: assets/img/timeline/2018.jpeg
-          alt: 
-          url: 
-        - title: "Community Trainings"
-          year: "2019"
-          desc: "Trainings in Adjumani on collaborative (online) Documentation and beyond in the past three years, 25 trainings had been conducted with an average of 15 participants per training."
-          image: assets/img/timeline/2019.jpg
-          alt: 
-          url:
-        - title: "Decentralized Trainings, New Satellite Hubs"
-          year: "2020"
-          desc: "Moving from the individual trainings with compact sessions to a more decentralized activity network with lots of trainings across Uganda, South Sudan and into virtual space with Remote Community Co-Creation and Repair Cafés as well as strong organisations emerging and forming new sattelites"
-          image: assets/img/timeline/2020.jpg
-          alt: 
-          url: 
-        - title: "Coming Soon"
-          year: "2021"
-          desc: "A story yet to be told, stay tuned..."
-          image: assets/img/timeline/2021.jpg
-          alt: 
-          url: 
+    title: "Timeline"
+    text: "Projects, Trainings and Activities"
+    section: timeline
+    # left is the default
+    #start_align: "left"
+    events:
+      - title: "The Pioneers"
+        year: "2015"
+        desc: "The program started in South Sudan with the creation of a community-based media training center, Juba’s Open Knowledge and Innovation Hub (jHUB). The program has since evolved into a collection of smaller hubs and local initiatives in South Sudan and Uganda known as #ASKnet."
+        image: assets/img/timeline/2015.jpg
+        alt: 
+        url: https://openculture.agency/peacehackcamp-2015/
+      - title: "#ASKnet Pilot Workshop"
+        year: "2016"
+        desc: 'Pilot Workshop with trainers, 3 training kits (<a href="https://askotec.asknet.community/" target="_blank">#ASKotec</a>) and 30 students were developed in Uganda.'
+        image: assets/img/timeline/2016.jpg
+        alt:
+        url: https://github.com/ASKnetCommunity/ASKnet.Community
+      - title: "First Hubs Launched"
+        year: "2017"
+        desc: 'Four hubs already established and launched; training participants in different skills. More emerging through initiatives of the "jHUB Pioneers" Community members'
+        image: assets/img/timeline/2017.jpg
+        alt: 
+        url: 
+      - title: "Official #ASKnet Kickoff"
+        year: "2018"
+        desc: "Intense trainings on organisational development and #OpenTech in Uganda Rhino Camp with the first amazing Community Repair Café event. This is were #ASKnet emerged as an official program and the network of hubs and experts started to grow. "
+        image: assets/img/timeline/2018.jpeg
+        alt: 
+        url: 
+      - title: "Community Trainings"
+        year: "2019"
+        desc: "Trainings in Adjumani on collaborative (online) Documentation and beyond in the past three years, 25 trainings had been conducted with an average of 15 participants per training."
+        image: assets/img/timeline/2019.jpg
+        alt: 
+        url:
+      - title: "Decentralized Trainings, New Satellite Hubs"
+        year: "2020"
+        desc: "Moving from the individual trainings with compact sessions to a more decentralized activity network with lots of trainings across Uganda, South Sudan and into virtual space with Remote Community Co-Creation and Repair Cafés as well as strong organisations emerging and forming new sattelites"
+        image: assets/img/timeline/2020.jpg
+        alt: 
+        url: 
+      - title: "Coming Soon"
+        year: "2021-2022"
+        desc: "A story yet to be told, stay tuned..."
+        image: assets/img/timeline/2021.jpg
+        alt: 
+        url: 
       # you can enforce the alignment: 
       # align: right
-  end: 
+    end: 
       title: "Add new training, event or project!"
       link: "https://github.com/ASKnetCommunity/ASKnet.Community/issues/new?assignees=&labels=content-submit%2Cnew-timeline-event&template=new-timeline-event.yml&title=Add+Timeline+Event%3A+"
 
@@ -174,9 +197,33 @@ en: &DEFAULT_EN
       - title: "r0g_agency"
         url: https://openculture.agency/
         logo: assets/img/clients/r0g_logo.png
+        bw: true
       - title: "BMZ"
         url: https://www.bmz.de/en
         logo: assets/img/clients/founder_BMZ.jpg
+      - title: "Hive Colab"
+        url: https://hivecolab.org/
+        logo: assets/img/clients/hive_colab.png
+        bw: true
+      - title: "Platform Africa"
+        url: https://www.platformafrica.ngo/
+        logo: assets/img/hubs/01-logo.png
+        bw: true
+      - title: "GoGirls ICT"
+        url: https://gogirlsict.org/
+        logo: assets/img/hubs/02-logo.png
+        bw: true
+      - title: "Junub Open Space"
+        url: https://junubos.org/
+        logo: assets/img/hubs/03-logo.png
+        bw: true
+      - title: "ATAKA-HUB"
+        logo: assets/img/hubs/04-logo.png
+        bw: true
+      - title: "Youth Empowerment Foundation"
+        url: https://yef-uganda.org/
+        logo: assets/img/hubs/05-logo.png
+        bw: true
 
   team:
     title: "#ASKnet Team"

_hubs/hub-5-youth-empowerment-foundation.md

@@ -19,7 +19,7 @@ caption:
 {:.logo}
 ![Youth Empowerment Foundation](assets/img/hubs/05-logo.png)
 
-<a href="http://www.yefadjumani.org/" class="btn btn-primary visit-website" target="_blank">Visit Website</a>  <a href="https://www.facebook.com/WeAreYEF/" class="btn btn-primary visit-website" target="_blank"><i class="fab fa-facebook-f"></i></a>  <a href="https://www.instagram.com/youth.empowermentfoundation/" class="btn btn-primary visit-website" target="_blank"><i class="fab fa-instagram"></i></a>  <a href="https://www.youtube.com/channel/UCaGRC0F9tmuV0PeZb0DMVDg" class="btn btn-primary visit-website" target="_blank" ><i class="fab fa-youtube"></i></a>
+<a href="https://yef-uganda.org/" class="btn btn-primary visit-website" target="_blank">Visit Website</a>  <a href="https://www.facebook.com/WeAreYEF/" class="btn btn-primary visit-website" target="_blank"><i class="fab fa-facebook-f"></i></a>  <a href="https://www.instagram.com/youth.empowermentfoundation/" class="btn btn-primary visit-website" target="_blank"><i class="fab fa-instagram"></i></a>  <a href="https://www.youtube.com/channel/UCaGRC0F9tmuV0PeZb0DMVDg" class="btn btn-primary visit-website" target="_blank" ><i class="fab fa-youtube"></i></a>
 
 
 YEF works together with the community of Adjumani and displaced populations in the Pagirinya refugee settlement, to addresses local issues of unemployment and gender based violence by training youth in open technologies, entrepreneurship, peacebuilding and attitude change.

_includes/about.html

@@ -18,7 +18,7 @@ <h2>We need content here!</h2>
           <a class="btn btn-primary btn-lg mx-auto p-3" target="_blank" href="{{ site.data.sitetext[site.locale].about.submit }}">Submit Content</a>
           <a class="how-to" href="{{ site.data.sitetext[site.locale].submit-content.url }}">How it works?</a>
         </div>
-        {% endif %}
+    {% endif %}
   </div>
 </section>
 <!-- End About -->

_includes/head.html

@@ -42,6 +42,10 @@
   <!--<link href="assets/css/agency.min.css" rel="stylesheet">-->
   <link href="assets/css/agency.css" rel="stylesheet" />
 
+  <!--Favicon-->
+  <link rel="shortcut icon" href="{{ '/assets/img/favicon.png' | relative_url }} " type="image/x-icon">
+  <link rel="icon" href="{{ '/assets/img/favicon.png' | relative_url }} " type="image/x-icon">
+
   <!-- Page container change top padding when nav shrinks -->
   {% if page.layout == "page" %}
   <style>

_includes/partner-funder.html

@@ -5,7 +5,7 @@
 	    {% for client in site.data.sitetext[site.locale].clients.list %}
         <div class="col-md-3 col-sm-6 m-3">
           <a href="{{ client.url }}">
-            <img class="img-fluid d-block mx-auto" src="{{ client.logo }}" alt="{{ client.title }}" style="max-height: {{ site.data.sitetext[site.locale].clients.max-height | default: "100px" }}">
+            <img class="img-fluid d-block mx-auto" src="{{ client.logo }}" alt="{{ client.title }}" style="max-height: {{ site.data.sitetext[site.locale].clients.max-height | default: "100px" }}; {% if client.bw == true %}filter: grayscale(100%);{% endif %}">
           </a>
         </div>
 	    {% endfor %}

_includes/resources_grid.html

@@ -23,7 +23,7 @@ <h2>We need content here!</h2>
               <i class="fas fa-external-link-alt"></i>
             </div>
           </div>
-          <img class="img-fluid" src="{{ project.thumbnail }}" alt="">
+          <img class="img-fluid tools-img" src="{{ project.thumbnail }}" alt="">
         </a>
         <div class="hubs-caption">
           <h4>{{ project.title }}</h4>
@@ -38,7 +38,7 @@ <h4>{{ project.title }}</h4>
               <i class="{{ site.data.style.hubs-icon | default: "fas fa-plus fa-3x" }}"></i>
             </div>
           </div>
-          <img class="img-fluid border border-light" src="assets/img/hubs/00-new-hub.jpg" alt="">
+          <img class="img-fluid border border-light tools-img" src="assets/img/hubs/00-new-hub.jpg" alt="">
         </a>
         <div class="hubs-caption">
           <h4>Add new resource</h4>

_resources/020-askotec.md

@@ -1,6 +1,6 @@
 ---
 title: '#ASKotec'
-subtitle: open tech training kit
+subtitle: the open tech training kit
 thumbnail: assets/img/resources/askotec.jpg
 link: https://askotec.openculture.agency/
 ---

_resources/080-roshop.md

@@ -0,0 +1,6 @@
+---
+title: '#ROSHOP'
+subtitle: 'responsive open source housing prototype'
+thumbnail: assets/img/resources/roshop.jpg
+link: https://github.com/The-Youth-Empowerment-Foundation-Adju/Pagirinya-Satellite-House
+---

_sass/layout/_hubs.scss

@@ -10,7 +10,7 @@
       margin: 0 auto;
       cursor: pointer;
       .tools-img {
-        height: 130px;
+        height: 200px;
         width: 100%;
         object-fit: cover;
       }

_sass/layout/_timeline.scss

@@ -112,6 +112,7 @@
         width: 41%;
         padding: 0 20px 20px 30px;
         text-align: right;
+        height: 170px;
       }
       .timeline-image {
         left: 50%;

_tools/010-lead.md

@@ -1,6 +1,6 @@
 ---
-title: Local Experts Action Directory
-subtitle: Find a Local Expert by Skills and Location in this directory with the technical skills you need.
+title: Local Expert Action Directory
+subtitle: Find a local expert in your region with the help of this directory.
 thumbnail: assets/img/tools/lead.png
 link: https://lead.asknet.community/
 ---

_tools/020-meet.md

@@ -1,6 +1,6 @@
 ---
-title: Meet
-subtitle: a simple open-source web conferencing server. You can create your own rooms to host sessions, or join others using a short and convenient link.
+title: Online Meetings
+subtitle: A simple open-source web conferencing channel (BigBlueButton). 
 thumbnail: assets/img/tools/workshop.jpg
 link: https://meet.openculture.agency/r/ASKnet
 ---

_tools/040-askotec.md → _tools/025-askotec.md

@@ -1,6 +1,6 @@
 ---
 title: '#ASKotec'
-subtitle: Access to Skills and Knowledge Open Tech Emergency Case (#ASKotec) is a resource kit for community trainers, created for mobile field-use where there is neither easy power nor internet connectivity
+subtitle: Access to Skills and Knowledge Open Tech Emergency Case (#ASKotec) is a resource kit for community trainers.
 thumbnail: assets/img/tools/askotec.png
 link: https://askotec.openculture.agency/
 ---

_tools/030-HedgeDoc.md

@@ -1,6 +1,6 @@
 ---
 title: Collaborative Text Editor
-subtitle: A Text editor platform used to write and share markdown and for collaborative documents
+subtitle: A text editor (markdown format) to share your notes and collaborate in real-time. 
 thumbnail: assets/img/tools/hedgedoc.jpg
 link: https://doc.asknet.community/
 ---

_tools/050-forms.md

@@ -1,6 +1,6 @@
 ---
-title: Oh My Form
-subtitle: Create embedable forms for survey, market research, and much more.
+title: Survey Forms
+subtitle: 'Create embedable forms for survey, market research, and much more. <br><i class="fas fa-exclamation-triangle"></i> Coming Soon <i class="fas fa-exclamation-triangle"></i>'
 thumbnail: assets/img/tools/ohmyform.jpg
 link: https://form.asknet.community/
 ---

_tools/070-training.md

@@ -1,6 +1,6 @@
 ---
-title: Training
-subtitle: 'open training configurator, easily create your own training plan for your workshop. Find a training module that you want to use in the workshop and determine the order. <br><i class="fas fa-exclamation-triangle"></i> Coming Soon <i class="fas fa-exclamation-triangle"></i>'
+title: Open Training Configurator
+subtitle: 'Easily create your own training plans and arrange modules for your workshops. <br><i class="fas fa-exclamation-triangle"></i> Coming Soon <i class="fas fa-exclamation-triangle"></i>'
 thumbnail: assets/img/tools/training.jpg
 link: https://asknetcommunity.github.io/Training/
 ---

_tools/090-loomio.md

@@ -1,6 +1,6 @@
 ---
-title: Loomio
-subtitle: 'Loomio offers a workspace for conversation, sharing information and opinions, making proposals, deciding actions and achieving outcomes.<br><i class="fas fa-exclamation-triangle"></i> Coming Soon <i class="fas fa-exclamation-triangle"></i>'
+title: 'Proposals & Decision Making'
+subtitle: 'Loomio offers a workspace for conversation, sharing information and proposals, and deciding actions.<br><i class="fas fa-exclamation-triangle"></i> Coming Soon <i class="fas fa-exclamation-triangle"></i>'
 thumbnail: assets/img/tools/loomio.jpg
 link: https://loomio.asknet.community/
 ---