codeforlife-portal 1.0.0.post.dev481__tar.gz → 1.0.0.post.dev485__tar.gz

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post.dev481
+Version: 1.0.0.post.dev485
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/codeforlife_portal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post0.dev481
+Version: 1.0.0.post0.dev485
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/portal/_version.py

@@ -11,8 +11,8 @@ version_json = '''
 {
  "dirty": false,
  "error": null,
- "full-revisionid": "d91305fd594b6d5854ceef84f0df44e3eef3c468",
- "version": "1.0.0.post.dev481"
+ "full-revisionid": "3668346e26acc734fb77e588bca50a346f433b09",
+ "version": "1.0.0.post.dev485"
 }
 '''  # END VERSION_JSON
 

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/portal/static/portal/sass/styles.scss

@@ -9,6 +9,7 @@ $color-text-secondary: #fff;
 $color-text-tertiary: $color-text-grey;
 $color-text-form-error: #f00;
 $color-text-login-error: #ff0;
+$color-text-materials-tag: #808080;
 //Quotes
 $color-quote-text: $color-teacher-blue;
 $color-quote-name: $color-text-grey;
@@ -46,6 +47,7 @@ $color-table-border: #9b9b9b;
 $color-background-primary: #000;
 $color-background-secondary: #fff;
 $color-background-tertiary: $color-text-grey;
+$color-background-materials-tag: #ccc;
 $color-background-teach: $color-teacher-blue;
 $color-background-play: $color-student-orange;
 $color-background-play-indep: #ff637d;
