Merge branch 'master' into feature/rails3

app/assets/javascripts/backlogs/app/backlog.js

@@ -26,14 +26,19 @@ RB.Backlog = (function ($) {
       // Make the list sortable
       this.getList().sortable({
         connectWith: '.stories',
-        placeholder: 'placeholder',
-        forcePlaceholderSize: true,
         dropOnEmpty: true,
         start:   this.dragStart,
         stop:    this.dragStop,
         update:  this.dragComplete,
         receive: this.dragChanged,
-        remove:  this.dragChanged
+        remove:  this.dragChanged,
+        containment: $('#backlogs_container'),
+        scroll: true,
+        helper: function(event, ui){
+          var $clone =  $(ui).clone();
+          $clone .css('position','absolute');
+          return $clone.get(0);
+        }
       });
 
       // Observe menu items

app/assets/stylesheets/backlogs/master_backlog.css

@@ -310,3 +310,11 @@
 #rb #backlogs_container .stories .story.editing .story_points.editor {
   float: right;
 }
+
+.controller-rb_master_backlogs.action-show #main, 
+.controller-rb_master_backlogs.action-show #content, 
+.controller-rb_master_backlogs.action-show #rb #backlogs_container .backlog .stories {overflow: visible;}
+
+.controller-rb_master_backlogs.action-show div.calendar {
+  z-index: 10000;
+}

app/views/rb_master_backlogs/show.html.erb

@@ -27,7 +27,7 @@
 </h2>
 
 <div id="rb">
-  <div id="backlogs_container">
+  <div id="backlogs_container" class="clear">
     <div id="owner_backlogs_container">
       <%= render :partial => 'backlog', :collection => @owner_backlogs %>
     </div>
@@ -41,3 +41,5 @@
     <div id="last_updated"><%= date_string_with_milliseconds(@last_update, 0.001) %></div>
   </div>
 </div>
+<% #include calendar js files in case they are needed for edit
+  include_calendar_headers_tags -%>