From ab7ae6dceea7655ee200623a417ee10fdd74891c Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Mon, 21 May 2012 14:55:51 +0800
Subject: [PATCH] app

---
 app/assets/javascripts/orbitdesktop.js | 16 ++++++++++++++--
 app/assets/stylesheets/desktopmain.css | 10 +++++++++-
 app/views/desktop/app_view1.html.erb   | 10 ++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 app/views/desktop/app_view1.html.erb

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 9ae7d8b8..fd56bccf 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -1159,11 +1159,23 @@ var orbitDesktop = function(dom){
 						break;
 					}
 					return false;
-				})
+				});
+				// fill width for tiny scroll bar
+				var e = $('.list_t'),
+					count = e.length,
+					baseWidth = e.eq(1).outerWidth(true);
+
+				e.parents('.overview').width( baseWidth * count );
+
+				$('.tinycanvas')
+					.tinyscrollbar({ axis: 'x'})
+					.find('.scrollbar')
+					.delay(1500)
+					.addClass('op00', 500);
 			}
 			$("div#apps_store div#panel_r").load("/desktop_appstore/widgets",function(){
 				$.getJSON("/desktop_appstore/getuserwidgets",function(userwidgets){
-					var column = $('<div class="g_col list_t" style="width:350px;"><ul></ul></div>'),
+					var column = $('<div class="g_col list_t"><ul></ul></div>'),
 						counter = 1,
 						li;
 					$.each(userwidgets,function(i,widge){
diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index ff1428fc..9852d11c 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -136,6 +136,7 @@ a:focus { outline: none; }
 	padding: 2px 12px;
 	width: 192px;
 	height: 28px;
+	line-height: 28px;
 	background: none;
 	}
 #search_app .submit {
@@ -688,4 +689,11 @@ a:focus { outline: none; }
 }
 #paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; }
 #paper_add .f_w { width: 336px; }
-#paper_add label { margin-right: 0; }
\ No newline at end of file
+#paper_add label { margin-right: 0; }
+
+/* App */
+#app_frame {
+	margin-right: 96px;
+	min-width: 800px;
+}
+#app_frame .holder { background-color: #fff; }
\ No newline at end of file
diff --git a/app/views/desktop/app_view1.html.erb b/app/views/desktop/app_view1.html.erb
new file mode 100644
index 00000000..2dd40642
--- /dev/null
+++ b/app/views/desktop/app_view1.html.erb
@@ -0,0 +1,10 @@
+<div id="app_frame" class="thmc2">
+	<div id="content">
+		<div id="header" class="hh3">
+			<div class="dtitle w2 hh3 hp"><span class="thmtxth">Appname</span></div>
+		</div>
+		<div id="holder">
+			<div class="clear"></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file