From 9dde79414df8528d84af9e71d1c170d704a817da Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 7 Dec 2012 10:10:38 +0800
Subject: [PATCH] all sections and sections megerd

---
 app/assets/javascripts/orbitdesktop.js        |   1 +
 app/controllers/desktop_controller.rb         |   2 +-
 ...sections.html.erb => allsections.html.erb} |   0
 app/views/desktop/index.html.erb              |   2 +-
 app/views/desktop/settings/sections.html.erb  | 190 ++----------------
 config/routes.rb                              |   2 +-
 6 files changed, 19 insertions(+), 178 deletions(-)
 rename app/views/desktop/{sections.html.erb => allsections.html.erb} (100%)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 16591be7..e10a6604 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -637,6 +637,7 @@ var orbitDesktop = function(dom){
             }
           }
           z++;
+
           $("div#group_wrapper").append($group);
         }
         var yy=1,y=0;
diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb
index 279694b6..4eef26be 100644
--- a/app/controllers/desktop_controller.rb
+++ b/app/controllers/desktop_controller.rb
@@ -19,7 +19,7 @@ class DesktopController< ApplicationController
      render :layout => false
   end
   
-  def sections
+  def allsections
     render :layout => false
   end
   
diff --git a/app/views/desktop/sections.html.erb b/app/views/desktop/allsections.html.erb
similarity index 100%
rename from app/views/desktop/sections.html.erb
rename to app/views/desktop/allsections.html.erb
diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index c90f53fd..3559dc35 100644
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -4,7 +4,7 @@
 			<li class="d_cate"><a callback-method='initializeDesktop' href="desktop/" class="widget_fn wh3 hh3" id='d_desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
 				<ul class="dock_child hh3 thmc4" style="width: 180px;">
 					<li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_sections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
+					<li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_allsections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
 					<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
 				</ul>
 			</li>
diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb
index d8e8208e..dcb92237 100644
--- a/app/views/desktop/settings/sections.html.erb
+++ b/app/views/desktop/settings/sections.html.erb
@@ -1,178 +1,18 @@
-<div id="sections">
-<div id="content">
-		<div id="header" class="hh3">
-			<div class="dtitle w2 hh3 hp">
-				<span class="thmtxth">All Sections</span>
+<div class="tinycanvas vp">
+	<div class="scrollbar sb_v hp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
+	<div class="viewport">
+		<div class="overview">
+			<div class="s_title hh3">Section Names</div>
+			<ul class="s_form" id="desktop_names">
+				<li><label for="s_name1">Section 1</label><input id="s_name1" type="text" value=""></li>
+				<li><label for="s_name2">Section 2</label><input id="s_name2" type="text" value=""></li>
+				<li><label for="s_name3">Section 3</label><input id="s_name3" type="text" value=""></li>
+				<li><label for="s_name4">Section 4</label><input id="s_name4" type="text" value=""></li>
+			</ul>
+			<div class="s_subtitle">sample desciption</div>
+			<div class="s_action">
+				<a href="" id="name_save_btn" class="setting_btn thmc1 thmtxt w1 hh2 hp" onclick='return false;'>Confirm</a>
 			</div>
 		</div>
-		<div id="holder">
-			<div class="tinycanvas">
-				<div class="scrollbar sb_h"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-				<div class="viewport">
-				<div id="group_wrapper" class="overview">
-				<!--	<div class="group">
-						<div class="section_label" >
-							<ul>
-								<li class="element w1 h1 hp vp thmtxt"><span class="tile thmc1"></span><span class="thmtxt">section 1</span></li>
-								<li class="element w1 h1 hp vp thmtxt " style="display: none;" data-category="section2"><span class="tile thmc2 op06"></span><span class="thmtxt">section 2</span></li>
-								<li class="element w1 h1 hp vp thmtxt " style="display: none;" data-category="section3"><span class="tile thmc2 op06"></span><span class="thmtxt">section 3</span></li>
-								<li class="element w1 h1 hp vp thmtxt " style="display: none;" data-category="section4"><span class="tile thmc2 op06"></span><span class="thmtxt">section 4</span></li>
-							</ul>
-						</div>
-						<ul class="grp" id="section1">
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-				            <li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-				            <li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							
-				                        
-						</ul>
-					</div>
-					<div class="group">
-						<div class="section_label" >
-							<ul>
-								<li class="element w1 h1 hp vp thmtxt"><span class="tile thmc1"></span><span class="thmtxt">section 2</span></li>
-								<li class="element w1 h1 hp vp thmtxt " style="display: none;" data-category="section1"><span class="tile thmc2 op06"></span><span class="thmtxt">section 1</span></li>
-								<li class="element w1 h1 hp vp thmtxt " style="display: none;" data-category="section3"><span class="tile thmc2 op06"></span><span class="thmtxt">section 3</span></li>
-								<li class="element w1 h1 hp vp thmtxt " style="display: none;" data-category="section4"><span class="tile thmc2 op06"></span><span class="thmtxt">section 4</span></li>
-							</ul>
-						</div>
-						<ul class="grp" id="section2">
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-				            <li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-				            <li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							<li class="element w1 hh2 hp vp" data-category="abc">
-								<h1 class="appname thmtxth">Garage Band</h1>
-							</li>
-							
-						</ul>
-					</div>-->
-					<div class="clear"></div>
-				</div>
-			</div>
-		</div>
-		</div>
 	</div>
-	</div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 6e87ed04..cae07963 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -168,7 +168,7 @@ Orbit::Application.routes.draw do
     match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
     match '/desktop'=>'desktop#desktop'
     match '/app_manager'=>'desktop#app_manager'
-    match '/sections'=>'desktop#sections'
+    match '/allsections'=>'desktop#allsections'
     match '/settings'=>'desktop#settings'
     match '/get_desktop_settings/'=>'desktop#get_desktop_settings'
     match '/save_desktop_settings/'=>'desktop#save_desktop_settings'