solved desktop conflict during cherry pick

app/views/desktop/app_manager.html.erb

@@ -13,7 +13,7 @@
 	
 	<div id="holder">
 		<div id="group_wrapper" class="overview" content-layout="simple">
-			<div id="app_info" class="admbg vp hp">
+			<div id="app_info" class="admbg vp hp" style="display:none;">
 				<div class="app_info_header s_grid_row hp">
 					<div class="s_grid s_grid_3">
 						<img class="app_info_icon" src="/assets/icons/wikibooks.png" alt="">
@@ -25,18 +25,18 @@
 				</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_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> -->
+						<!-- </div> -->
 					</li>
 					<li class="s_grid_row">
 						<label class="s_grid s_grid_3">Description</label>
 						<div class="s_grid s_grid_9">
-							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+							Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 						</div>
 					</li>
 					<li class="s_grid_row">

app/views/desktop_widgets/edit.html.erb

@@ -0,0 +1,16 @@
+<div>
+	<%= @dw.name %>
+
+	<h4>Upload Widget image </h4>
+	<div class="main2">
+		<%= form_for @dw, :url => desktop_widget_path(@dw) do |f| %>
+
+		<p>
+		<%= f.file_field :image %>
+		</p>
+		<%= submit_tag  %>
+
+		<% end %>
+
+	</div>
+</div>

app/views/desktop_widgets/index.html.erb

@@ -0,0 +1,10 @@
+<div>
+	<ul>
+		<% @desktopWidgets.each do |dw| %>
+			<li> <%= dw.name %> 
+				<%= link_to "Delete", desktop_widget_path(dw), :method=>"delete" %>
+				<%= link_to "Edit", edit_desktop_widget_path(dw) %>
+			</li> 
+		<% end %>
+	</ul>
+</div>