Merge branch 'test' into staging

Author: rlhawk

pegasus/sites.v3/code.org/public/index.haml

@@ -137,17 +137,18 @@ social:
       %a{:href=>'http://italia.code.org'}
         italia.code.org
 
-  #header-social-links.desktop-feature{style: "margin: 15px 0 0 0; float: right;"}
-    %a{:href=>"http://facebook.com/Code.org", :title=>'Facebook', :target=>"_blank", :style=>"text-decoration:none"}
-      %img{:src=>"/images/facebook_purple.png"}
-    %a{:href=>"http://twitter.com/codeorg", :title=>'Twitter', :target=>"_blank", :style=>"text-decoration:none"}
-      %img{:src=>"/images/twitter_purple.png"}
-    %a{:href=>"http://codeorg.tumblr.com/", :title=>'Tumblr', :target=>"_blank", :style=>"text-decoration:none"}
-      %img{:src=>"/images/tumblr_purple.png"}
-    %a{:href=>"http://zazzle.com/codeorg", :title=>'Zazzle', :target=>"_blank", :style=>"text-decoration:none"}
-      %img{:src=>"/images/zazzle_purple.png"}
-    %a{:href=>"/donate", :title=>'Donate', :style=>"text-decoration:none"}
-      %img{:src=>"/images/donate_normal.png"}
+  -if request.site != 'csedweek.org'
+    #header-social-links.desktop-feature{style: "margin: 15px 0 0 0; float: right;"}
+      %a{:href=>"http://facebook.com/Code.org", :title=>'Facebook', :target=>"_blank", :style=>"text-decoration:none"}
+        %img{:src=>"/images/facebook_purple.png"}
+      %a{:href=>"http://twitter.com/codeorg", :title=>'Twitter', :target=>"_blank", :style=>"text-decoration:none"}
+        %img{:src=>"/images/twitter_purple.png"}
+      %a{:href=>"http://codeorg.tumblr.com/", :title=>'Tumblr', :target=>"_blank", :style=>"text-decoration:none"}
+        %img{:src=>"/images/tumblr_purple.png"}
+      %a{:href=>"http://zazzle.com/codeorg", :title=>'Zazzle', :target=>"_blank", :style=>"text-decoration:none"}
+        %img{:src=>"/images/zazzle_purple.png"}
+      %a{:href=>"/donate", :title=>'Donate', :style=>"text-decoration:none"}
+        %img{:src=>"/images/donate_normal.png"}
 
   #studiobar.feature-codeorg.tablet-feature
     %h1.mobile-center