Merge branch 'desktop_harry' into desktop_devin

app/assets/javascripts/orbitdesktop.js

@@ -761,6 +761,7 @@ orbitDesktop.prototype.notifyImgPath = "temp";
 orbitDesktop.prototype.wallpaperPath = "/assets/stockBackground/";
 orbitDesktop.prototype.iconPath = "/assets/icons/";
 orbitDesktop.prototype.currentLanguage = "en";
+orbitDesktop.prototype.currentUsername = "Harry";
 var uselessfunction = function(){
 	$.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"});
 }

app/controllers/desktop_controller.rb

@@ -6,6 +6,8 @@ class DesktopController< ApplicationController
   
   def index
     @desktop = current_user.desktop
+    @currentusername = current_user.name
+    @title = "Desktop - " + @currentusername
     @section = @desktop.sections.first
   end
   

app/views/desktop/index.html.erb

@@ -87,14 +87,14 @@
 		</div>
 	</div>
 </div>
-
 <script>
 	orbitDesktop.prototype.themefolder = "desktop_themes";
 	orbitDesktop.prototype.notifyImgPath = "/assets/";
 	orbitDesktop.prototype.desktopId = "<%= @desktop.id %>";
 	orbitDesktop.prototype.sectionId = "<%= @section.id %>";
 	orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
+	orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
 	//uselessfunction();
 	var od = new orbitDesktop("#ajax_container");
-	// o.notify("Notification Working!!","imp",3)
+	 o.notify("Welcome "+o.currentUsername+"!!","alert",3);
 </script>