From 3eaf97babe8913e51e7f6600759c32a89c388fbb Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 19 Apr 2012 20:26:21 +0800 Subject: [PATCH] =?UTF-8?q?title=20and=20heading=20and=20welcome=20msg?= =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/orbitdesktop.js | 1 + app/controllers/desktop_controller.rb | 2 ++ app/views/desktop/index.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 3783bf59..f86964d9 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -743,6 +743,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"}); } diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 997267be..249f9dca 100644 --- a/app/controllers/desktop_controller.rb +++ b/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 diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index ebe4048c..46f851cf 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -87,14 +87,14 @@ -