backlog 0.15.1 → 0.16.0

data/History.txt

@@ -1,3 +1,19 @@
+== 0.16.0 2007-12-26
+
+=== Features
+
+* Added displaying of task id in task edit form.
+* Added displaying of task id and description in task full screen view.
+* Added more notice messages on small updates, for better responsiveness.
+* Added display of total hours done to Show Task view.
+* Added action buttons to Show Task view
+* Improved control script to delete stale PID file at startup and give better status info.
+* Simple auditing of tasks.  Who created the task, and who updated it last.
+
+=== Fixes
+
+* Fixed error in some URL generations that led to strange navigation.
+
 == 0.15.1 2007-11-29
 
 === Features

data/app/controllers/backlogs_controller.rb

@@ -90,9 +90,9 @@ class BacklogsController < ApplicationController
           Float(params[:estimate][:todo])
           @task.estimate(params[:estimate][:todo])
           @period = @task.period
-          @success, @message = true, 'Estimate updated'
+          @success, flash[:notice] = true, 'Estimate updated'
           rescue ArgumentError => e
-          @success, @message = false, "Estimate was not numeric"
+          @success, flash[:notice] = false, "Estimate was not numeric"
         end
         if @task.finished?
           load_tasks(@task.period)

data/app/controllers/estimates_controller.rb

@@ -4,21 +4,20 @@ class EstimatesController < ApplicationController
   verify :method => :post, :redirect_to => ''
   
   def create
-    @success, @message = do_create
+    @success, flash[:notice] = do_create
 
     unless @success
-      @task.errors.add :estimate, @message
+      @task.errors.add :estimate, flash[:notice]
       render :file => "public/500.html", :layout => true, :status => 500
       return
     end
 
-    flash[:notice] = @message
     redirect_to :controller => 'periods', :action => :show, :id => @task.root_task.period, :task_id => @task.id
   end
   
   def create_ajax
     @task = Task.find_by_id(params[:id])
-    @success, @message = do_create
+    @success, flash[:notice] = do_create
     if @task.finished?
       render :template => '/tasks/finish', :layout => false
     end

data/app/controllers/periods_controller.rb

@@ -175,9 +175,9 @@ class PeriodsController < ApplicationController
           Float(params[:estimate][:todo])
           @task.estimate(params[:estimate][:todo])
           @period = @task.period
-          @success, @message = true, 'Estimate updated'
+          @success, flash[:notice] = true, 'Estimate updated'
           rescue ArgumentError => e
-          @success, @message = false, "Estimate was not numeric"
+          @success, flash[:notice] = false, "Estimate was not numeric"
         end
         if @task.finished?
           load_tasks(@task.period)
@@ -194,6 +194,18 @@ class PeriodsController < ApplicationController
     end
   end
   
+#  def order
+#    params.keys.find {|k| k =~ /active_tasks_(.*)/}
+#    period_id = $1
+#    tasks = params["active_tasks_#{period_id}"].select {|id| not id.empty?}
+#    tasks.each_with_index do |id,idx|
+#      task = Task.find(id)
+#      task.insert_at(idx + 1) 
+#      task.save!
+#    end
+#    render :text => 'Updated sort order'
+#  end
+
   private
   
   def send_burn_down_chart(size)

data/app/controllers/tasks_controller.rb

@@ -127,7 +127,7 @@ class TasksController < ApplicationController
       render :action => 'edit'
     end
   end
-
+  
   def update_task_estimate
     update
   end
@@ -194,6 +194,11 @@ class TasksController < ApplicationController
     redirect_to :controller => 'periods', :action => :show_no_layout, :id => task.period_id, :task => task.id
   end
   
+#  def order
+#    params[:list].each_with_index { |id,idx| Model.update(id, :position => idx) }
+#    render :text => 'Updated sort order'
+#  end
+  
   def start_work
     @task = Task.find(params[:id])
     @task.start_work

data/app/controllers/user_controller.rb

@@ -8,7 +8,7 @@ class UserController < ApplicationController
     user = User.authenticate(params['user']['login'], params['user']['password'])
     if user
       self.current_user = user
-      flash['notice'] = 'Login succeeded'
+      flash[:notice] = 'Login succeeded'
       if remember_me && remember_me == '1'
         user.generate_security_token
         cookies[:autologin] = {:value => user.id.to_s, :expires =>90.days.from_now}
