Regoranize sections according to #582

- This is the reorganization of #582.  The logic and description of
  this change is stated there (I won't repeat it here).  There are no
  content changes at all.
- But, "Code repository hosting" was renamed to "Gitlab repository"
- Perhaps there are still small bugs but these can be updated over time.
- Review: likely accept based on what is in #582

content/about/impact.md

@@ -0,0 +1,67 @@
++++
+title = "Impact of online CodeRefinery workshops"
++++
+
+[Over 1100 people have attended a CodeRefinery workshop since the project
+started](statistics/#standard-coderefinery-workshops)! Since the pandemic started, we shifted the gear towards online workshops. In total 407 participated in online CodeRefinery workshops. 
+
+Along the change in tools and practices, we changed questions in pre-/post-workshop surveys. To provide the most consistent and recent picture of our participants and impact, the below is based on data provided by pre-/post-workshop surveys answered in relevance to **only online workshops**. (Note: pre-/post-workshops are opt-in.) 
+
+[Summary of impact of in-person workshops until early 2019](/about/impact_until-early-2019) is archived.
+
+## Participants' background
+
+Results of pre-workshop surveys (answers given by 301 persons) show that our workshop participants range from undergraduate students to full
+professors, and come from a variety of academic disciplines. 
+
+The chart below shows the result of a question asking about their job title, position or occupation.  
+
+<!--- add /workshops/ before the path of a figure
+--->
+
+![alt text](/workshops/position-online.png "A horizontal barchart, showing that nearly 120 participants are graduate students, a little over 60 are researchers, a little below 60 are postdocs. Otherwise, less than 20 for each of the followings: research software engineers, professors, undergraduate students and other positions for each of the following positions. The results show few participants from industry")
+
+The chart below shows the result of a question asking about their academic discipline.  
+![alt text](/workshops/discipline-online.png "A horizontal barchart, showing that 46 participants are from physical science, followed by computer and information sciences (41), earth and related environmental sciences (41), biological sciences (36), mechanical engineering (22), mathematics (16) and other various disciplines.")
+
+
+## What is our impact?
+
+The long-term impact of CodeRefinery workshops is measured through a
+post-workshop survey which is sent out to all former participants 3 months to 1 year after attending a workshop. To date (12th Sep 2021) we received 80 voluntary responses to 
+a post-workshop survey by participants of an online workshop.
+
+The heatmap below shows how former participants
+use various software development tools after attending a workshop, and
+how their code and collaboration with colleagues has changed. 
+
+*Please note that a part of responses answered the specific tool to different types of impact, for example, there are cases where both "started using" and "using better" was chosen for "Version control".*
+
+![alt text](/workshops/heatmap-online.png "A
+heatmap based on the number of responses a matrix chart showing 4 impact levels on x-axix (from left, not using, started using, unchanged, and using better) and tools or practices introduced in the workshops on y-axis (from top, workflow, version control, Jupyter, Deploying documentation, Coverage, Code review, and Automated testing). 63 answered using version control better, and 35 answered started using version control. 30 answered using Jupyter better and 23 started using Jupyter. 21 answered deploying documentation better and 23 started doing so. 22 using code review better and 23 started using it. On the other hand, Many answered not using; workflows (62), coverage (62), or automated testing (57)")
+
+The chart below shows fraction of former participants who feel their code and collaboration with colleagues has been improved. 
+![alt text](/workshops/yes-no-questions-online.png "A bar chart
+showing fraction of participants who feel that their code is more resusable (0.59), more reproduceble (0.50), more modular (0.34), better documented (0.64), and that it is easier to collaborate (near 0.85) and incroduced tools to colleagues (below 0.75)")
+
+## What else has changed do our participants say after attending a workshop?
+
+Below are examples of free-text answers given to this question to showcase variety of answers. Generally we see many gained confidence in using tools like Git.
+
+> "Constantly making sure my code is as accessible as possible to ensure future me and others can understand and use it, i.e. writing explanatory comments everywhere no matter how simple the code may be."
+
+> "Increased confidence. Sense of community (extremely valuable during the pandemic times). The value of volunteering."
+
+> "I'm significantly more confident in navigating and creating versions and branches in git and on GitHub."
+
+> "It was a great experience, it just did sum up all the necessary tools and step to build more sustainable code. That saved me A LOT of time trying to figuring out everything by myself!! :)"
+
+> "I am an experienced developer and instructor and attended the workshop mainly to help out. It did not change much for me in terms of the course content. However, the course was am absolutely great experience for me in terms of seeing how to conduct a massive online course with live participation. The HackMD "backchannel" and breakout rooms with helpers are features I now incorporate in teaching at my own university."
+
+>"Think much more before starting a coding project and overall better structure: coding with a structure in mind (making modules, simplifying), using a structured approach to coding (knowing which tools, which steps, doing reviews, etc.), etc."
+
+> "I have a much broader understanding of these tools and why they are important. I regularly use the tutorials and movies to help teach new incoming students in between CodeRefinery workshops."
+
+> "The project team has a common understanding of why and how to track code versions and collaborate on processing scripts"
+
+> "More focus on that results and papers should be reproducible, ideally even for referees."

content/about/statistics.md

@@ -0,0 +1,7 @@
++++
+title = "Statistics"
+template = "statistics.html"
++++
+
+This is mainly to simplify reporting to funding organizations. But maybe it is
+also interesting otherwise.

content/workshops/impact.md

@@ -1,67 +1,6 @@
 +++
-title = "Impact of online CodeRefinery workshops"
 +++
 
-[Over 1100 people have attended a CodeRefinery workshop since the project
-started](statistics/#standard-coderefinery-workshops)! Since the pandemic started, we shifted the gear towards online workshops. In total 407 participated in online CodeRefinery workshops. 
+# Impact
 
-Along the change in tools and practices, we changed questions in pre-/post-workshop surveys. To provide the most consistent and recent picture of our participants and impact, the below is based on data provided by pre-/post-workshop surveys answered in relevance to **only online workshops**. (Note: pre-/post-workshops are opt-in.) 
-
-[Summary of impact of in-person workshops until early 2019](/workshops/impact_until-early-2019) is archived.
-
-## Participants' background
-
-Results of pre-workshop surveys (answers given by 301 persons) show that our workshop participants range from undergraduate students to full
-professors, and come from a variety of academic disciplines. 
-
-The chart below shows the result of a question asking about their job title, position or occupation.  
-
-<!--- add /workshops/ before the path of a figure
---->
-
-![alt text](/workshops/position-online.png "A horizontal barchart, showing that nearly 120 participants are graduate students, a little over 60 are researchers, a little below 60 are postdocs. Otherwise, less than 20 for each of the followings: research software engineers, professors, undergraduate students and other positions for each of the following positions. The results show few participants from industry")
-
-The chart below shows the result of a question asking about their academic discipline.  
-![alt text](/workshops/discipline-online.png "A horizontal barchart, showing that 46 participants are from physical science, followed by computer and information sciences (41), earth and related environmental sciences (41), biological sciences (36), mechanical engineering (22), mathematics (16) and other various disciplines.")
-
-
-## What is our impact?
-
-The long-term impact of CodeRefinery workshops is measured through a
-post-workshop survey which is sent out to all former participants 3 months to 1 year after attending a workshop. To date (12th Sep 2021) we received 80 voluntary responses to 
-a post-workshop survey by participants of an online workshop.
-
-The heatmap below shows how former participants
-use various software development tools after attending a workshop, and
-how their code and collaboration with colleagues has changed. 
-
-*Please note that a part of responses answered the specific tool to different types of impact, for example, there are cases where both "started using" and "using better" was chosen for "Version control".*
-
-![alt text](/workshops/heatmap-online.png "A
-heatmap based on the number of responses a matrix chart showing 4 impact levels on x-axix (from left, not using, started using, unchanged, and using better) and tools or practices introduced in the workshops on y-axis (from top, workflow, version control, Jupyter, Deploying documentation, Coverage, Code review, and Automated testing). 63 answered using version control better, and 35 answered started using version control. 30 answered using Jupyter better and 23 started using Jupyter. 21 answered deploying documentation better and 23 started doing so. 22 using code review better and 23 started using it. On the other hand, Many answered not using; workflows (62), coverage (62), or automated testing (57)")
-
-The chart below shows fraction of former participants who feel their code and collaboration with colleagues has been improved. 
-![alt text](/workshops/yes-no-questions-online.png "A bar chart
-showing fraction of participants who feel that their code is more resusable (0.59), more reproduceble (0.50), more modular (0.34), better documented (0.64), and that it is easier to collaborate (near 0.85) and incroduced tools to colleagues (below 0.75)")
-
-## What else has changed do our participants say after attending a workshop?
-
-Below are examples of free-text answers given to this question to showcase variety of answers. Generally we see many gained confidence in using tools like Git.
-
-> "Constantly making sure my code is as accessible as possible to ensure future me and others can understand and use it, i.e. writing explanatory comments everywhere no matter how simple the code may be."
-
-> "Increased confidence. Sense of community (extremely valuable during the pandemic times). The value of volunteering."
-
-> "I'm significantly more confident in navigating and creating versions and branches in git and on GitHub."
-
-> "It was a great experience, it just did sum up all the necessary tools and step to build more sustainable code. That saved me A LOT of time trying to figuring out everything by myself!! :)"
-
-> "I am an experienced developer and instructor and attended the workshop mainly to help out. It did not change much for me in terms of the course content. However, the course was am absolutely great experience for me in terms of seeing how to conduct a massive online course with live participation. The HackMD "backchannel" and breakout rooms with helpers are features I now incorporate in teaching at my own university."
-
->"Think much more before starting a coding project and overall better structure: coding with a structure in mind (making modules, simplifying), using a structured approach to coding (knowing which tools, which steps, doing reviews, etc.), etc."
-
-> "I have a much broader understanding of these tools and why they are important. I regularly use the tutorials and movies to help teach new incoming students in between CodeRefinery workshops."
-
-> "The project team has a common understanding of why and how to track code versions and collaborate on processing scripts"
-
-> "More focus on that results and papers should be reproducible, ideally even for referees."
+Moved to [/about/impact](/about/impact/).

content/workshops/statistics.md

@@ -1,7 +1,6 @@
 +++
-title = "Statistics"
-template = "statistics.html"
 +++
 
-This is mainly to simplify reporting to funding organizations. But maybe it is
-also interesting otherwise.
+# Statistics
+
+Moved to [/about/statistics](/about/statistics).

templates/base.html

@@ -71,16 +71,26 @@
               </a>
               <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                 <a class="dropdown-item" href="{{ get_url(path="/about/project/") | safe }}">Project</a>
-                <a class="dropdown-item" href="{{ get_url(path="/about/reports/") | safe }}">Articles and reports</a>
-                <a class="dropdown-item" href="{{ get_url(path="/about/who-we-are/") | safe }}">Who we are</a>
-                <a class="dropdown-item" href="{{ get_url(path="/about/contributors/") | safe }}">Instructors and helpers</a>
-                <a class="dropdown-item" href="{{ get_url(path="/about/funding/") | safe }}">Funding partners</a>
-                <a class="dropdown-item" href="{{ get_url(path="/about/hubs/") | safe }}">Training hubs</a>
+                <a class="dropdown-item" href="{{ get_url(path="/about/impact/") | safe }}">Impact and testimonials</a>
+                <a class="dropdown-item" href="{{ get_url(path="/about/statistics/") | safe }}">Statistics</a>
                 <a class="dropdown-item" href="{{ get_url(path="/about/code-of-conduct/") | safe }}">Code of Conduct</a>
-                <a class="dropdown-item" href="{{ get_url(path="/about/meeting-minutes/") | safe }}">Meeting minutes</a>
+                <a class="dropdown-item" href="{{ get_url(path="/about/reports/") | safe }}">Articles and reports</a>
               </div>
             </li>
-
+            <li class="nav-item dropdown">
+              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink"
+                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                Get Involved
+              </a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                <a class="dropdown-item" href="{{ get_url(path="/organization/get-involved/") | safe }}">Get involved</a>
+                <a class="dropdown-item" href="{{ get_url(path="/organization/who-we-are/") | safe }}">Who we are</a>
+                <a class="dropdown-item" href="{{ get_url(path="/organization/contributors/") | safe }}">Instructors and helpers</a>
+                <a class="dropdown-item" href="{{ get_url(path="/organization/funding/") | safe }}">Funding partners</a>
+                <a class="dropdown-item" href="{{ get_url(path="/organization/hubs/") | safe }}">Training hubs</a>
+                <a class="dropdown-item" href="{{ get_url(path="/organization/meeting-minutes/") | safe }}">Meeting minutes</a>
+	      </div>
+            </li>
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink"
                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -90,8 +100,6 @@
                 <a class="dropdown-item" href="{{ get_url(path="/workshops/about/") | safe }}">About our workshops</a>
                 <a class="dropdown-item" href="{{ get_url(path="/workshops/upcoming/") | safe }}">Upcoming workshops/events</a>
                 <a class="dropdown-item" href="{{ get_url(path="/workshops/past/") | safe }}">Past workshops/events</a>
-                <a class="dropdown-item" href="{{ get_url(path="/workshops/impact/") | safe }}">Impact and testimonials</a>
-                <a class="dropdown-item" href="{{ get_url(path="/workshops/statistics/") | safe }}">Statistics</a>
               </div>
             </li>
 
@@ -102,14 +110,11 @@
               <a class="nav-link" href="{{ get_url(path="/blog/") | safe }}">Blog</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="{{ get_url(path="/repository/") | safe }}">Code repository hosting</a>
+              <a class="nav-link" href="{{ get_url(path="/repository/") | safe }}">Gitlab repository</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="{{ get_url(path="/resources/") | safe }}">Resources</a>
             </li>
-            <li class="nav-item">
-              <a class="nav-link" href="{{ get_url(path="/get-involved/") | safe }}">Get involved</a>
-            </li>
             <li class="nav-item">
               <a class="nav-link" href="https://neic.no" target="_blank">Funded by NeIC</a>
             </li>

templates/funding.html

@@ -6,7 +6,7 @@
   CodeRefinery as part of the Nordic e-Infrastructure Collaboration
   project.
 
-  {% set data = load_data(path="content/about/funding/partners.toml") %}
+  {% set data = load_data(path="content/organization/funding/partners.toml") %}
 
   {% for partner in data.partners %}
     <div class="row top-buffer">
@@ -20,7 +20,7 @@ <h3><a href="{{ partner.website }}" target="_blank">{{ partner.name }}</a></h3>
     <div class="row">
       <div class="col-sm-2">
         <a href="{{ partner.website }}" target="_blank">
-          {% set image = resize_image(path="about/funding/" ~ partner.logo, width=120, op="fit_width") %}
+          {% set image = resize_image(path="organization/funding/" ~ partner.logo, width=120, op="fit_width") %}
           <img src="{{ image.url }}"
                alt="{{ partner.name }} logo">
         </a>

templates/shortcodes/gallery.html

@@ -1,10 +1,10 @@
-{% set data = load_data(path="content/about/people/people.toml") %}
+{% set data = load_data(path="content/organization/people/people.toml") %}
 
 <div class="row centered top-buffer">
   {% for person in data.people %}
     <div class="col-lg-3 col-md-3 col-sm-3" style="padding-top: 10px">
       {% if person.photo %}
-        {% set image = resize_image(path="about/people/" ~ person.photo, height=260, op="fit_height") %}
+        {% set image = resize_image(path="organization/people/" ~ person.photo, height=260, op="fit_height") %}
         <img src="{{ image.url }}"
              class="mugshot"
              alt="{{ person.name }}'s photo">