developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'desktop_harry' into desktop_devin

This commit is contained in:
Harry Bomrah 2012-04-20 14:44:57 +08:00
parent 2ebed9e44a 3eaf97babe
commit 8c42f6bb7c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/orbitdesktop.js
View File

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

2
app/controllers/desktop_controller.rb
View File

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

4
app/views/desktop/index.html.erb
View File

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