@@ -17,7 +17,7 @@ class UserController < ApplicationController
       back_or_redirect_to :controller => 'backlogs', :action => :index
     else
       @login = params['user']['login']
-      flash['message'] = 'Login failed'
+      flash[:notice] = 'Login failed'
     end
   end
   
@@ -33,13 +33,13 @@ class UserController < ApplicationController
           url = url_for(:action => 'welcome')
           url += "?user[id]=#{@user.id}&key=#{key}"
           UserNotify.deliver_signup(@user, params['user']['password'], url)
-          flash['notice'] = 'Signup successful! Please check your registered email account to verify your account registration and continue with the login.'
+          flash[:notice] = 'Signup successful! Please check your registered email account to verify your account registration and continue with the login.'
           redirect_to :action => 'login'
         end
       end
       rescue Exception => ex
       report_exception ex
-      flash['message'] = 'Error creating account: confirmation email not sent'
+      flash[:notice] = 'Error creating account: confirmation email not sent'
     end
   end  
   
@@ -58,7 +58,7 @@ class UserController < ApplicationController
       @user.save!
       rescue Exception => ex
       report_exception ex
-      flash.now['message'] = 'Your password could not be changed at this time. Please retry.'
+      flash.now[:notice] = 'Your password could not be changed at this time. Please retry.'
       render and return
     end
     begin
@@ -71,7 +71,7 @@ class UserController < ApplicationController
   
   def forgot_password
     if authenticated_user?
-      flash['message'] = 'You are currently logged in. You may change your password now.'
+      flash[:notice] = 'You are currently logged in. You may change your password now.'
       redirect_to :action => 'change_password'
       return
     end
@@ -79,9 +79,9 @@ class UserController < ApplicationController
     return if generate_blank_form
     
     if params['user']['email'].empty?
-      flash.now['message'] = 'Please enter a valid email address.'
+      flash.now[:notice] = 'Please enter a valid email address.'
     elsif (user = User.find_by_email(params['user']['email'])).nil?
-      flash.now['message'] = "We could not find a user with the email address #{CGI.escapeHTML(params['user']['email'])}"
+      flash.now[:notice] = "We could not find a user with the email address #{CGI.escapeHTML(params['user']['email'])}"
     else
       begin
         User.transaction do
@@ -98,7 +98,7 @@ class UserController < ApplicationController
         end
         rescue Exception => ex
         report_exception ex
-        flash.now['message'] = "Your password could not be emailed to #{CGI.escapeHTML(params['user']['email'])}"
+        flash.now[:notice] = "Your password could not be emailed to #{CGI.escapeHTML(params['user']['email'])}"
       end
     end
   end
@@ -134,7 +134,7 @@ class UserController < ApplicationController
       @user.update_attribute( :deleted, true )
       logout
       rescue Exception => ex
-      flash.now['message'] = "Error: #{@ex}."
+      flash.now[:notice] = "Error: #{@ex}."
       redirect_back_or_default :action => 'welcome'
     end
   end

data/app/helpers/application_helper.rb

@@ -86,9 +86,10 @@ module ApplicationHelper
   end
   
   def display_notice(page)
-    if @message
-      page.replace_html :notice, @message
+    if flash[:notice]
+      page.replace_html :notice, flash[:notice]
       page.visual_effect(:appear, :notice)
+      flash.discard
     else
       page.visual_effect(:fade, :notice)
     end

data/app/helpers/user_helper.rb

@@ -15,12 +15,12 @@ module UserHelper
     opts = DEFAULT_HEAD_OPTIONS.dup
     opts.update(options.symbolize_keys)
     s = "<h3>#{label}</h3>"
-    if flash['notice'] and not opts[:notice].nil? and opts[:notice]
-      notice = "<div><p>#{flash['notice']}</p></div>"
+    if flash[:notice] and not opts[:notice].nil? and opts[:notice]
+      notice = "<div><p>#{flash[:notice]}</p></div>"
       s = s + notice
     end
