Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua

Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb

app/assets/javascripts/orbitdesktop.js

@@ -24,7 +24,7 @@ var orbitDesktop = function(dom){
 	this.transitionTime = 500;
 	this.currenthtml = "desktop.html";
 	this.currentface = "home";
-	this.desktopData = {"home":"","settings":"","work":"","favorite":"","apps_manager":"","sections":"","journal_p":"","appstore":"","orbit":"","books":""};
+	this.desktopData = {"home":"","settings":"","work":"","favorite":"","apps_manager":"","sections":"","journal_p":"","appstore":"","orbit":""};
 	this.tp = "";
 	this.sectionList;
 	this.initialize = function(){
@@ -916,7 +916,6 @@ var orbitDesktop = function(dom){
 		var bindHandlers = function(){
 			var timeline = new orbitTimeline("timeline");
 			timeline.initialize();
-				$('.tinycanvas').tinyscrollbar({ axis: 'x'});
 		}
 		if(!o.desktopData[o.currentface]){
 			$(o.contentHolder).empty().load("/desktop_orbit/"+target,function(){
@@ -1152,7 +1151,10 @@ var orbitDesktop = function(dom){
 						switch(tfunc){
 							case 'widgets':
 								widgets();
-							break;
+								break;
+							case 'onlinestore':
+								onlinestore();
+								break;
 						}
 						$('.s_menu a').removeClass('thmc1 thmtxt active');
 						$(this).addClass('thmc1 thmtxt active');
@@ -1297,15 +1299,22 @@ var orbitDesktop = function(dom){
 				})
 			})
 		}
+		var onlinestore = function(){
+			var bindHandlers = function(){
 
+			}
+			$("div#apps_store div#panel_r").load("/desktop_appstore/onlinestore",function(){
+				bindHandlers();
+			})
+		}
 		if(!o.desktopData[o.currentface]){
 			$(o.contentHolder).empty().load("/desktop_appstore/"+target,function(){
-				widgets();
+				onlinestore();
 				bindHandlers();
 			});
 		}else{
 			$(o.contentHolder).html(o.desktopData[o.currentface]);
-			widgets();
+			onlinestore();
 			bindHandlers();
 		}
 	}
@@ -1442,4 +1451,4 @@ orbitDesktop.prototype.currentLanguage = "en";
 orbitDesktop.prototype.currentUsername = "Harry";
 var uselessfunction = function(){
 	$.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"});
-}
+}