Merge remote-tracking branch 'origin/erin'

views/info/faq.html

@@ -27,7 +27,7 @@
       <li>Enter an email address or a unique nickname and a password.</li>
       <li>Click Submit.</li>
     </ul>
-    <p>If you are younger than 18 years old, you will need to enter your parent’s or guardian’s email address as well to confirm that it’s okay for you to be visiting this website.
+    <p>If you are younger than 13 years old, you will need to enter your parent’s or guardian’s email address as well to confirm that it’s okay for you to be visiting this website.
     </p>
   </dd>
 
@@ -81,7 +81,7 @@
   
   <dt>Why does the site say my parent or guardian has to approve the badge?</dt>
   <dd>
-    <p>If you are younger than 18 years old, your parent or guardian will need to approve each of the badges you apply to earn. If your application is approved by your parent or guardian, it next will go to a mentor for review. If the mentor decides that your badge application meets all the requirements, you will earn the badge. Your parent will have to approve the earned badge for it to appear in your portfolio.
+    <p>If you are younger than 13 years old, your parent or guardian will need to approve each of the badges you apply to earn. If your application is approved by your parent or guardian, it next will go to a mentor for review. If the mentor decides that your badge application meets all the requirements, you will earn the badge. Your parent will have to approve the earned badge for it to appear in your portfolio.
     </p>
   </dd>
 
@@ -111,13 +111,13 @@
 
   <dt>What is the My Applications page for?</dt>
   <dd>
-    <p>The My Applications page shows you badges you have applied for, those waiting for review, and those already reviewed. If you are under 18, this is where badges that are awaiting your parent or guardian approval are also available. 
+    <p>The My Applications page shows you badges you have applied for, those waiting for review, and those already reviewed. If you are under 13, this is where badges that are awaiting your parent or guardian approval are also available. 
     </p>
   </dd>
   
     <dt>What can I do with the badges in My Portfolio?</dt>
   <dd>
-    <p>If you’re younger than 18 years old, you can see all that you’ve done during the summer and be proud!
+    <p>If you’re younger than 13 years old, you can see all that you’ve done during the summer and be proud!
     </p>
   </dd>
 
@@ -146,8 +146,8 @@
       <li>Have your child sign up for an account by going to <a href="//chicagosummeroflearning.org">chicagosummeroflearning.org</a> and clicking log in/sign up.</li>
       <li class="split-item">
         <ol>
-          <li>If your child is older than 18, s/he will be able to provide an email address and sign up to use the site without your approval. </li>
-          <li>If your child is under the age of 18, s/he will be required to add the e-mail address of a parent or guardian. You will be notified via that address and asked to approve your child having an account on the Chicago Summer of Learning site before we activate that account.</li>
+          <li>If your child is older than 13, s/he will be able to provide an email address and sign up to use the site without your approval. </li>
+          <li>If your child is under the age of 13, s/he will be required to add the e-mail address of a parent or guardian. You will be notified via that address and asked to approve your child having an account on the Chicago Summer of Learning site before we activate that account.</li>
         </ol>
       </li>
     </ol>
@@ -171,7 +171,7 @@
 
   <dt>How can I find programs and activities that my child will enjoy?</dt>
   <dd>
-    <p>You and your child can use the filters on the Explore and Earn pages to [hyperlink] select from a list of available learning opportunities. Start with Explore to find badge opportunities for your child by program.
+    <p>You and your child can use the filters on the <a href="/explore">Explore</a> and <a href="/earn">Earn</a> pages to select from a list of available learning opportunities. Start with Explore to find badge opportunities for your child by program.
     </p>
     <p>On the <a href="/explore">Explore</a> page, you can filter programs available by:
     <ul>
@@ -199,7 +199,7 @@
     </p>
     <p>Finally, the activity filter notes whether the activity takes place online or offline. 
     </p>
-    <p>After your child has applied for and earned a badge (and, if your child is younger than 18 years old, after you have approved it), we’ll recommend other badges to earn. You and your child can click on those suggestions to get more information and see if any of them are interesting. Your child should apply for as many as he or she would like!
+    <p>After your child has applied for and earned a badge (and, if your child is younger than 13 years old, after you have approved it), we’ll recommend other badges to earn. You and your child can click on those suggestions to get more information and see if any of them are interesting. Your child should apply for as many as he or she would like!
     </p>
   </dd>
 
@@ -219,13 +219,13 @@
 
   <dt>Can I delete badges from my child’s account?</dt>
   <dd>
-    <p>If your child is younger than 18 years old, you may delete content from your child’s account at any time.
+    <p>If your child is younger than 13 years old, you may delete content from your child’s account at any time.
     </p>
   </dd>
 
   <dt>Can I cancel my child’s account with Chicago Summer of Learning?</dt>
   <dd>
-    <p>If your child is younger than 18 years old, you may cancel your child’s account at any time.
+    <p>If your child is younger than 13 years old, you may cancel your child’s account at any time.
     </p>
   </dd>
 </dl>
@@ -255,7 +255,7 @@
     <ol>
       <li>Go to http://assess.chicagosummeroflearning.org and sign into your account. After you’ve logged in, you’ll see the word Queue in the navigation bar. Click Queue to see the list of submissions you have to approve.</li>
       <li>Click Review to approve a submission. You’ll see an image or video of the work being submitted to earn the badge, along with a summary of what it is. Check off the criteria that the work meets in order to earn the badge.</li>
-      <li>If the learner submitting the badge is 18 years old or older, you also can add personalized feedback if you’d like. If the learner is less than 18 years old, you can select a supplied response from the dropdown menu. You can choose more than one response from the list of supplied responses. </li>
+      <li>If the learner submitting the badge is 13 years old or older, you also can add personalized feedback if you’d like. If the learner is less than 13 years old, you can select a supplied response from the dropdown menu. You can choose more than one response from the list of supplied responses. </li>
       <li>After checking off the criteria that the submission meets to earn the badge, click Submit to approve the work and award the badge.</li>
       <li>Once you’ve reviewed a submission and awarded the badge, click the trash can icon to remove it from your queue.</li>
     </ol>

views/user/backpack.html

@@ -14,6 +14,7 @@
 {% endblock %}
 
 {% block list %}
+  <p>See all the badges you have earned. Keep it up!</p>
   {{ super() }}
   <li class="span3">
   <figure class="thumbnail">