[tor-commits] [community/staging] Revert "Update user-research section to include hidden content"

[hiro at torproject.org]

commit 2d275464a50e6a4ba69614609df0be3e3d871325
Author: hiro <hiro at torproject.org>
Date:   Mon Oct 21 18:07:17 2019 +0200

    Revert "Update user-research section to include hidden content"
    
    This reverts commit c7309bc6e56a51d5e648fc7990671b2d589de1e6.
---
 content/user-research/become-tester/contents.lr | 4 +++-
 content/user-research/contents.lr               | 2 --
 content/user-research/guidelines/contents.lr    | 4 ++--
 content/user-research/open/contents.lr          | 4 ++--
 templates/two-columns-page.html                 | 2 +-
 templates/user-research.html                    | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr
index 9540db2..7025245 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test
 ---
 key: 1
 ---
-discoverable: no
+_template: layout.html
+---
+html: two-columns-page.html
 ---
 body:
diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr
index e6fb45d..2ad1aeb 100644
--- a/content/user-research/contents.lr
+++ b/content/user-research/contents.lr
@@ -21,5 +21,3 @@ body:
 ## We respect our users' privacy when we conduct research.
 
 We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research.
----
-_discoverable: yes
diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr
index d6256ca..247654c 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,10 +8,10 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
-_discoverable: yes
----
 key: 3
 ---
+html: two-columns-page.html
+---
 body:
 
 Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board!
diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr
index 5aacad2..c1f5c1a 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -12,10 +12,10 @@ title: Open User Research
 ---
 subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community.
 ---
-_discoverable: yes
----
 key: 2
 ---
+html: two-columns-page.html
+---
 body:
 These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines).
 
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 3c6832b..5151905 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -6,7 +6,7 @@
   <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}">
     {{ this.body }}
     <div class="row">
-    {% for child in this.children.include_hidden(true)|sort(attribute='key') %}
+    {% for child in this.children|sort(attribute='key') %}
         <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3">
             <div class="card h-100">
                 <div class="card-body">
diff --git a/templates/user-research.html b/templates/user-research.html
index 7d6bd13..e12fa62 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -8,13 +8,13 @@
     </div>
   </div>
   <div class="row">
-    {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %}
+    {% for child in this.children|sort(attribute='key') %}
       <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3">
         <div class="card h-100">
           <div class="card-body">
             <div class="card-body">
               <h4 class="card-title text-primary">
-                {{ _(child.title) }}
+                <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a>
               </h4>
               <p class="card-text">{{ _(child.subtitle) }}</p>
             </div>