Merge pull request code-dot-org#580 from code-dot-org/test

DTP

Author: tanyaparker

dashboard/app/models/eval.rb

@@ -73,6 +73,12 @@ def self.toolbox
         <block type="functional_logical_not" />
         <block type="functional_boolean" />
       </category>
+      <category name ="Cond">
+        <block type="functional_cond_1" />
+        <block type="functional_cond_2" />
+        <block type="functional_cond_3" />
+        <block type="functional_cond_4" />
+      </category>
       <category name="Functions" custom="PROCEDURE"/>
       <category name="Variables" custom="FUNCTIONAL_VARIABLE" />
     XML

dashboard/app/models/studio.rb

@@ -298,6 +298,13 @@ def common_blocks(type)
   <block type="functional_logical_not" />
   <block type="functional_boolean" />
 </category>
+<category name ="Functional Cond">
+  <block type="functional_cond_1" />
+  <block type="functional_cond_2" />
+  <block type="functional_cond_3" />
+  <block type="functional_cond_4" />
+</category>
+
 #{k1_blocks(type) if is_k1 == 'true'}
     XML
   end

pegasus/data/cdo-news-items.csv

@@ -15,9 +15,9 @@ heading_s,url_s,date_s,publication_s,tag_s*,site_s*
 ,,,,,
 ,,,,,
 ,,,,,
-,,,,,
-,,,,,
+Ireland's head of state learns an Hour of Code,http://www.independent.ie/videos/irish-news/video-taoiseach-is-first-head-of-state-to-partake-in-the-hour-of-code-30779183.html,11/27/2014,The Irish Independent,news,all
 "In partnership with Fox, Code.org adds Ice Age's Scrat to tutorial lineup",http://codeorg.tumblr.com/post/103557585923/scrat,11/25/2014,Code.org,news,code.org
+Making it Count: Computer science spreads as graduation requirement,http://www.usnews.com/news/stem-solutions/articles/2014/11/25/making-it-count-computer-science-spreads-as-graduation-requirement,11/25/2014,US News & World Report,csnews,all
 Chicago schools add computer science to the core curriculum,http://www.washingtonpost.com/opinions/catherine-rampell-chicago-schools-add-computer-science-to-the-core-curriculum/2014/11/24/037c78f0-7417-11e4-a5b2-e1217af6b33d_story.html,11/21/2014,Washington Post,csnews,all
 How to get more girls to code: Use Frozen's Elsa,http://www.usatoday.com/story/tech/2014/11/19/disney-codeorg-frozen-girls-computer-programming/19260097/,11/19/2014,USA Today,news,all
 Announcing an Hour of Code with Anna and Elsa from Disney’s “Frozen”,http://codeorg.tumblr.com/post/103042812198/frozen,11/19/2014,Code.org,announce,all

pegasus/data/cdo-partners.csv

@@ -19,6 +19,7 @@ CoderDojo,http://coderdojo.com/,additional,TRUE,FALSE,TRUE,
 CodeStart,http://codestart.com/,additional,TRUE,FALSE,TRUE,
 Congressional App Challenge,http://congressionalappchallenge.us,additional,TRUE,FALSE,TRUE,
 Coursera,https://www.coursera.org/,additional,TRUE,FALSE,TRUE,
+Dice.com,http://dice.com,additional,TRUE,TRUE,TRUE,
 DigitalUndivided,http://www.digitalundivided.com/,additional,TRUE,FALSE,TRUE,
 Discovery Education,http://www.discoveryeducation.com/,additional,TRUE,FALSE,TRUE,
 DIY,https://diy.org/,additional,TRUE,FALSE,TRUE,
@@ -35,6 +36,7 @@ Institute for Mathematics and Computer Science,http://www.eimacs.com/,additional
 Junior Achievement,https://www.juniorachievement.org/,additional,TRUE,FALSE,TRUE,
 Kapor Center for Social Impact,http://kaporcenter.org/,additional,TRUE,FALSE,TRUE,
 KIPP Academy of Innovation,http://www.kippla.org/kai/,additional,TRUE,FALSE,TRUE,
+Koding,https://koding.com/,additional,TRUE,FALSE,TRUE,
 Laer Kidsa Koding,http://www.kidsakoder.no/,additional,TRUE,FALSE,TRUE,
 Learn Fresh,http://www.learnfresh.org/,additional,TRUE,FALSE,TRUE,
 Mass Technology Leadership Council,http://www.masstlc.org/,additional,TRUE,FALSE,TRUE,
