From ee85380ab26da97a100503dc8e0ef173e8353ea4 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Tue, 10 Apr 2012 18:09:29 +0800
Subject: [PATCH] little update

---
 app/assets/javascripts/orbitdesktop.js        | 10 +++++-----
 app/views/desktop/settings.html.erb           | 20 +++++++++----------
 public/desktop_widgets/weather/index.html.erb |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index e68a448c2..2c79bb906 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -331,14 +331,14 @@ var orbitDesktop = function(dom){
 			});
 
 		}
-		if(!o.desktopData[o.currentface]){
+		// if(!o.desktopData[o.currentface]){
 			$(o.contentHolder).empty().load("/desktop/"+target,function(){
 				bindHandlers();
 			});
-		}else{
-			$(o.contentHolder).html(o.desktopData[o.currentface]);
-				bindHandlers();	
-		}
+		// }else{
+		// 	$(o.contentHolder).html(o.desktopData[o.currentface]);
+		// 		bindHandlers();	
+		// }
 	};
 	this.loadWallpaper = function(wallpaper){
 		if(!wallpaper)wallpaper = o.themesettings.background;
diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb
index 3396d27d2..293c80afc 100644
--- a/app/views/desktop/settings.html.erb
+++ b/app/views/desktop/settings.html.erb
@@ -43,26 +43,26 @@
 									<div>
 										<table cellpadding="0" cellspacing="0" border="0" width="528">
 											<tr>
-												<th class="s_title hh3">Theme Color</th>
+												<th class="s_title hh3" width="190px">Theme Color</th>
 												<th class="s_title hh3">Line Color</th>
-												<th class="s_title hh3">Text Color</th>
-												<th class="s_title hh3">Background Color</th>
+												<th class="s_title hh3" width="120px">Text Color</th>
+												<th class="s_title hh3" width="120px">Background Color</th>
 											</tr>
 											<tr>
 												<td>
-													<input type="hidden" class="color-picker" value="#000000">
-													<input type="hidden" class="color-picker" value="#0099cc">
-													<input type="hidden" class="color-picker" value="#3366cc">
+													<input type="hidden" class="color-picker black" value="#000000">
+													<input type="hidden" class="color-picker black" value="#0099cc">
+													<input type="hidden" class="color-picker black" value="#3366cc">
 												</td>
 												<td>
-													<input type="hidden" class="color-picker" value="#ffffff">
+													<input type="hidden" class="color-picker black" value="#ffffff">
 												</td>
 												<td>
-													<input type="hidden" class="color-picker" value="#ffffff">
-													<input type="hidden" class="color-picker" value="#ffffff">
+													<input type="hidden" class="color-picker black" value="#ffffff">
+													<input type="hidden" class="color-picker black" value="#ffffff">
 												</td>
 												<td>
-													<input type="hidden" class="color-picker" value="#000000">
+													<input type="hidden" class="color-picker black" value="#000000">
 												</td>
 											</tr>
 										</table>
diff --git a/public/desktop_widgets/weather/index.html.erb b/public/desktop_widgets/weather/index.html.erb
index 1dfa1849d..58902d21e 100644
--- a/public/desktop_widgets/weather/index.html.erb
+++ b/public/desktop_widgets/weather/index.html.erb
@@ -1,6 +1,6 @@
-<div style='width: 180px; height: 150px; background-image: url( /desktop_widgets/weather/img/clouds_180x150_bg.jpg );
+<div style='width: 100%; height: 100%; <!-- background-image: url( /desktop_widgets/weather/img/clouds_180x150_bg.jpg ); -->
 background-repeat: no-repeat; background-color: #;' ><div id='NetweatherContainer'
-style='height: 138px;' ><script src='http://netweather.accuweather.com/adcbin/
+style='height: 100%;' ><script src='http://netweather.accuweather.com/adcbin/
 netweather_v2/netweatherV2ex.asp?
 partner=netweather&tStyle=normal&logo=1&zipcode=ASI|TW|TW018|HSINCHU|
 &lang=eng&size=8&theme=clouds&metric=0&target=_self'></script></div></div>
\ No newline at end of file