@@ -198,6 +200,7 @@ h4 {
 
 a {
   color: #4a4a4a;
+  cursor: pointer;
 }
 
 a:hover,
@@ -250,7 +253,7 @@ blockquote p.says:before {
 }
 
 img {
-  @include _padding(15px, 0px, 15px, 0px);
+  @include _padding(15px, 15px, 15px, 15px);
   max-height: 100%;
   max-width: 100%;
 }
@@ -278,7 +281,6 @@ label {
   a:hover {
     border-bottom: 1px solid $color-text-tertiary;
     color: $color-text-tertiary;
-    cursor: pointer;
     text-decoration: none;
   }
 
@@ -297,7 +299,9 @@ button,
 .button,
 .button:hover,
 .button:active,
-.button:visited {
+.button:visited,
+.button:focus {
+  color: $color-text-secondary;
   text-decoration: none;
 }
 
@@ -395,7 +399,7 @@ button,
 
 .button--primary--positive {
   background: $color-button-primary-action-positive;
-  color: $color-text-primary;
+  color: $color-text-secondary;
 }
 
 .button--primary--negative {
@@ -416,7 +420,7 @@ button,
 
 .button--primary--setup {
   background: $color-button-primary-action-setup;
-  color: $color-text-primary;
+  color: $color-text-secondary;
 }
 
 .button--secondary {
@@ -429,7 +433,11 @@ button,
   color: $color-text-secondary;
 }
 
-.button--secondary--dark  {
+.button--secondary--dark,
+.button--secondary--dark:hover,
+.button--secondary--dark:active,
+.button--secondary--dark:visited,
+.button--secondary--dark:focus {
   border-color: $color-button-secondary-border-dark;
   color: $color-text-tertiary;
 
@@ -648,6 +656,17 @@ section {
   font-weight: 500;
 }
 
+.ks-tag
+{
+  @include _font-size(16px);
+  @include _margin(0px, 0px, 0px, 10px);
+  @include _padding(3px, 5px, 3px, 5px);
+  background-color: $color-background-materials-tag;
+  color: $color-text-materials-tag;
+  font-weight: normal;
+  vertical-align: middle;
+}
+
 .glyphicon-home {
   @include _padding(0px, 0px, 14px, 0px);
 }
@@ -1189,9 +1208,6 @@ td {
     vertical-align: middle;
   }
 
-  .button--primary--positive {
-    float: right;
-  }
 }
 
 table,
@@ -1378,6 +1394,11 @@ td {
     text-align: left;
   }
 
+  a:focus {
+    background-color: $color-background-secondary;
+    color: $color-teacher-blue;
+  }
+
 }
 
 .sub-nav--hidden {

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/base_new.html

@@ -90,7 +90,7 @@
             {% block leftMenuButtons %}
             {% if user|is_logged_in %}
                 {% if user|is_logged_in_as_teacher %}
-                    <a class="button--menu button--menu--primary"><b>Teacher</b></a>
+                    <a href="{% url 'teach_new' %}" class="button--menu button--menu--primary"><b>Teacher</b></a>
                     {% block secondaryButtons %}
                     {% if user|has_teacher_finished_onboarding %}
                         <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">School / Club</a>

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/teach_new/dashboard.html

@@ -149,10 +149,10 @@
                             <td><p class="small-text">{{ join_request.title }} {{ join_request.new_user.first_name }} {{ join_request.new_user.last_name }}</p></td>
                             <td><p class="small-text">{{ join_request.new_user.email }}</p></td>
                             <td class="cell-center">
-                                <a id="allow_button" class="button button--small button-primary button--primary--positive"
+                                <a id="allow_button" class="button button--small button--primary--positive"
                                         href="{% url 'organisation_allow_join_new' join_request.id %}">Allow</a></td>
                             <td class="cell-center">
-                                <a id="deny_button" class="button button--small button-primary button--primary--danger"
+                                <a id="deny_button" class="button button--small button--primary--danger"
                                         href="{% url 'organisation_deny_join_new' join_request.id %}">Deny</a></td>
                         </tr>
                     {% endfor %}

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/teach_new/materials_new.html

@@ -28,7 +28,7 @@
 <div class="banner banner--teacher row">
     <div class="col-sm-5 col-sm-offset-2">
         <h1 class="banner__text--primary">Teaching Resources</h1>
-        <p class="body-text">We've created a comprehensive set of teaching materials to give you the confidence and resources to use the Rapid Router game to help you teach children the UK
+        <p class="body-text">We&rsquo;ve created a comprehensive set of teaching materials to give you the confidence and resources to use the Rapid Router game to help you teach children the UK
             National Computing Curriculum right through their primary education.</p>
     </div>
     <div class="col-sm-5">
@@ -68,7 +68,7 @@
             </section>
             <div class="row">
                 <div class="col-sm-6">
-                    <h4>Key Stage 1, and Lower Key Stage 2</h4>
+                    <h4>Key Stage 1, Lower Key Stage 2</h4>
                     <p class="body-text"><a id="pdf_link" href= "{% url 'materials_viewer_new' pdf_name='introduction_to_coding' %}">Introduction to Coding Guide</a></p>
                     <p class="body-text"><a href= "{% url 'materials_viewer_new' pdf_name='levels_guide_1-50' %}">Levels Guide (1-50)</a></p>
                     <p class="body-text"><a href= "{% url 'materials_viewer_new' pdf_name='glossary' %}">Glossary</a></p>
@@ -92,8 +92,9 @@
             <h4>Children will learn the basics of coding by programming a delivery van to drive around simple routes. They will sequence instructions and use simple repetition
                 commands in a visual programming language.</h4>
             <a href="{{ 'KS1.zip'|cloud_storage }}" class="button button--regular button--primary--positive">Download all KS1 resources</a>
+            <img title="ZIP" alt="ZIP icon" src='{% static "portal/img_new/zip.png" %}'>
         </section>
-        <h3>Sessions</h3>
+        <h3>Sessions <span class="ks-tag">KS1</span></h3>
         <p class="body-text">Complete lesson plans for each session, including learning objectives, a list of useful resources, pupil activities, and guideance on share and
             review following the session.</p>
         <table class="table--resources">
@@ -148,7 +149,7 @@
                     <a href="{% url 'materials_viewer_new' pdf_name='ks1_session_10' %}">Try out a partners route</a></p></td>
             </tr>
         </table>
-        <h3>Resource Sheets</h3>
+        <h3>Resource Sheets <span class="ks-tag">KS1</span></h3>
         <p class="body-text">Resource sheets help you teach coding concepts offline in the classroom.
             You can <a href="{{ 'KS1/resource_sheets.zip'|cloud_storage }}">download the whole set</a> (zip file), or view and download
             them individually below.</p>
@@ -205,12 +206,12 @@
         <div class="col-sm-8 col-center">
             <div class="row row--under">
                 <div class="col-sm-6">
-                    <h3>Program Solutions</h3>
+                    <h3>Program Solutions <span class="ks-tag">KS1</span></h3>
                     <p class="body-text">This sheet gives you the confidence and the understanding needed to teach the lessons and the solutions to each level.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='program_solutions_1-28' %}">View programme solutions</a></p>
                 </div>
                 <div class="col-sm-6">
-                    <h3>Activity Set</h3>
+                    <h3>Activity Set <span class="ks-tag">KS1</span></h3>
                     <p class="body-text">This activity set gives you an overview of the Key Stage 1 module. It covers the resources that will be useful, learning
                         expectations and teacher preparation.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='ks1_activity_set' %}">View activity set</a></p>
@@ -218,13 +219,13 @@
             </div>
             <div class="row row--under">
                 <div class="col-sm-6">
-                    <h3>Assets</h3>
+                    <h3>Assets <span class="ks-tag">KS1</span></h3>
                     <p class="body-text">Printable sheets with all the game assets from direction arrows to scenery for offline activity activities.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='ks1_assets' %}">Assets</a></p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='ks1_code_wall_cards' %}">Code wall cards</a></p>
                 </div>
                 <div class="col-sm-6">
-                    <h3>Assessments</h3>
+                    <h3>Assessments <span class="ks-tag">KS1</span></h3>
                     <p class="body-text">Assessment guidance sheets for teachers explain techniques and key questions, pupil-led self-assessment sheets, along with
                         a record sheet for pupils. You can <a href="{{ 'KS1/assessment.zip'|cloud_storage }}"> download the
                         whole set</a> (zip file), or view and download them individually below.</p>
@@ -245,31 +246,32 @@
             <h4>Children will learn the basics of coding by programming a delivery van to drive around simple routes. They will sequence instructions and use simple repetition
                 commands in a visual programming language.</h4>
             <a href="{{ 'KS2.zip'|cloud_storage }}" class="button button--regular button--primary--setup">Download all Lower KS2 resources</a>
+            <img title="ZIP" alt="ZIP icon" src='{% static "portal/img_new/zip.png" %}'>
         </section>
-        <h3>Sessions</h3>
+        <h3>Sessions <span class="ks-tag">Lower KS2</span></h3>
         <p class="body-text">Complete lesson plans for each session, including learning objectives, a list of useful resources, pupil activities, and guideance on share and
             review following the session.</p>
         <table class="table--resources">
             <tr>
                 <td><p class="body-text"><strong>Session 1</strong></p></td>
                 <td><p class="body-text">
-                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_1' %}">Recap on using a simple 'repeat' loop</a></p></td>
+                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_1' %}">Recap on using a simple &lsquo;repeat&rsquo; loop</a></p></td>
             </tr>
             <tr>
                 <td><p class="body-text"><strong>Session 2</strong></p></td>
                 <td><p class="body-text">
-                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_2' %}">Using repeat with a condition on a simple route: 'repeat until'</a></p></td>
+                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_2' %}">Using repeat with a condition on a simple route: &lsquo;repeat until&rsquo;</a></p></td>
             </tr>
             <tr>
                 <td><p class="body-text"><strong>Session 3</strong></p></td>
                 <td><p class="body-text">
-                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_3' %}">Using simple selections and repetition: Repeat until at destination 'if…do'</a>
+                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_3' %}">Using simple selections and repetition: &lsquo;repeat until&rsquo; &lsquo;at destination&rsquo; &lsquo;if…do&rsquo;</a>
                 </p></td>
             </tr>
             <tr>
                 <td><p class="body-text"><strong>Session 4</strong></p></td>
                 <td><p class="body-text">
-                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_4' %}">General solution using repeat until and if…do…(including else if for more able children)</a>
+                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_4' %}">General solution using &lsquo;repeat until&rsquo; and &lsquo;if…do&rsquo; (including else if for more able children)</a>
                 </p></td>
             </tr>
             <tr>
@@ -281,7 +283,7 @@
             <tr>
                 <td><p class="body-text"><strong>Session 6</strong></p></td>
                 <td><p class="body-text">
-                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_6' %}">Traffic lights: understanding variables and the if do…if else statements</a>
+                    <a href="{% url 'materials_viewer_new' pdf_name='lks2_session_6' %}">Traffic lights: understanding variables and the &lsquo;if do…if else&rsquo; statements</a>
                 </p></td>
             </tr>
             <tr>
@@ -297,7 +299,7 @@
                 </p></td>
             </tr>
         </table>
-        <h3>Resource Sheets</h3>
+        <h3>Resource Sheets <span class="ks-tag">Lower KS2</span></h3>
         <p class="body-text">Resource sheets help you teach coding concepts offline in the classroom.
             You can <a href="{{ 'KS2/resource_sheets.zip'|cloud_storage }}">download the whole set</a> (zip file), or view and download
             them individually below.</p>
@@ -342,12 +344,12 @@
         <div class="col-sm-8 col-center">
             <div class="row row--under">
                 <div class="col-sm-6">
-                    <h3>Program Solutions</h3>
+                    <h3>Program Solutions <span class="ks-tag">Lower KS2</span></h3>
                     <p class="body-text">This sheet gives you the confidence and the understanding needed to teach the lessons and the solutions to each level.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='program_solutions_29-50' %}">View programme solutions</a></p>
                 </div>
                 <div class="col-sm-6">
-                    <h3>Activity Set</h3>
+                    <h3>Activity Set <span class="ks-tag">Lower KS2</span></h3>
                     <p class="body-text">This activity set gives you an overview of the Key Stage 1 module. It covers the resources that will be useful, learning
                         expectations and teacher preperation.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='lks2_activity_set' %}">View activity set</a></p>
