diff --git a/app/assets/javascripts/desktopload.js.erb b/app/assets/javascripts/desktopload.js.erb index e648db6b..56b7b9b3 100644 --- a/app/assets/javascripts/desktopload.js.erb +++ b/app/assets/javascripts/desktopload.js.erb @@ -1,10 +1,4 @@ -//orbitDesktop.prototype.themesfolder = "<%= "#{Rails.root}/lib/desktop_themes" %>"; +orbitDesktop.prototype.themefolder = "desktop_themes"; var od = new orbitDesktop("#ajax_container"); - // alert(od.themefolder); -$(document).ready(function(){ - alert("something"); - -// od.initializeDesktop(); -}); diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index e2242eee..6b233082 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -6,7 +6,7 @@ var orbitDesktop = function(dom){ this.contentHolder = dom; this.themesettings = ""; this.theme = "default"; - this.themefolder = "themes"; +// this.themefolder = "themes"; this.transitionTime = 500; this.currenthtml = "desktop.html"; this.currentface = "home"; @@ -14,18 +14,20 @@ var orbitDesktop = function(dom){ this.tp = ""; this.initialize = function(){ var theme = o.theme; - $.getJSON(o.themefolder+"/"+theme+"/settings/"+theme+".json",function(ts){ + $.getJSON("/"+o.themefolder+"/"+theme+"/settings/"+theme+".json",function(ts){ o.themesettings = eval(ts); - $('head').append( $('').attr('href', o.themefolder+"/"+theme+"/css/"+ts.css)); + $('head').append( $('').attr('href', "/"+o.themefolder+"/"+theme+"/css/"+ts.css)); + $(document).ready(function(){o.loadWallpaper();o.bindDesktopEvents();o.loadIconCache();o.initializeDesktop();}); + return; }) - $(document).ready(function(){o.loadWallpaper();o.bindDesktopEvents();o.loadIconCache();}); + }; this.changeTheme = function(theme){ o.theme = theme; - $.getJSON(o.themefolder+"/"+theme+"/settings/"+theme+".json",function(ts){ + $.getJSON("/"+o.themefolder+"/"+theme+"/settings/"+theme+".json",function(ts){ o.themesettings = eval(ts); $('head').find("#dyn_css").remove(); - $('head').append( $('').attr('href', o.themefolder+"/"+theme+"/css/"+ts.css)); + $('head').append( $('').attr('href', "?"+o.themefolder+"/"+theme+"/css/"+ts.css)); o.loadWallpaper(); o.loadIconCache(); }) @@ -76,7 +78,7 @@ var orbitDesktop = function(dom){ }); }; this.initializeDesktop = function(target){ - if(!target)target = "desktop.html"; + if(!target)target = "desktop"; o.currenthtml = target; o.currentface = "home"; var groupWrapperWidth = 0; @@ -123,7 +125,7 @@ var orbitDesktop = function(dom){ }); } if(!o.desktopData[o.currentface]){ - $(o.contentHolder).empty().load("pages/"+target,function(){ + $(o.contentHolder).empty().load("/desktop/"+target,function(){ bindHandlers(); }); }else{ @@ -175,7 +177,7 @@ var orbitDesktop = function(dom){ }) } if(!o.desktopData[o.currentface]){ - $(o.contentHolder).empty().load("pages/"+target,function(){ + $(o.contentHolder).empty().load("desktop_pages/"+target,function(){ bindHandlers(); }); }else{ @@ -213,7 +215,7 @@ var orbitDesktop = function(dom){ })//.mouseleave(function(){$(this).addClass("op06");}); }; if(!o.desktopData[o.currentface]){ - $(o.contentHolder).empty().load("pages/"+target,function(){ + $(o.contentHolder).empty().load("desktop_pages/"+target,function(){ bindHandlers(); }); }else{ @@ -227,16 +229,19 @@ var orbitDesktop = function(dom){ var ww = $(window).width(); var wh = $(window).height(); if(o.themesettings.background) - $("img#thmbackground").attr({"src":o.themefolder+"/"+o.theme+"/images/"+wallpaper,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"}); + $("img#thmbackground").attr({"src":"/"+o.themefolder+"/"+o.theme+"/images/"+wallpaper,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"}); else - $("img#thmbackground").attr({"src":"images/"+wallpaper,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"}); + $("img#thmbackground").attr({"src":"/"+"images/"+wallpaper,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"}); $("div#bgover").css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","width":ww,"height":wh}); }; this.loadIconCache = function(){ - $("#home_icon").attr("src","themes/"+o.theme+"/images/"+o.themesettings.icons.home); - $("#app_manager_icon").attr("src","themes/"+o.theme+"/images/"+o.themesettings.icons.app_manager); - $("#sections_icon").attr("src","themes/"+o.theme+"/images/"+o.themesettings.icons.sections); + $("#home_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.home); + $("#app_manager_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.app_manager); + $("#sections_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.sections); } o.initialize(); } + +orbitDesktop.prototype.themefolder = "themes"; + diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index c9dad188..1b13ec59 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -4,4 +4,8 @@ class DesktopController< ApplicationController def index end + + def desktop + render :layout => false + end end \ No newline at end of file diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb new file mode 100755 index 00000000..570799f9 --- /dev/null +++ b/app/views/desktop/app_manager.html.erb @@ -0,0 +1,121 @@ +
+ +
+ +
+
+ +
+ + + +
+
+
+
diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb new file mode 100755 index 00000000..7ec473c8 --- /dev/null +++ b/app/views/desktop/desktop.html.erb @@ -0,0 +1,110 @@ +
+ +
+
+
+
    +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +
