new orbit bar fixed..

Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb

app/assets/Archive/javascripts/desktop.js

@@ -12,6 +12,7 @@
 //= require jquery.miniColors.min
 //= require select2
 //= require bootstrap
+//= require orbit_js_1.0.1-front-end
 //= require orbitdesktopAPI
 //= require orbitTimeline
 //= require orbitdesktop

app/assets/Archive/javascripts/orbitdesktopAPI.js

@@ -159,7 +159,7 @@ var orbitDesktopAPI = function(){
 				}
 			}
 			var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'" data-title="'+ settings.title +'"><div class="app_frame_header"><div class="dtitle hh2 hp"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh2 hp thmtxt"></span><span class="icon-minus hh2 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder clear"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe></div></div>');
-			$("body").append(whtml);
+			$(o.contentHolder).append(whtml);
 			var parentwindow = $(o.contentHolder).find("#app_frame_"+o.windowcounter);
 			var app_holder_height = parentwindow.height() - 72;
 			var app_holder_width = parentwindow.width();

app/assets/Archive/stylesheets/desktop.css

@@ -4,16 +4,16 @@
  *the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require desktop/desktop-font
  *= require bootstrap
- *= require bootstrap-orbit
+ *= require orbit_bar_bootstrap
+ *= require basic/orbit_bar
  *= require jquery.miniColors
  *= require jquery.gridster
  *= require jquery-ui
  *= require font-awesome
- *= require icons
+ *= require basic/icon
  *= require desktop/desktop-component
  *= require desktop/desktop-main
  *= require desktop/desktop-media
  *= require desktop/desktop-select2
  *= require desktop/desktop-timeline
- *= require orbit-bar
 */