Merge remote-tracking branch 'origin/desktop_work' into desktop

* origin/desktop_work:
  simple layout tinyscrollbar fixed
  highlighting fixed…
  fixed adding.
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster

Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb

app/assets/javascripts/orbitdesktop.js

@@ -310,11 +310,16 @@ var orbitDesktop = function(dom){
     column_container.empty();
     $("div[container=true]").html(h);
     $("div[container=true] div.overview").html(temp_div.html());
-    o.tinyscrollbar_ext({
-      main : ".tinycanvas",
-      fill : base_width * total_columns
-    })
-    
+    if(isNaN(base_width)){
+       o.tinyscrollbar_ext({
+        main : ".tinycanvas",
+      })
+    }else{
+      o.tinyscrollbar_ext({
+        main : ".tinycanvas",
+        fill : base_width * total_columns
+      })
+    }
   }
   this.menu_item = function(dom,customload,submenuitem){
     if(!customload)customload=false;

app/views/desktop/settings/themes.html.erb

@@ -8,7 +8,7 @@
 <div class="tinycanvas vp">
 	<div class="scrollbar sb_v vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
 	<div class="viewport">
-		<div class="overview" content-layout="simple" base-width="1000">
+		<div class="overview" content-layout="simple">
 			<div id="st1" class="st_c">
 				<div class="theme_list ssl">
 					<% @themes.each do |theme| %>