From 7e9fce0c2deec08ffaac4ddc58e650d74131b309 Mon Sep 17 00:00:00 2001
From: "Matt K. Fu" <matt@rulingcom.com>
Date: Wed, 10 Apr 2013 18:16:52 +0800
Subject: [PATCH] clean Harry's code

---
 app/assets/javascripts/orbitdesktop.js | 15 ---------------
 lib/tasks/migrate.rake                 |  8 ++++++++
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 65105df5..e241c2b2 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -574,20 +574,6 @@ var orbitDesktop = function(dom){
          });
         }else{
           $(o.contentHolder).html(o.desktopData[o.currentface]);
-<<<<<<< Updated upstream
-          header_ani();
-          try {
-            if(!customload){
-              o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
-            } else {
-              if(submenuitem){
-                o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
-              } else {
-                o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
-              }      
-            }
-          } catch(EX){}
-=======
           try{
             if(!customload){
               o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
@@ -598,7 +584,6 @@ var orbitDesktop = function(dom){
                   o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
               }
             }catch(EX){}
->>>>>>> Stashed changes
           cache = true;
           if(typeof o.data_method != "undefined"){
              if(o.data_method != ""){
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 69658869..615b075f 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -302,4 +302,12 @@ namespace :migrate do
       page.save
     end
   end
+
+  task :to_daily_0410 => :environment do
+    #applying Harry's code
+    Rake::Task["desktop:upload_all_packages"].execute
+    #applying Spen's code
+    Rake::Task["web_link_url:web_link_url_i18n"].execute
+  end
+
 end