From c55cd5c9bbb4f83c898b85242f9cbe33cff24e22 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 11 Apr 2012 15:50:27 +0800 Subject: [PATCH] Last commit --- app/assets/javascripts/orbitdesktop.js | 4 ++-- public/desktop_widgets/{clock1 => clock2}/clock1.js | 0 .../{clock1 => clock2}/img/bg_blue.png | Bin .../{clock1 => clock2}/img/bg_green.png | Bin .../{clock1 => clock2}/img/bg_orange.png | Bin .../{clock1 => clock2}/index.html.erb | 0 .../{clock1 => clock2}/temp/bg_blue.png | Bin .../{clock1 => clock2}/temp/bg_green.png | Bin .../{clock1 => clock2}/temp/bg_orange.png | Bin .../{clock1 => clock2}/temp/clock.css | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename public/desktop_widgets/{clock1 => clock2}/clock1.js (100%) rename public/desktop_widgets/{clock1 => clock2}/img/bg_blue.png (100%) rename public/desktop_widgets/{clock1 => clock2}/img/bg_green.png (100%) rename public/desktop_widgets/{clock1 => clock2}/img/bg_orange.png (100%) rename public/desktop_widgets/{clock1 => clock2}/index.html.erb (100%) rename public/desktop_widgets/{clock1 => clock2}/temp/bg_blue.png (100%) rename public/desktop_widgets/{clock1 => clock2}/temp/bg_green.png (100%) rename public/desktop_widgets/{clock1 => clock2}/temp/bg_orange.png (100%) rename public/desktop_widgets/{clock1 => clock2}/temp/clock.css (100%) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index b8badc59..b95eab3b 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -164,7 +164,7 @@ var orbitDesktop = function(dom){ $("div#group_wrapper").empty(); $.getJSON("/desktop/getgroups",{sectionid:id},function(groups){ var tilecolors = o.themesettings.tilecolor; - var opacity = ["op05","op06","op07","op08"]; + var opacity = ["op05","op06","op07","op08","op09"]; $.each(groups,function(i,group){ group.sort(o.sortJSON("position",true,parseInt)); var $group = $('
'); @@ -174,7 +174,7 @@ var orbitDesktop = function(dom){ if(tile.data_category == "app") $li = $('
  • '+tile.title+'

  • '); else - $li = $('
  • '+tile.title+'

    test content
  • '); + $li = $('
  • '+tile.title+'

    test content
  • '); $group.find("ul").append($li); }) $("div#group_wrapper").append($group); diff --git a/public/desktop_widgets/clock1/clock1.js b/public/desktop_widgets/clock2/clock1.js similarity index 100% rename from public/desktop_widgets/clock1/clock1.js rename to public/desktop_widgets/clock2/clock1.js diff --git a/public/desktop_widgets/clock1/img/bg_blue.png b/public/desktop_widgets/clock2/img/bg_blue.png similarity index 100% rename from public/desktop_widgets/clock1/img/bg_blue.png rename to public/desktop_widgets/clock2/img/bg_blue.png diff --git a/public/desktop_widgets/clock1/img/bg_green.png b/public/desktop_widgets/clock2/img/bg_green.png similarity index 100% rename from public/desktop_widgets/clock1/img/bg_green.png rename to public/desktop_widgets/clock2/img/bg_green.png diff --git a/public/desktop_widgets/clock1/img/bg_orange.png b/public/desktop_widgets/clock2/img/bg_orange.png similarity index 100% rename from public/desktop_widgets/clock1/img/bg_orange.png rename to public/desktop_widgets/clock2/img/bg_orange.png diff --git a/public/desktop_widgets/clock1/index.html.erb b/public/desktop_widgets/clock2/index.html.erb similarity index 100% rename from public/desktop_widgets/clock1/index.html.erb rename to public/desktop_widgets/clock2/index.html.erb diff --git a/public/desktop_widgets/clock1/temp/bg_blue.png b/public/desktop_widgets/clock2/temp/bg_blue.png similarity index 100% rename from public/desktop_widgets/clock1/temp/bg_blue.png rename to public/desktop_widgets/clock2/temp/bg_blue.png diff --git a/public/desktop_widgets/clock1/temp/bg_green.png b/public/desktop_widgets/clock2/temp/bg_green.png similarity index 100% rename from public/desktop_widgets/clock1/temp/bg_green.png rename to public/desktop_widgets/clock2/temp/bg_green.png diff --git a/public/desktop_widgets/clock1/temp/bg_orange.png b/public/desktop_widgets/clock2/temp/bg_orange.png similarity index 100% rename from public/desktop_widgets/clock1/temp/bg_orange.png rename to public/desktop_widgets/clock2/temp/bg_orange.png diff --git a/public/desktop_widgets/clock1/temp/clock.css b/public/desktop_widgets/clock2/temp/clock.css similarity index 100% rename from public/desktop_widgets/clock1/temp/clock.css rename to public/desktop_widgets/clock2/temp/clock.css