@@ -355,13 +357,13 @@
             </div>
             <div class="row row--under">
                 <div class="col-sm-6">
-                    <h3>Assets</h3>
+                    <h3>Assets <span class="ks-tag">Lower KS2</span></h3>
                     <p class="body-text">Printable sheets with all the game assets from direction arrows to scenery for offline activity activities.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='lks2_assets' %}">Assets</a></p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='lks2_code_wall_cards' %}">Code wall cards</a></p>
                 </div>
                 <div class="col-sm-6">
-                    <h3>Assessments</h3>
+                    <h3>Assessments <span class="ks-tag">Lower KS2</span></h3>
                     <p class="body-text">Assessment guidance sheets for teachers explain techniques and key questions, pupil-led self-assessment sheets, along with
                         a record sheet for pupils. You can <a href="{{ 'KS2/assessment.zip'|cloud_storage }}"> download the
                         whole set</a> (zip file), or view and download them individually below.</p>
@@ -382,8 +384,9 @@
             <h4>Children will learn the basics of coding by programming a delivery van to drive around simple routes. They will sequence instructions and use simple repetition
                 commands in a visual programming language.</h4>
             <a href="{{ 'python/UKS2_Python.zip'|cloud_storage }}" class="button button--regular button--primary--negative">Download all Upper KS2 resources</a>
