Merge branch 'desktop_devin' into desktop_harry

app/assets/javascripts/orbitdesktop.js

@@ -115,6 +115,7 @@ var orbitDesktop = function(dom){
 		$(window).resize(function(){
 			var ww = $(window).width();
 			$("img#thmbackground").attr({"width":ww});
+			if( $('.tinycanvas') ){ $('.tinycanvas').tinyscrollbar_update(); }
 		});
 		var $widget_fn = $('.widget_fn'),$fn_des = $('.fn_des');
 		$widget_fn.hover(function(){
@@ -186,7 +187,6 @@ var orbitDesktop = function(dom){
 				.find('.scrollbar')
 				.delay(1500)
 				.addClass('op00', 500);
-
 			// simple dropdown menu
 			var $sdm = $('.sdm');
 
@@ -461,6 +461,7 @@ var orbitDesktop = function(dom){
 				.find('.scrollbar')
 				.delay(1500)
 				.addClass('op00', 500);
+
 			var $sdm = $('.sdm');
 
 			if( !$sdm.children('.sdm_o') ){
@@ -759,7 +760,19 @@ var orbitDesktop = function(dom){
 						if(usernm!="" && pwd!="")
 							saveaccount(usernm,pwd,type,what);
 							
-				})
+				});
+
+				var $conlist = $('.s_form'),
+					conlist_w = $conlist.length * $conlist.outerWidth(true) + ($conlist.length - 1) * 25;
+
+				$('#connection_setting').width(conlist_w);
+
+				$('.tinycanvas')
+					.tinyscrollbar({ axis: 'x'})
+					.find('.scrollbar')
+					.delay(1500)
+					.addClass('op00', 500);
+				
 			}
 			var saveaccount = function(usernm,pwd,type,what){
 					$.post("/desktop/save_account_info",{email:usernm,password:pwd,account:type,dowhat:what},function(result){
@@ -815,7 +828,12 @@ var orbitDesktop = function(dom){
 		
 		var list = function(){ // to open list part in journal papers page
 			var bindHandlers = function(){ // to bind handlers for list page
-				
+				o.simple_drop_down();
+				$('.tinycanvas')
+					.tinyscrollbar({ axis: 'x'})
+					.find('.scrollbar')
+					.delay(1500)
+					.addClass('op00', 500);
 			}
 			
 			$("div#settings div#panel_r").load("/desktop/journal_p_list",function(){
@@ -840,6 +858,7 @@ var orbitDesktop = function(dom){
 		}else{
 			$(o.contentHolder).html(o.desktopData[o.currentface]);
 			bindHandlers();
+			list();
 		}
 	};
 	this.loadWallpaper = function(wallpaper){  // this is to load new wallpaper 
@@ -883,6 +902,18 @@ var orbitDesktop = function(dom){
 					o.notify("Wallpaper saving failed!!","imp",2);
 		})
 	};
+	this.simple_drop_down = function(){
+		// simple dropdown menu
+		if( !$('.sdm').children('.sdm_o') ){
+			return;
+		} else {
+			$('.sdm').hover(function(){
+				$(this).stop(1,1).toggleClass('thmc2 thmtxt');
+			}, function(){
+				$(this).stop(1,1).toggleClass('thmc2 thmtxt');
+			});
+		}
+	}
 	o.initialize();
 }
 
@@ -896,4 +927,4 @@ orbitDesktop.prototype.currentLanguage = "en";
 orbitDesktop.prototype.currentUsername = "Harry";
 var uselessfunction = function(){
 	$.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"});
-}
+}