+
+
+
    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +
+
+
+
+
+ +
+
+ \ No newline at end of file diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 0e2542bc..2bcc0846 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -1,24 +1,6 @@ - -
- +
@@ -35,6 +17,7 @@ Change Theme:
diff --git a/app/views/desktop/sections.html.erb b/app/views/desktop/sections.html.erb new file mode 100644 index 00000000..854acb05 --- /dev/null +++ b/app/views/desktop/sections.html.erb @@ -0,0 +1,171 @@ +
+ +
+
+
+ +
    +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • + + +
+
+
+ +
    +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • + +
+
+
+
+
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index da1020e6..288428f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -102,6 +102,7 @@ Orbit::Application.routes.draw do resources :users end match '/desktop/'=>'desktop#index' + match '/desktop/desktop'=>'desktop#desktop' match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request| !request.query_string.include?("inner=true") } diff --git a/public/desktop_pages/app_manager.html b/public/desktop_pages/app_manager.html new file mode 100755 index 00000000..570799f9 --- /dev/null +++ b/public/desktop_pages/app_manager.html @@ -0,0 +1,121 @@ +
+ +
+ +
+
+ +
+ + + +
+
+
+
diff --git a/public/desktop_pages/desktop.html b/public/desktop_pages/desktop.html new file mode 100755 index 00000000..7ec473c8 --- /dev/null +++ b/public/desktop_pages/desktop.html @@ -0,0 +1,110 @@ +
+ +
+
+
+
    +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +
+
+
+
    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +
+
+
+
+
+ +
+
+ \ No newline at end of file diff --git a/public/desktop_pages/sections.html b/public/desktop_pages/sections.html new file mode 100644 index 00000000..854acb05 --- /dev/null +++ b/public/desktop_pages/sections.html @@ -0,0 +1,171 @@ +
+ +
+
+
+ +
    +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • + + +
+
+
+ +
    +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • +
  • +

    Garage Band

    +
  • + +