+            <img title="ZIP" alt="ZIP icon" src='{% static "portal/img_new/zip.png" %}'>
         </section>
-        <h3>Sessions</h3>
+        <h3>Sessions <span class="ks-tag">Upper KS2</span></h3>
         <p class="body-text">Complete lesson plans for each session, including learning objectives, a list of useful resources, pupil activities, and guideance on share and
             review following the session.</p>
         <table class="table--resources">
@@ -405,7 +408,7 @@
             <tr>
                 <td><p class="body-text"><strong>Session 4</strong></p></td>
                 <td><p class="body-text">
-                    <a href="{% url 'materials_viewer_new' pdf_name='uks2_session_4' %}">Understanding more Python commands (while, if…elif…else)</a></p></td>
+                    <a href="{% url 'materials_viewer_new' pdf_name='uks2_session_4' %}">Understanding more Python commands (&lsquo;while&rsquo;, &lsquo;if…elif…else&rsquo;)</a></p></td>
             </tr>
             <tr>
                 <td><p class="body-text"><strong>Session 5</strong></p></td>
@@ -428,7 +431,7 @@
                     <a href="{% url 'materials_viewer_new' pdf_name='uks2_session_8' %}">Assessment session - applying your coding knowledge to create a game challenge for a partner</a></p></td>
             </tr>
         </table>