@@ -51,16 +53,20 @@ NBA Math Hoops,http://nbamathhoops.org/,additional,TRUE,FALSE,TRUE,
 New Schools Venture Fund,http://www.newschools.org/,additional,TRUE,FALSE,TRUE,
 nPower,http://www.npowernw.org/,additional,TRUE,FALSE,TRUE,
 One Laptop Per Child,http://one.laptop.org/,additional,TRUE,FALSE,TRUE,
+Optimizely,https://www.optimizely.com/,additional,TRUE,FALSE,TRUE,
+Pearson,http://www.pearson.com,additional,TRUE,FALSE,TRUE,
 Project Lead the Way,http://www.pltw.org,additional,TRUE,FALSE,TRUE,
 Quib.ly,http://quib.ly/welcome?v=2&utm_expid=63811575-3.2pOe5DuzReCS3ShLz1oTRA.1,additional,TRUE,FALSE,TRUE,
 Quorum,http://quorumlanguage.com/,additional,TRUE,FALSE,TRUE,
 Rekode,http://rekode.com/,additional,TRUE,FALSE,TRUE,
 Rocketship Education,http://www.rsed.org/,additional,TRUE,FALSE,TRUE,
+Rockwell Automation,http://www.rockwellautomation.com,additional,TRUE,FALSE,TRUE,
 Science Channel,http://science.discovery.com/,additional,TRUE,FALSE,TRUE,
 ScriptEd,http://www.scripted.org/,additional,TRUE,FALSE,TRUE,
 Smore,https://www.smore.com/,additional,TRUE,FALSE,TRUE,
 Splunk,http://www.splunk.com/,additional,TRUE,FALSE,TRUE,
 StudentRND,http://studentrnd.org/,additional,TRUE,FALSE,TRUE,
+Tata Consultancy Services,http://www.tcs.com/Pages/default.aspx,additional,TRUE,FALSE,TRUE,
 Teaching Kids Programming,http://teachingkidsprogramming.org/,additional,TRUE,FALSE,TRUE,
 Teaching Matters,http://www.teachingmatters.org/,additional,TRUE,FALSE,TRUE,
 Technovation Challenge,http://www.TechnovationChallenge.org,additional,TRUE,FALSE,TRUE,
@@ -98,6 +104,21 @@ National Council of Teachers of Mathematics,http://www.nctm.org,founder,FALSE,TR
 National Math + Science Initiative,http://www.nms.org/,founder,FALSE,TRUE,FALSE,
 National Science Teachers Association,http://www.nsta.org/,founder,FALSE,TRUE,FALSE,
 SAS,http://www.sas.com/,founder,FALSE,TRUE,FALSE,
+Amazon Web Services,http://aws.amazon.com/,infrastructure,TRUE,FALSE,TRUE,
+Atlassian HipChat,https://www.hipchat.com/,infrastructure,TRUE,FALSE,TRUE,
+Chef,https://www.getchef.com/,infrastructure,TRUE,FALSE,TRUE,
+DataPRM,http://datarpm.com,infrastructure,TRUE,FALSE,TRUE,
+Dropbox,https://www.dropbox.com,infrastructure,TRUE,FALSE,TRUE,
+EdX,https://www.edx.org/,infrastructure,TRUE,FALSE,TRUE,
+GitHub,https://education.github.com,infrastructure,TRUE,FALSE,TRUE,
+New Relic,http://newrelic.com/,infrastructure,TRUE,FALSE,TRUE,
+Optimizely,https://www.optimizely.com/,infrastructure,TRUE,FALSE,TRUE,
+Parse,https://parse.com/,infrastructure,TRUE,FALSE,TRUE,
+Pivotal Tracker,http://www.pivotaltracker.com/,infrastructure,TRUE,FALSE,TRUE,
+RelateIQ,https://www.relateiq.com/,infrastructure,TRUE,FALSE,TRUE,
+Typography.com,http://www.typography.com/cloud/welcome/,infrastructure,TRUE,FALSE,TRUE,
+WebPurify,http://www.webpurify.com/,infrastructure,TRUE,FALSE,TRUE,
+ZenDesk,https://www.zendesk.com/,infrastructure,TRUE,FALSE,TRUE,
 Actua,http://www.actua.ca/,international,TRUE,TRUE,TRUE,
 Adfaber,http://adfaber.org/,international,TRUE,TRUE,TRUE,
 Almooc,http://almooc.com/,international,TRUE,TRUE,TRUE,
@@ -133,6 +154,7 @@ Salesforce,http://salesforce.com,major,TRUE,FALSE,TRUE,
 Target,http://www.target.com/,major,TRUE,FALSE,TRUE,
 Teach For America,http://www.teachforamerica.org,major,TRUE,FALSE,TRUE,
 Yahoo,http://www.yahoo.com,major,TRUE,FALSE,TRUE,