-    if flash['message'] and not opts[:message].nil? and opts[:message]
-      message = "<div id=\"ErrorExplanation\"><p>#{flash['message']}</p></div>"
+    if flash[:notice] and not opts[:message].nil? and opts[:message]
+      message = "<div id=\"ErrorExplanation\"><p>#{flash[:notice]}</p></div>"
       s = s + message
     end
     if not opts[:error].nil? and opts[:error]

data/app/views/layouts/_headers.rhtml

@@ -20,3 +20,4 @@
   <%= javascript_include_tag "effects" %>
   <%= javascript_include_tag "controls" %>
   <%= javascript_include_tag "dragdrop" %>
+  <%= javascript_include_tag "ruby" %>

data/app/views/layouts/_notice.rhtml

@@ -1,9 +1,6 @@
       <div id="notice">
-      <% if flash[:notice] || flash['notice'] || flash[:message] || flash['message'] %>
+      <% if flash[:notice] %>
         <%=flash[:notice]%>
-        <%=flash['notice']%>
-        <%=flash[:message]%>
-        <%=flash['message']%>
 		<%=javascript_tag update_page {|page|
 			page.show 'notice'
 		   } %>

data/app/views/periods/_show_active.rhtml

@@ -36,17 +36,19 @@ function handleEvent(field, event, id) {
 <% current_backlog = nil -%>
 <% for task in @tasks -%>
   <% if task.backlog != current_backlog -%>
-    <%='</table>' if current_backlog%>
+    <%=sortable_element "active_tasks_#{current_backlog.id}", :url => { :action => :order } if current_backlog%>
+    <%='</ul>' if current_backlog%>
     <% current_backlog = task.backlog %>
-    <table class="input" style="width: 100%;">
-      <%= '<tr><td>&nbsp;</td></tr>' if false && current_backlog %>
+    <ul id="active_tasks_<%=current_backlog.id%>" class="input" style="width: 95%; list-style-type: none">
+      <%= '<li><span>&nbsp;</span></li>' if false && current_backlog %>
       <%=render :partial => '/tasks/backlog_header', :locals => { :backlog => task.backlog, :track_times => current_backlog.track_done? && @tasks.find {|t|t.period && t.period.active?} } %>
       <%=render :partial => '/tasks/fields_header', :locals => { :backlog => task.backlog, :active => true, :track_times => @tasks.find {|t|t.period && t.period.active?}, :work_done => @tasks.find {|t|t.backlog_id == current_backlog.id && t.total_done > 0} } %>
   <% end -%>
   <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => true, :highlight_task => task == @selected_task, :update => :spotlight, :hidden => false } %>
   <% i += 1 %>
 <% end -%>
-    <%='</table>' if current_backlog%>
+    <%=sortable_element "active_tasks_#{current_backlog.id}", :url => { :action => :order } if current_backlog%>
+    <%='</ul>' if current_backlog%>
 </div>
 
 <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty?%>><%=l :no_pending_tasks%></p>
@@ -56,7 +58,7 @@ function handleEvent(field, event, id) {
 
 <script type="text/JavaScript">
 <% if @selected_task && @selected_task.active?%>
-document.getElementById('task_<%=@selected_task.id%>_description').focus();
-//document.getElementById('task_<%=@selected_task.id%>_description').select();
+document.getElementById('task_<%=@selected_task.id%>').focus();
+//document.getElementById('task_<%=@selected_task.id%>').select();
 <% end %>
 </script>

data/app/views/periods/show.rhtml

@@ -13,3 +13,41 @@
 
   <%=render :partial => '/tasks/completed', :locals => {:i => i} %>
 </div>
+
+<script type="text/javascript">
+//alert(Ruby.eval(Ruby.code()));
+</script>
+
+<script type="text/x-ruby">
+begin
+  require 'java'
+  JSObject = netscape.javascript.JSObject
+  s = "ho"
+rescue Exception => e
+  s = e
+end
+s
+#win = JSObject.getWindow(this)
+#doc = win.getMember("document")
+#loc = doc.getMember("location")
+
+#s = loc.getMember("href")
+#win.call("f", null)
+</script>
+
+<script type="text/javascript">
+function showRuby() {
+  alert(Ruby.code());
+}
+
+function echoRuby(ruby) {
+  alert(Ruby.eval(ruby));
+}
+
+window.onload = function() {
+  Ruby.init(function(result) {
+    alert(result);
+  });
+}
+
+</script>

data/app/views/tasks/_backlog_header.rhtml

@@ -1,14 +1,14 @@
 <% @backlog = backlog %>
 
-  <tr valign="top">
-    <td>
+  <li valign="top">
+    <span>
       <%=image_detour_to('add.png', l(:new_task), :controller => 'tasks', :action => :new, :task => {:backlog_id => @backlog.id, :period_id => @period && @period.id})%>
-    </td>
-    <td colspan="4" style="vertical-align: middle">
+    </span>
+    <span colspan="4" style="vertical-align: middle">
     <h5>
       <%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :show, :id => @backlog) %>
       <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog.id)%>
       </h5>
