From 4ae1fe68cd85e54ef893508406261969c78a11f8 Mon Sep 17 00:00:00 2001
From: devin chen <devin@rulingcom.com>
Date: Mon, 6 May 2013 14:43:31 +0800
Subject: [PATCH] app manager view update

---
 app/assets/Archive/javascripts/orbitdesktop.js         | 10 +++++-----
 .../Archive/stylesheets/desktop/desktop-main.css       |  1 -
 app/views/desktop/app_manager.html.erb                 |  9 ++-------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/assets/Archive/javascripts/orbitdesktop.js b/app/assets/Archive/javascripts/orbitdesktop.js
index 06cf3c04b..c63432ef7 100755
--- a/app/assets/Archive/javascripts/orbitdesktop.js
+++ b/app/assets/Archive/javascripts/orbitdesktop.js
@@ -927,16 +927,16 @@ var orbitDesktop = function(dom){
             sectionids.push(sec.id);
           })
 
-          $appinfolist.find("li:eq(0)").empty();
+          $appinfolist.find("[info=section_activation]").empty();
           $.each(o.sectionList,function(i,sec){
 
             var present = $.inArray(sec._id,sectionids);
             if(present == -1){
-              $sectionswitch = $('<label class="s_grid s_grid_3">'+ sec.name +'</label><div class="s_grid s_grid_9 s_switch"><div class="s_switch_status" status-off="Off">Off</div><label class="s_switch_switcher admbg2"><input type="checkbox" data-widget="'+ $e.data("id") +'" data-section="'+ sec._id +'"><span class="s_switch_toggle"></span></label></div>');
+              $sectionswitch = $('<div class="s_grid_row"><label class="s_grid s_grid_3">'+ sec.name +'</label><div class="s_grid s_grid_6 s_switch"><div class="s_switch_status" status-off="Off">Off</div><label class="s_switch_switcher admbg2"><input type="checkbox" data-widget="'+ $e.data("id") +'" data-section="'+ sec._id +'"><span class="s_switch_toggle"></span></label></div></div>');
             }else{
-                 $sectionswitch = $('<label class="s_grid s_grid_3">'+ sec.name +'</label><div class="s_grid s_grid_9 s_switch"><div class="s_switch_status" status-on="On">On</div><label class="s_switch_switcher thmc2"><input type="checkbox" checked="checked" data-widget="'+ $e.data("id") +'" data-section="'+ sec._id +'"><span class="s_switch_toggle"></span></label></div>');
+              $sectionswitch = $('<div class="s_grid_row"><label class="s_grid s_grid_3">'+ sec.name +'</label><div class="s_grid s_grid_6 s_switch"><div class="s_switch_status" status-on="On">On</div><label class="s_switch_switcher thmc2"><input type="checkbox" checked="checked" data-widget="'+ $e.data("id") +'" data-section="'+ sec._id +'"><span class="s_switch_toggle"></span></label></div></div>');
             }
-             $appinfolist.find("li:eq(0)").append($sectionswitch);
+             $appinfolist.find("[info=section_activation]").append($sectionswitch);
           })            
           $appinfo.show();
           o.simple_switch(function(dom){
@@ -983,7 +983,7 @@ var orbitDesktop = function(dom){
             var $app;
             count++;
             elementSettingsData[app.id] = {"sections" : app.sections};
-            $app = $('<div class="element w1 h1 hp vp thmc2" data-category="'+app.data_category+'" data-title="'+app.title+'" data-author="'+app.author+'" data-version="'+app.version+'" data-update="'+app.last_update+'" data-id="'+app.id+'" ><span class="tile thmc2"></span><a href="'+app.id+'" class="appicon"><img src="'+app.icon+'" alt="" onclick="return false;"></a><h1 class="appname thmtxt">'+app.title+'</h1></div>');
+            $app = $('<div class="element w1 h1 thmc2" data-category="'+app.data_category+'" data-title="'+app.title+'" data-author="'+app.author+'" data-version="'+app.version+'" data-update="'+app.last_update+'" data-id="'+app.id+'" ><span class="tile thmc2"></span><a href="'+app.id+'" class="appicon"><img src="'+app.icon+'" alt="" onclick="return false;"></a><h1 class="appname thmtxt">'+app.title+'</h1></div>');
             if( count > 4 ){
               count = 1, colindex+=1;
               $('#app_list').append('<div class="g_col g_col_w1 col'+ colindex +'"/>');
diff --git a/app/assets/Archive/stylesheets/desktop/desktop-main.css b/app/assets/Archive/stylesheets/desktop/desktop-main.css
index 80a587e8c..f1d42a54f 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-main.css
+++ b/app/assets/Archive/stylesheets/desktop/desktop-main.css
@@ -604,7 +604,6 @@ a.admtxt.admbg2:hover {
   width: 420px;
   height: 516px;
   margin-right: 36px; }
-
   #app_info .app_info_header {
     height: 120px;
     margin: -12px -12px 12px -12px;
diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb
index 44d199cc6..335ab79f1 100644
--- a/app/views/desktop/app_manager.html.erb
+++ b/app/views/desktop/app_manager.html.erb
@@ -25,13 +25,8 @@
 				</div>
 				<ul class="app_info_list">
 					<li class="s_grid_row">
-					<!-- 	<label class="s_grid s_grid_3">Activation</label>
-						<div class="s_grid s_grid_9 s_switch"> -->
-							<!-- <div class="s_switch_status" status-on="On" status-off="Off"></div>
-							<label class="s_switch_switcher">
-								<input type="checkbox">
-							</label> -->
-						<!-- </div> -->
+						<label class="s_grid s_grid_3">Activation</label>
+						<div info="section_activation" class="s_grid s_grid_9 s_switch"></div>
 					</li>
 					<li class="s_grid_row">
 						<label class="s_grid s_grid_3">Description</label>