Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Python Den in terms of use and use marketing video #2370

Merged
merged 1 commit into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed portal/static/portal/img/x_close_video.png
Binary file not shown.
1 change: 0 additions & 1 deletion portal/static/portal/sass/colorbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
#cboxPrevious:hover{background-position:-75px -25px;}
#cboxNext{position:absolute; bottom:0; left:27px; background:url(../img/colorboxImages/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
#cboxNext:hover{background-position:-50px -25px;}
#cboxClose{position:absolute; top:0; right:0; background:url(../img/x_close_video.png) no-repeat; width:52px; height:52px; text-indent:-9999px;}

/*
The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
Expand Down
2 changes: 1 addition & 1 deletion portal/templates/portal/teach.html
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ <h4 class="mt-0">Python programming</h4>
</div>
</div>
<div class="col-sm-6">
<a href="https://www.youtube-nocookie.com/embed/ko4nrr4kDzA?rel=0&amp;autoplay=1" class="youtube">
<a href="https://www.youtube-nocookie.com/embed/xMmcg-LOc3I?rel=0&amp;autoplay=1" class="youtube">
<img src="{% static 'portal/img/thumbnail_python_den.png' %}"
alt="Python Den logo">
</a>
Expand Down
20 changes: 11 additions & 9 deletions portal/templates/portal/terms.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@ <h5 id="introduction">1. Introduction</h5>
consent to register for a Code for Life account, and to use their email address. If you are using
this at school, you must first have your teacher&rsquo;s permission to use this site. These Terms of Use
were most recently updated on {{ last_updated }}.</strong></p>
<p>Code for Life includes all versions of &ldquo;Rapid Router&rdquo;, &ldquo;Kurono&rdquo; and any other games, platforms and
other products or services released by us (whether online or otherwise), from time to time,
including all Code for Life websites used to play the games, platforms and any other products or
services that we make available. &ldquo;Code for Life&rdquo; and &ldquo;Rapid Router&rdquo; are registered UK trade marks of
<p>Code for Life includes all versions of &ldquo;Rapid Router&rdquo;, &ldquo;Python Den&rdquo;,
&ldquo;Kurono&rdquo; and any other games, platforms and other products or services released by us
(whether online or otherwise), from time to time, including all Code for Life websites used to play
the games, platforms and any other products or services that we make available.
&ldquo;Code for Life&rdquo;, &ldquo;Rapid Router&rdquo; and "&ldquo;Kurono&rdquo;" are registered UK trademarks of
Ocado Innovation Limited.</p>
<p>You must take the time to read and understand the Terms of Use and the Privacy Notice before
registering for Code for Life.</p>
Expand Down Expand Up @@ -98,7 +99,7 @@ <h5 id="registration-and-types-of-membership">2. Registration and Types of Membe
<ul>
<li><p>Administrators: person or persons assigned responsibility for the management and security of
membership by other Users;</p></li>
<li><p>Users: any person using the Code for Life website, Rapid Router, Kurono or any other game,
<li><p>Users: any person using the Code for Life website, Rapid Router, Python Den, Kurono or any other game,
application or platform of ours regardless of membership;</p></li>
<li><p>Students: Users who are provided with login information for Code for Life by a teacher, parent,
guardian or carer;</p></li>
Expand Down Expand Up @@ -213,8 +214,8 @@ <h5 id="alerting-code-for-life">5. Alerting Code for Life</h5>

<h5 id="intellectual-property">6. Intellectual Property</h5>
<p>You acknowledge that all copyright, trademarks, and other intellectual property rights in and relating to
Code for Life (including all content of the Code for Life website, the Rapid Router application, the Kurono
application, related software (including any drawn and/or animated avatars, whether or not such avatars have
Code for Life (including all content of the Code for Life website, the Rapid Router application, the Python Den
application, the Kurono application, related software (including any drawn and/or animated avatars, whether or not such avatars have
any modifications) and any other games, applications or any other content that we make available from time
to time) are owned by Ocado Innovation Limited. These rights protect all of the applications, games,
products and services you see on the Code for Life website from time to time, including the graphics of
Expand Down Expand Up @@ -277,7 +278,8 @@ <h5 id="miscellaneous">8. Miscellaneous</h5>
<ul>
<li><p>all Code for Life websites used to play the games, platforms and any other products or
services that we make available to you</p></li>
<li><p>all versions of “Rapid Router”, “Kurono” and any other games, platforms and other products or
<li><p>all versions of “Rapid Router”, “Python Den”, “Kurono” and any
other games, platforms and other products or
services we released (whether online or otherwise)</p></li>
</ul>
<p><strong>When you visit the Code for Life site or register with us you agree to follow these rules.</strong></p>
Expand Down Expand Up @@ -373,7 +375,7 @@ <h5>4. Intellectual Property</h5>
reuse them without our permission. Just because it is easy to copy some of the content on the website, this
does not mean it is allowed. The content covered by Intellectual Property includes:</p>
<ol type="a">
<li><p>Rapid Router and the Kurono applications</p></li>
<li><p>Rapid Router, Python Den and Kurono applications</p></li>
<li><p>Games – this will include the design of the games (for example their graphics, style and gameplay)</p></li>
<li><p>Avatars, whether they are drawn or animated</p></li>
<li><p>Any other software or services you see on our website</p></li>
Expand Down
Loading