From 8cd4844689625c0ea044e8d59200bb1a281e0fff Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Tue, 17 Apr 2012 16:32:11 +0800
Subject: [PATCH] html change

---
 app/assets/stylesheets/desktopmain.css     | 36 ++++++++++++++++++++++
 app/views/desktop/index.html.erb           | 17 ++++++++--
 app/views/desktop/settings/themes.html.erb | 22 ++++++++++++-
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index f53dfd96..af14714c 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -275,6 +275,11 @@ a:focus { outline: none; }
 .theme_plate { overflow: hidden; }
 .theme_plate > div { float: left; margin-right: 12px; }
 .theme_plate > div:first-child { margin-right: 48px;}
+.stock_background ul { overflow: hidden; }
+.stock_background li { float: left; margin: 6px; }
+.stock_background a { border: solid 3px #f6f6f6; display: block; }
+.stock_background img { display: block; margin: 0 auto; border: solid 1px #fff; }
+
 .s_title { font-size: 15px; line-height: 60px; text-align: left; }
 .s_action { padding: 24px 0; overflow: hidden; }
 .setting_btn {
@@ -384,6 +389,37 @@ a:focus { outline: none; }
 	font-size: 15px;
 }
 
+/* Orbit Dialogue */
+#orbitdiag {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	left: 0;
+	top: 0;
+	z-index: 9;
+}
+#orbitdiag .tile { background-color: #000; }
+.diag_holder { background-color: #000; }
+.diag_holder_inner {
+	width: 600px;
+	margin: 200px auto 0 auto;
+	position: relative;
+	padding: 30px 0;
+}
+.diag_message {
+	color: #fff;
+	font-size: 18px;
+	padding: 30px 0;
+}
+.diag_action { clear: both; text-align: right; }
+.diag_btn { 
+	display: inline-block;
+	line-height: 36px;
+	text-align: center;
+	font-size: 15px;
+	margin: 0 6px;
+}
+
 #group_wrapper{
 	
 }
diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index fb3cf642..d4474f68 100755
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -60,7 +60,7 @@
 </div>
 <div id="container">
 	
-<div id='ajax_container' class="<%= controller.action_name %>">
+<div id='ajax_container'>
  
 	
 </div>
@@ -75,7 +75,18 @@
 		<div class="note_message">Check the Notifications section for more information.</div>
 	</div>
 </div>
-
+<div id="orbitdiag" style="display: none;">
+	<div class="tile op07"></div>
+	<div class="diag_holder">
+		<div class="diag_holder_inner">
+			<div class="diag_message">Continue anyway?</div>
+			<div class="diag_action">
+				<a href="" id="diag_confirm" class="diag_btn thmc1 thmtxt w1 hh2 hp">Yes</a>
+				<a href="" id="diag_cancel" class="diag_btn admbg admtxt w1 hh2 hp">Cancel</a>
+			</div>
+		</div>
+	</div>
+</div>
 
 <script>
 	orbitDesktop.prototype.themefolder = "desktop_themes";
@@ -85,5 +96,5 @@
 	orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
 	//uselessfunction();
 	var od = new orbitDesktop("#ajax_container");
-	o.notify("Notification Working!!","imp",3)
+	// o.notify("Notification Working!!","imp",3)
 </script>
diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb
index 061be9aa..c89f9f43 100644
--- a/app/views/desktop/settings/themes.html.erb
+++ b/app/views/desktop/settings/themes.html.erb
@@ -2,6 +2,7 @@
 	<ul>
 		<li><a href="#st1" class="hh2 hp thmtxt thmc2">Select Theme</a></li>
 		<li><a href="#st2" class="hh2 hp admtxt admbg">Custom Theme</a></li>
+		<li><a href="#st3" class="hh2 hp admtxt admbg">Custom Background</a></li>
 	</ul>
 </div>
 <div class="tinycanvas vp">
@@ -21,7 +22,7 @@
 			</div>
 			<div id="st2" class="st_c">
 				<div class="s_title hh3">Preview</div>
-				<div class="theme_preview vp" style="background-image: url(/desktop_themes/default/images/background.jpg);">
+				<div class="theme_preview vp" style="background-color:#000000;">
 					<div class="thmtxth hh2 hp" style="margin-left:108px;">Theme Text1</div>
 					<div class="theme_plate">
 						<div class="thmc4 h1 wh3"></div>
@@ -62,6 +63,25 @@
 					<div class="clear"></div>
 				</div>
 			</div>
+			<div id="st3" class="st_c">
+				<div class="stock_background">
+					<ul>
+						<li><a href="" class="sb1"><img src="" alt=""></a></li>
+						<li><a href="" class="sb2"><img src="" alt=""></a></li>
+						<li><a href="" class="sb3"><img src="" alt=""></a></li>
+						<li><a href="" class="sb4"><img src="" alt=""></a></li>
+						<li><a href="" class="sb5"><img src="" alt=""></a></li>
+						<li><a href="" class="sb6"><img src="" alt=""></a></li>
+						<li><a href="" class="sb7"><img src="" alt=""></a></li>
+						<li><a href="" class="sb8"><img src="" alt=""></a></li>
+						<li><a href="" class="sb9"><img src="" alt=""></a></li>
+						<li><a href="" class="sb10"><img src="" alt=""></a></li>
+						<li><a href="" class="sb11"><img src="" alt=""></a></li>
+						<li><a href="" class="sb12"><img src="" alt=""></a></li>				
+					</ul>
+				</div>
+				<div class="clear"></div>
+			</div>
 		</div>
 	</div>
 </div>
\ No newline at end of file