+The Walt Disney Company,http://thewaltdisneycompany.com,major,TRUE,FALSE,TRUE,
 Zappos.com,http://www.Zappos.com,major,TRUE,FALSE,TRUE,
 Computer Science Teachers Association,http://csta.acm.org/,majoruk,TRUE,FALSE,TRUE,
 Dropbox,https://www.dropbox.com/,majoruk,TRUE,FALSE,TRUE,
@@ -206,7 +228,6 @@ Bing,http://www.bing.com,promotional,TRUE,TRUE,TRUE,
 Boys & Girls Clubs of America,http://GreatFutures.org,promotional,FALSE,TRUE,FALSE,
 Common Sense Education,https://www.commonsensemedia.org/educators,promotional,TRUE,FALSE,TRUE,
 Computing Research Association,http://www.cra.org/,promotional,TRUE,FALSE,TRUE,
-Dice.com,http://dice.com,promotional,TRUE,TRUE,TRUE,
 Donors Choose,http://www.donorschoose.org/,promotional,FALSE,TRUE,FALSE,
 Dropbox,https://www.dropbox.com/,promotional,FALSE,TRUE,FALSE,
 Edmodo,http://www.edmodo.com,promotional,TRUE,FALSE,TRUE,
@@ -222,8 +243,6 @@ MSN,http://www.msn.com,promotional,TRUE,TRUE,TRUE,
 National Council of Teachers of Mathematics,http://www.nctm.org,promotional,TRUE,FALSE,TRUE,
 National Math + Science Initiative,http://www.nms.org/,promotional,TRUE,FALSE,TRUE,
 National Science Teachers Association,http://www.nsta.org/,promotional,TRUE,FALSE,TRUE,
-Optimizely,https://www.optimizely.com/,promotional,TRUE,FALSE,TRUE,
-Pearson,http://www.pearson.com,promotional,TRUE,TRUE,TRUE,
 PopCap,http://www.popcap.com,promotional,FALSE,TRUE,FALSE,
 Rovio,http://www.rovio.com,promotional,FALSE,TRUE,FALSE,
 Salesforce,http://salesforce.com,promotional,FALSE,TRUE,FALSE,
@@ -232,7 +251,6 @@ School Improvement Network,http://www.schoolimprovement.com/,promotional,TRUE,FA
 Scratch,http://scratch.mit.edu/,promotional,TRUE,TRUE,TRUE,
 Share My Lesson,http://www.sharemylesson.com/HourofCode,promotional,TRUE,FALSE,TRUE,
 Skype,http://www.skype.com,promotional,TRUE,TRUE,TRUE,
-Tata Consultancy Services,http://www.tcs.com/Pages/default.aspx,promotional,TRUE,FALSE,TRUE,
 Teach For America,http://www.teachforamerica.org,promotional,FALSE,TRUE,FALSE,
 Valve,http://www.valvesoftware.com/,promotional,TRUE,TRUE,TRUE,
 xBox,http://www.xbox.com,promotional,TRUE,TRUE,TRUE,
@@ -301,20 +319,4 @@ Rewired,http://youngrewiredstate.org,uk,TRUE,FALSE,TRUE,
 Tablets,http://www.tabletsforschools.org.uk/,uk,TRUE,FALSE,TRUE,
 Tech City UK,http://www.techcityuk.com,uk,TRUE,FALSE,TRUE,
 The UK Department for Education,http://www.education.gov.uk,uk,TRUE,FALSE,TRUE,
-Wonder,http://wonderpl.com,uk,TRUE,FALSE,TRUE,
-Amazon Web Services,http://aws.amazon.com/,infrastructure,TRUE,FALSE,TRUE,
-Atlassian HipChat,https://www.hipchat.com/,infrastructure,TRUE,FALSE,TRUE,
-Chef,https://www.getchef.com/,infrastructure,TRUE,FALSE,TRUE,
-DataPRM,http://datarpm.com,infrastructure,TRUE,FALSE,TRUE,
-Dropbox,https://www.dropbox.com,infrastructure,TRUE,FALSE,TRUE,
-EdX,https://www.edx.org/,infrastructure,TRUE,FALSE,TRUE,
-GitHub,https://education.github.com,infrastructure,TRUE,FALSE,TRUE,
-New Relic,http://newrelic.com/,infrastructure,TRUE,FALSE,TRUE,
-Optimizely,https://www.optimizely.com/,infrastructure,TRUE,FALSE,TRUE,
-Parse,https://parse.com/,infrastructure,TRUE,FALSE,TRUE,
-Pivotal Tracker,http://www.pivotaltracker.com/,infrastructure,TRUE,FALSE,TRUE,
-RelateIQ,https://www.relateiq.com/,infrastructure,TRUE,FALSE,TRUE,
-Typography.com,http://www.typography.com/cloud/welcome/,infrastructure,TRUE,FALSE,TRUE,
-WebPurify,http://www.webpurify.com/,infrastructure,TRUE,FALSE,TRUE,
-ZenDesk,https://www.zendesk.com/,infrastructure,TRUE,FALSE,TRUE,
-Koding,https://koding.com/,additional,TRUE,FALSE,TRUE,
+Wonder,http://wonderpl.com,uk,TRUE,FALSE,TRUE,