-    </td>
-    <td width="*"/>
-  </tr>
+    </span>
+    <span width="*"/>
+  </li>

data/app/views/tasks/_completed.rhtml

@@ -1,6 +1,6 @@
-<div id="completed_tasks">
+<div id="completed_tasks" style="margin: 0px; border: 0px; padding: 0px">
 <% @completed_tasks.map {|t| t.period}.uniq.each do |period| %>
-<table id="completed_tasks_<%=period ? period.id : ''%>" class="input">
+<ul id="completed_tasks_<%=period ? period.id : ''%>" class="input" style="width: 100%; list-style-type: none; margin: 0px; border: 0px; padding: 0px">
   <% tasks_in_period = @completed_tasks.select {|t| t.period == period} %>
   <% work_done = !tasks_in_period.find{|t| t.total_done != 0}.nil? %>
   <%=render :partial => '/tasks/period_header', :locals => {:period => period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
@@ -9,6 +9,6 @@
     <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, :highlight_task => task == @selected_task, :hidden => false } %>
     <% i += 1 %>
   <% end %>
-</table>
+</ul>
 <% end %>
 </div>

data/app/views/tasks/_fields_header.rhtml

@@ -1,9 +1,9 @@
-  <tr>
-    <th/>
-    <th align="center"><%=active ? '#' : l(:resolution_abr)%></th>
-    <th><%=l :task %></th>
-    <th><%=l :start if active && backlog.track_times? %></th>
-    <th/>
-    <th><%=l :done if (active && backlog.track_done?) || work_done %></th>
-    <th width="*"><%=l :todo if active && backlog.track_todo? %></th>
-  </tr>
+  <li>
+    <span/>
+    <span align="center"><%=active ? '#' : l(:resolution_abr)%></span>
+    <span><%=l :task %></span>
+    <span><%=l :start if active && backlog.track_times? %></span>
+    <span/>
+    <span><%=l :done if (active && backlog.track_done?) || work_done %></span>
+    <span width="*"><%=l :todo if active && backlog.track_todo? %></span>
+  </li>

data/app/views/tasks/_form.rhtml

@@ -29,12 +29,13 @@
 
 <% if @task.backlog %>
 
-<p><label for="task_description"><%=l :task%></label><br/>
+<p><label for="task_description"><%=l :task%> #<%=@task.id%></label><br/>
 <% if @task.active? -%>
-	<%=text_field 'task', 'description', :size => 64, :maxlength => 80 %></p>
+	<%=text_field 'task', 'description', :size => 64, :maxlength => 80 %>
 <% else -%>
 	<%=@task.description -%>
 <% end -%>
+</p>
 
 <% if @task.enable_customer? %>
 <p><label for="task_customer"><%=l :customer%></label><br/>
@@ -48,14 +49,23 @@
 
 <% if @task.track_todo? %>
   <% if @task.new_record? %>
-<p><label for="task_initial_estimate"><%=l :estimate%></label><br/>
-<%= text_field 'task', 'initial_estimate', :size => 4  %></p>
+    <p><label for="task_initial_estimate"><%=l :estimate%></label><br/>
+      <%= text_field 'task', 'initial_estimate', :size => 4  %>
+	</p>
   <% else %>
-<p><label for="estimate_todo"><%=l :estimate%></label><br/>
-<%= text_field 'estimate', 'todo', :size => 4, :value => @task.todo  %></p>
+    <p style="float: left"><label for="estimate_todo"><%=l :estimate%></label><br/>
+      <%=text_field 'estimate', 'todo', :size => 4, :value => @task.todo  %>
+	</p>
   <% end %>
 <% end %>
 