+
+
+
+
+
\ No newline at end of file diff --git a/lib/desktop_themes/chris/css/default.css b/public/desktop_themes/chris/css/default.css similarity index 94% rename from lib/desktop_themes/chris/css/default.css rename to public/desktop_themes/chris/css/default.css index fc63b82e..9e01a140 100755 --- a/lib/desktop_themes/chris/css/default.css +++ b/public/desktop_themes/chris/css/default.css @@ -31,7 +31,7 @@ apply to: /* Theme Text Color */ .thmtxt { color: #fff; } -.thmtxth { color: #0F0; } +.thmtxth { color: #000; } /* Group Seprate Color */ .g_sep { border-color: #fff; } diff --git a/lib/desktop_themes/chris/images/apps.png b/public/desktop_themes/chris/images/apps.png similarity index 100% rename from lib/desktop_themes/chris/images/apps.png rename to public/desktop_themes/chris/images/apps.png diff --git a/lib/desktop_themes/chris/images/background.jpg b/public/desktop_themes/chris/images/background.jpg similarity index 100% rename from lib/desktop_themes/chris/images/background.jpg rename to public/desktop_themes/chris/images/background.jpg diff --git a/lib/desktop_themes/chris/images/chris.jpeg b/public/desktop_themes/chris/images/chris.jpeg similarity index 100% rename from lib/desktop_themes/chris/images/chris.jpeg rename to public/desktop_themes/chris/images/chris.jpeg diff --git a/lib/desktop_themes/chris/images/home.png b/public/desktop_themes/chris/images/home.png similarity index 100% rename from lib/desktop_themes/chris/images/home.png rename to public/desktop_themes/chris/images/home.png diff --git a/lib/desktop_themes/chris/images/sections.png b/public/desktop_themes/chris/images/sections.png similarity index 100% rename from lib/desktop_themes/chris/images/sections.png rename to public/desktop_themes/chris/images/sections.png diff --git a/lib/desktop_themes/chris/settings/chris.json b/public/desktop_themes/chris/settings/chris.json similarity index 100% rename from lib/desktop_themes/chris/settings/chris.json rename to public/desktop_themes/chris/settings/chris.json diff --git a/lib/desktop_themes/default/css/default.css b/public/desktop_themes/default/css/default.css similarity index 100% rename from lib/desktop_themes/default/css/default.css rename to public/desktop_themes/default/css/default.css diff --git a/lib/desktop_themes/default/images/apps.png b/public/desktop_themes/default/images/apps.png similarity index 100% rename from lib/desktop_themes/default/images/apps.png rename to public/desktop_themes/default/images/apps.png diff --git a/lib/desktop_themes/default/images/background.jpg b/public/desktop_themes/default/images/background.jpg similarity index 100% rename from lib/desktop_themes/default/images/background.jpg rename to public/desktop_themes/default/images/background.jpg diff --git a/lib/desktop_themes/default/images/home.png b/public/desktop_themes/default/images/home.png similarity index 100% rename from lib/desktop_themes/default/images/home.png rename to public/desktop_themes/default/images/home.png diff --git a/lib/desktop_themes/default/images/sections.png b/public/desktop_themes/default/images/sections.png similarity index 100% rename from lib/desktop_themes/default/images/sections.png rename to public/desktop_themes/default/images/sections.png diff --git a/lib/desktop_themes/default/settings/default.json b/public/desktop_themes/default/settings/default.json similarity index 100% rename from lib/desktop_themes/default/settings/default.json rename to public/desktop_themes/default/settings/default.json diff --git a/lib/desktop_themes/sexy/css/sexy.css b/public/desktop_themes/sexy/css/sexy.css similarity index 100% rename from lib/desktop_themes/sexy/css/sexy.css rename to public/desktop_themes/sexy/css/sexy.css diff --git a/lib/desktop_themes/sexy/images/apps.png b/public/desktop_themes/sexy/images/apps.png similarity index 100% rename from lib/desktop_themes/sexy/images/apps.png rename to public/desktop_themes/sexy/images/apps.png diff --git a/lib/desktop_themes/sexy/images/background.jpg b/public/desktop_themes/sexy/images/background.jpg similarity index 100% rename from lib/desktop_themes/sexy/images/background.jpg rename to public/desktop_themes/sexy/images/background.jpg diff --git a/lib/desktop_themes/sexy/images/home.png b/public/desktop_themes/sexy/images/home.png similarity index 100% rename from lib/desktop_themes/sexy/images/home.png rename to public/desktop_themes/sexy/images/home.png diff --git a/lib/desktop_themes/sexy/images/sections.png b/public/desktop_themes/sexy/images/sections.png similarity index 100% rename from lib/desktop_themes/sexy/images/sections.png rename to public/desktop_themes/sexy/images/sections.png diff --git a/lib/desktop_themes/sexy/settings/sexy.json b/public/desktop_themes/sexy/settings/sexy.json similarity index 100% rename from lib/desktop_themes/sexy/settings/sexy.json rename to public/desktop_themes/sexy/settings/sexy.json diff --git a/lib/desktop_themes/snake/css/snake.css b/public/desktop_themes/snake/css/snake.css similarity index 100% rename from lib/desktop_themes/snake/css/snake.css rename to public/desktop_themes/snake/css/snake.css diff --git a/lib/desktop_themes/snake/images/apps.png b/public/desktop_themes/snake/images/apps.png similarity index 100% rename from lib/desktop_themes/snake/images/apps.png rename to public/desktop_themes/snake/images/apps.png diff --git a/lib/desktop_themes/snake/images/background.jpg b/public/desktop_themes/snake/images/background.jpg similarity index 100% rename from lib/desktop_themes/snake/images/background.jpg rename to public/desktop_themes/snake/images/background.jpg diff --git a/lib/desktop_themes/snake/images/home.png b/public/desktop_themes/snake/images/home.png similarity index 100% rename from lib/desktop_themes/snake/images/home.png rename to public/desktop_themes/snake/images/home.png diff --git a/lib/desktop_themes/snake/images/sections.png b/public/desktop_themes/snake/images/sections.png similarity index 100% rename from lib/desktop_themes/snake/images/sections.png rename to public/desktop_themes/snake/images/sections.png diff --git a/lib/desktop_themes/snake/settings/snake.json b/public/desktop_themes/snake/settings/snake.json similarity index 100% rename from lib/desktop_themes/snake/settings/snake.json rename to public/desktop_themes/snake/settings/snake.json diff --git a/lib/desktop_themes/vintage/css/default.css b/public/desktop_themes/vintage/css/default.css similarity index 100% rename from lib/desktop_themes/vintage/css/default.css rename to public/desktop_themes/vintage/css/default.css diff --git a/lib/desktop_themes/vintage/images/Home-icon.png b/public/desktop_themes/vintage/images/Home-icon.png similarity index 100% rename from lib/desktop_themes/vintage/images/Home-icon.png rename to public/desktop_themes/vintage/images/Home-icon.png diff --git a/lib/desktop_themes/vintage/images/apps.png b/public/desktop_themes/vintage/images/apps.png similarity index 100% rename from lib/desktop_themes/vintage/images/apps.png rename to public/desktop_themes/vintage/images/apps.png diff --git a/lib/desktop_themes/vintage/images/background.jpg b/public/desktop_themes/vintage/images/background.jpg similarity index 100% rename from lib/desktop_themes/vintage/images/background.jpg rename to public/desktop_themes/vintage/images/background.jpg diff --git a/lib/desktop_themes/vintage/images/home.png b/public/desktop_themes/vintage/images/home.png similarity index 100% rename from lib/desktop_themes/vintage/images/home.png rename to public/desktop_themes/vintage/images/home.png diff --git a/lib/desktop_themes/vintage/images/sections.png b/public/desktop_themes/vintage/images/sections.png similarity index 100% rename from lib/desktop_themes/vintage/images/sections.png rename to public/desktop_themes/vintage/images/sections.png diff --git a/lib/desktop_themes/vintage/settings/vintage.json b/public/desktop_themes/vintage/settings/vintage.json similarity index 100% rename from lib/desktop_themes/vintage/settings/vintage.json rename to public/desktop_themes/vintage/settings/vintage.json