pegasus/sites.v3/code.org/public/hourofcode.redirect

@@ -0,0 +1 @@
+http://www.code.org/

pegasus/sites.v3/code.org/public/hourofcode.haml renamed to pegasus/sites.v3/code.org/public/hourofcode2013.haml

@@ -2,15 +2,15 @@
 
 -if variation == 'learn'
   #rightbox.desktop-feature{:style=>'float:right'}
-    %a{:href=>'#notes'}= I18n.t(:educator_notes)
+    %a{:href=>"http://hourofcode.com/resources/how-to"}= I18n.t(:educator_notes)
 
 -tutorials = Tutorials.new(variation=='learn' ? :tutorials : :beyond_tutorials)
 
 #carousel-ie8{:style=>'display:none'}
-  = view :learn_carousel, :heading=>I18n.t(:older_systems), :subheading=>I18n.t(:older_systems_subheading), :tag=>'IE8', :tutorials=>tutorials, :id=>'collection-ie8'
+  = view :learn_carousel, :heading=>I18n.t(:older_systems), :subheading=>I18n.t(:older_systems_subheading), :tag=>'IE8', :tutorials=>tutorials, :id=>'collection-ie8', :check_language=>true
 
 #carousel-mobile{:style=>'display:none'}
-  = view :learn_carousel, :heading=>I18n.t(:mobile_devices), :tag=>'Mobile', :tutorials=>tutorials, :id=>'collection-mobile'
+  = view :learn_carousel, :heading=>I18n.t(:mobile_devices), :tag=>'Mobile', :tutorials=>tutorials, :id=>'collection-mobile', :check_language=>true
 
 #carousel-international{:style=>'display:none'}
   = view :learn_carousel, :heading=>I18n.t(:carousel_heading_international), :tag=>'International', :tutorials=>tutorials, :id=>'collection-international', :international_layout=>true, :check_language=>true

pegasus/sites.v3/code.org/public/images/avatars/the_walt_disney_company.png

@@ -28,6 +28,9 @@ Free curriculum to teach high-school algebra and geometry concepts using compute
 ### [CS Unplugged](http://csunplugged.org/)
 Fun classroom exercises to teach computer science principles, no computers needed!
 
+### [CS First](http://cs-first.com/)
+Free curriculum from Google that uses online, project-based tutorials for elementary and middle school students and offers free club plans and resources to create an easy computer science entry point for educators and students alike.
+
 ## Bring Classes to Your School
 ### [Globaloria](http://www.globaloria.org/)
 Teach computer programming through game design - as a full-time class, an in-class module, or afterschool program.

pegasus/sites.v3/code.org/views/learn_carousels.haml

@@ -7,10 +7,10 @@
 -tutorials = Tutorials.new(variation=='learn' ? :tutorials : :beyond_tutorials)
 
 #carousel-ie8{:style=>'display:none'}
-  = view :learn_carousel, :heading=>I18n.t(:older_systems), :subheading=>I18n.t(:older_systems_subheading), :tag=>'IE8', :tutorials=>tutorials, :id=>'collection-ie8'
+  = view :learn_carousel, :heading=>I18n.t(:older_systems), :subheading=>I18n.t(:older_systems_subheading), :tag=>'IE8', :tutorials=>tutorials, :id=>'collection-ie8', :check_language=>true
 
 #carousel-mobile{:style=>'display:none'}
-  = view :learn_carousel, :heading=>I18n.t(:mobile_devices), :tag=>'Mobile', :tutorials=>tutorials, :id=>'collection-mobile'
+  = view :learn_carousel, :heading=>I18n.t(:mobile_devices), :tag=>'Mobile', :tutorials=>tutorials, :id=>'collection-mobile', :check_language=>true
 
 #carousel-international{:style=>'display:none'}
   = view :learn_carousel, :heading=>I18n.t(:carousel_heading_international), :tag=>'International', :tutorials=>tutorials, :id=>'collection-international', :international_layout=>true, :check_language=>true