+<% if @task.total_done != 0 -%>
+  <p style="float: left"><%=l :done%></label><br/>
+    <%=t @task.total_done%>
+  </p>
+<% end %>
+<br clear="all" />
+
 <p><label for="task_notes"><%=l :notes%></label><br/>
 <%=text_area 'task', 'notes', :cols => '72', :rows => 16 %>
 <%=if @task.notes and not @task.notes.empty? then image_link_to 'view_fullscreen.png', l(:view_fullscreen), :controller => 'tasks', :action => :notes, :id => @task end%>

data/app/views/tasks/_task.rhtml

@@ -1,65 +1,70 @@
 <% @task = task %>
-  <tr id="task_<%=@task.id%>" valign="top"<%=' class="highlight"' if highlight_task %><%=' style="display: none"' if hidden %>>
-    <td width="1">
+  <li id="task_<%=@task.id%>" style="border: 0px; margin: 0px"<%=' class="tasks" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'"' if active && (@task.period.nil? || @task.period.active_or_future?) && (not @task.work_started?) %><%=' class="highlight"' if highlight_task %><%=' style="display: none"' if hidden %>>
+    <div style="float: left" style="border: 0px">
     <% if @task.enable_subtasks? && active && (@task.period.nil? || @task.period.active_or_future?) %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
         <%= image_button_to('add.png', l(:specify), :controller => 'tasks', :action => :specify, :id => @task.id)%>
       <% end %>
     <% end %>
-    </td>
-    <td align="left" valign="top" width="1" nowrap="true">
-      <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
-      <%=@task.position if @task.position || @task.depth == 0 %>
-      <%= resolution_image(@task.resolution) if @task.finished_at %>
-      <%= "-" if @task.children.size > 0 %>
-    </td>
-    <td>
-		<div id="task_<%=@task.id%>_description"<%=' class="tasks" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'"' if active && (@task.period.nil? || @task.period.active_or_future?) && (not @task.work_started?) %>>
-      		<%=detour_to h(@task.description_with_id), :controller => 'tasks', :action => :edit, :id => @task.id if @task.position || @task.depth == 0 %>
-		</div>
-    </td>
-    <td align="right" nowrap="true" width="1">
+    </div>
+    <div style="float: left" style="border: 0px">
+      <%=("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
+      <%=resolution_image(@task.resolution) if @task.finished_at %>
+      <%="-" if @task.children.size > 0 %>
+    </div>
+	<div id="task_<%=@task.id%>_id" style="float: left; padding: 2px">
+   		<%=@task.id %>
+	</div>
+	<div id="task_<%=@task.id%>_description" style="float: left">
+   		<%=detour_to h(@task.description), :controller => 'tasks', :action => :edit, :id => @task.id, :style => 'border: 0px; margin: 0px; padding: 0px' if @task.position || @task.depth == 0 %>
+	</div>
+
+
+
+    <div style="float: right" style="border: 1px solid black">
+    <div style="float: left" style="border: 1px solid black">
       <% if active && @task.loggable? -%>
-        <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
-          <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
           <% if @task.work_started? -%>
-            <%=f.text_field 'started_at_time', :id => "work_#{@task.started_work.id}_started_at_time", :tabindex => i+1, :value => @task.started_work.started_at.strftime('%H:%M'),
-                :class => :task_time, :maxlength => 5 %>
+            <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
+              <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+              <%=f.text_field 'started_at_time', :id => "work_#{@task.started_work.id}_started_at_time", :tabindex => i+1, :value => @task.started_work.started_at.strftime('%H:%M'),
+                  :class => :task_time, :maxlength => 5 %>
+            <% end %>
           <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>
             <%=image_link_to_remote 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
           <% end -%>
-        <% end %>
       <% end -%>
-    </td>
-    <td align="right" nowrap="true" width="1">
+    </div>
+    <div style="float: left" style="border: 1px solid black">
       <% if active && @task.loggable? && @task.work_started? -%>
         <% form_tag({:controller => 'works', :action => 'update', :id => @task.started_work}) do %>
           <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => @task.id}, nil, true) %>
         <% end -%>
       <% end -%>
