new themes added to desktop plus theme uploader created

app/views/desktop/index.html.erb

@@ -2,7 +2,7 @@
   <div id="rwidget" class="wh2 thmc4">
     <ul class="docklist">
       <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop" class="widget_fn wh2 hh2" id='home' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
-      <ul class="dock_child hh2 thmc4" style="width: 180px;">
+      <ul class="dock_child hh2 thmc4" style="width: 120px;">
         <li class="dock_item"><a callback-method='initializeAppManager' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" 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='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh2 hh2" 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>
@@ -62,14 +62,13 @@
   </div>
 </div>
 <div id="container">
-
   <div id='ajax_container'>
 
 
   </div>
 </div>
 <!--<div id="orbitbar"></div>-->
-
+<div id="minimizebar" style="height:30px; bottom:0px; z-index:10; background-color:#ccc; width:auto; position:absolute; margin:0 30px 0 20px;"></div>
 <img id="thmbackground"></div>
 <div id="bgover" ></div>
 <div id="orbitnote"></div>

app/views/desktop/settings.html.erb

@@ -9,10 +9,10 @@
       <div id="panel_l" class="ph">
         <div class="s_menu sm_v" content-type="menu">
           <ul id='setting_left_nav'>
-            <li><a href="" class="admtxt hh1 w2 hp" load="true" onclick='return false;'>Overview</a></li>
+            <li><a href="" class="admtxt hh1 w2 hp" onclick='return false;'>Overview</a></li>
             <li><a href="<%= edit_user_registration_path %>" callback-method="account" custom-load="account" class="admtxt hh1 w2 hp" onclick='return false;'>Account</a></li>
             <li><a href="<%= desktop_sections_path %>" callback-method="sections" custom-load="sections" class="admtxt hh1 w2 hp" onclick='return false;'>Sections</a></li>
-            <li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh1 w2 hp" onclick='return false;'>Theme</a></li>
+            <li><a href="<%= desktop_get_themes_path %>" load="true" callback-method="themes" class="admtxt hh1 w2 hp" onclick='return false;'>Theme</a></li>
             <li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh1 w2 hp" onclick='return false;'>Connection</a></li>
           </ul>
         </div>

app/views/desktop/settings/themes.html.erb

@@ -1,16 +1,16 @@
 <div class="s_tab stb_h">
 	<ul>
-		<li><a href="#st1" class="hh1 hp admtxt admbg" data-active="true">Themes</a></li>
+		<li><a href="#st1" class="hh1 hp thmc2 thmtxt" data-active="true">Themes</a></li>
 		<li><a href="#st2" class="hh1 hp admtxt admbg">Theme Color</a></li>
 		<li><a href="#st3" class="hh1 hp admtxt admbg">Wallpaper</a></li>
 	</ul>
 </div>
 
 		<div class="overview tab_holder" content-layout="simple">
-			<div id="st1" class="st_c">
+			<div id="st1" class="st_c" style="display:block;">
 				<div class="theme_list ssl">
 					<% @themes.each do |theme| %>
-						<div id="<%= theme.id %>" class="ssl_item"><div class="theme_thumb"><img src="/assets/sample_theme.jpg" alt="" width="120" height="96"></div><span class="theme_name ssl_des"><%= theme.name %></span></div>
+						<div id="<%= theme.id %>" class="ssl_item"><div class="theme_thumb"><img src="<%= theme.images.where(:name=>theme.background).first.file.thumb.url %>" alt="" width="120" height="96"></div><span class="theme_name ssl_des"><%= theme.name %></span></div>
 						<% end %>
 				</div>
 			</div>