-        <h3>Resource Sheets</h3>
+        <h3>Resource Sheets <span class="ks-tag">Upper KS2</span></h3>
         <p class="body-text">Resource sheets help you teach coding concepts offline in the classroom.
             You can <a href="{{ 'python/UKS2_Resource_sheets.zip'|cloud_storage }}">download the whole set</a> (zip file), or view and download
             them individually below.</p>
@@ -479,12 +482,12 @@
         <div class="col-sm-8 col-center">
             <div class="row row--under">
                 <div class="col-sm-6">
-                    <h3>Program Solutions</h3>
+                    <h3>Program Solutions <span class="ks-tag">Upper KS2</span></h3>
                     <p class="body-text">This sheet gives you the confidence and the understanding needed to teach the lessons and the solutions to each level.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='program_solutions_51-109' %}">View programme solutions</a></p>
                 </div>
                 <div class="col-sm-6">
-                    <h3>Activity Set</h3>
+                    <h3>Activity Set <span class="ks-tag">Upper KS2</span></h3>
                     <p class="body-text">This activity set gives you an overview of the Key Stage 1 module. It covers the resources that will be useful, learning
                         expectations and teacher preparation.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='uks2_activity_set' %}">View activity set</a></p>
@@ -492,13 +495,13 @@
             </div>
             <div class="row row--under">
                 <div class="col-sm-6">
-                    <h3>Assets</h3>
+                    <h3>Assets <span class="ks-tag">Upper KS2</span></h3>
                     <p class="body-text">Printable sheets with all the game assets from direction arrows to scenery for offline activity activities.</p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='uks2_assets' %}">Assets</a></p>
                     <p class="body-text"><a href="{% url 'materials_viewer_new' pdf_name='uks2_code_wall_cards' %}">Code wall cards</a></p>
                 </div>
                 <div class="col-sm-6">
-                    <h3>Assessments</h3>
+                    <h3>Assessments <span class="ks-tag">Upper KS2</span></h3>
                     <p class="body-text">Assessment guidance sheets for teachers explain techniques and key questions, pupil-led self-assessment sheets, along with
                         a record sheet for pupils. You can <a href="{{ 'python/UKS2-Assessment.zip'|cloud_storage }}" > download the 
                         whole set</a> (zip file), or view and download them individually below.</p>

{codeforlife-portal-1.0.0.post.dev481 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/teach_new/viewer_new.html

@@ -16,14 +16,14 @@
 
 <div id="pdf_viewer_page" class="top-element"></div>
 
-<div class="sticky-subnav sub-nav sub-nav--hidden sub-nav--teacher row--small">
+<div class="sticky-subnav sub-nav sub-nav--hidden sub-nav--teacher">
     <a href="{% url 'materials_new' %}#user_guide" class="button button--regular button--secondary button--secondary--light">User guide</a>
     <a href="{% url 'materials_new' %}#ks1" class="button button--regular button--secondary button--secondary--light">Key Stage 1</a>
     <a href="{% url 'materials_new' %}#lks2" class="button button--regular button--secondary button--secondary--light">Lower Key Stage 2</a>
     <a href="{% url 'materials_new' %}#uks2" class="button button--regular button--secondary button--secondary--light">Upper Key Stage 2</a>
 </div>
 
-<div class="sub-nav sub-nav--teacher row--small">
+<div class="sub-nav sub-nav--teacher">
     <a href="{% url 'materials_new' %}#user_guide" class="button button--regular button--secondary button--secondary--light">User guide</a>
     <a href="{% url 'materials_new' %}#ks1" class="button button--regular button--secondary button--secondary--light">Key Stage 1</a>
     <a href="{% url 'materials_new' %}#lks2" class="button button--regular button--secondary button--secondary--light">Lower Key Stage 2</a>