-    </td>
-    <td align="<%=active && @task.loggable? && @task.track_done? ? 'left' : 'right'%>" nowrap="true" width="1">
+    </div>
+    <div style="float: left" style="border: 1px solid black" align="<%=active && @task.loggable? && @task.track_done? ? 'left' : 'right'%>">
     <% if @task.track_done? || @task.total_done != 0 %>
       <% if @task.loggable? || @task.finished_at -%>
-        <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
-          <%=hidden_field('work', 'task_id', :value => @task.id)%>
-          <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
           <% unless !@task.track_done? || @task.track_times? || @task.work_started? || @task.finished_at -%>
-            <%=text_field 'work', 'hours', :tabindex => i+1, :id => "#{@task.id}_done", 
-                :class => :task_hours, :maxlength => 4,
-                :ondblclick => "form.elements[1].style.display = 'inline';this.style.display = 'none'" -%>
+            <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
+              <%=hidden_field('work', 'task_id', :value => @task.id)%>
+              <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+              <%=text_field 'work', 'hours', :tabindex => i+1, :id => "#{@task.id}_done", 
+                  :class => :task_hours, :maxlength => 4,
+                  :ondblclick => "form.elements[1].style.display = 'inline';this.style.display = 'none'" -%>
+            <% end -%>
           <% end -%>
           <%=t @task.total_done if @task.total_done != 0%>
-        <% end -%>
       <% end -%>
     <% end -%>
-    </td>
-    <td nowrap="true" width="1">
+    </div>
+    <div style="float: left" style="border: 1px solid black">
       <% if active && @task.loggable? -%>
-        <% remote_form_for(:estimate, :url => {:action => :update_task_estimate, :id => @task}) do |f| -%>
           <% if @task.track_todo? -%>
             <% if @task.period.nil? || @task.period.active_or_future? -%>
-              <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4 %>
+              <% form_for(:estimate, :url => {:action => :update_task_estimate, :id => @task}) do |f| -%>
+                <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4 %>
+              <% end -%>
             <% else -%>
               <%=@task.todo %>
             <% end -%>
@@ -67,36 +72,27 @@
           <% if (not @task.track_times?) && !@task.work_started? && (@task.period.nil? || @task.period.active?) %>
             <%=image_link_to_remote('checkmark.png', l(:complete), {:action => :finish_task, :id => @task}, nil, true)%>
           <% end -%>
-        <% end -%>
       <% end -%>
-    </td>
-    <td align="right" nowrap="true">
-      <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do %>
-        <% if @task.active? %>
-          <% if @task.loggable? %>
-            <% unless @task.work_started? %>
+    </div>
+    <div style="float: left" align="right" style="border: 1px solid black">
+        <% if @task.active? -%>
+          <% if @task.loggable? -%>
+            <% unless @task.work_started? -%>
+      <%# form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
               <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>
               <%=image_link_to_remote('ernes_stop.png', l(:abort), {:action => :abort_task, :id => @task}, nil, true)%>
-            <% end %>
-          <% end %>
-        <% elsif (@task.period.nil? || (not @task.period.passed?)) && @task.leaf? %>
+      <%# end -%>
+            <% end -%>
+          <% end -%>
+        <% elsif (@task.period.nil? || (not @task.period.passed?)) && @task.leaf? -%>
+      <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
           <%=image_link_to_remote('eraser.png', l(:reopen), {:action => :reopen_task, :id => @task}, nil, true) %>
-        <% end -%>
       <% end -%>
-    </td>
-  </tr>
-
-<% if active && (@task.period.nil? || @task.period.active_or_future?) %>
-<%=draggable_element "task_#{@task.id}_description" %>
-<%=drop_receiving_element "task_#{@task.id}_description",
-      :update => update, 
-	  :url => with_detour({:controller => 'tasks', :action => "move_to", :target_id => @task.id, :layout => false}),
-      :accept => "tasks",
-      :loading => "",
-      :complete => "",
-      :hoverclass => 'dropzone-hover'
-%>
-<% end %>
+        <% end -%>
+    </div>
+	</div>
+	<br clear="all" />
+  </li>
 
   <% for subtask in task.children %>
     <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active, :highlight_task => subtask == @selected_task, :update => update } if (active && subtask.active?) || (!active && subtask.completed?) %>