merged change_4921 branch

LuceIt · Aug 8, 2011 · 273ce57 · 273ce57
1 parent f6ec6cc
commit 273ce57
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/app/views/user_stories/_us_for_show.html.erb b/app/views/user_stories/_us_for_show.html.erb
@@ -1,14 +1,14 @@
 <tr class="<%= classify( count )  %>" id="tab_us_<%= user_story.id %>">
-    <td class="tab_us_main">
-      <%= link_to image_tag("/plugin_assets/redmine_sprints/images/task_add.png")+" "+l('add_task'),
-        {:controller => 'issue_sprints',:action => 'new', :project_id => @project, :user_story_id => user_story.id},
-        {:id => "new_us", :title => l('new_task'),
-         :onclick => "Modalbox.show(this.href, {title: this.title, width: 900, height: 500}); return false;",
+  <td class="tab_us_main">
+    <%= link_to image_tag("/plugin_assets/redmine_sprints/images/task_add.png")+" "+l('add_task'),
+      {:controller => 'issue_sprints',:action => 'new', :project_id => @project, :user_story_id => user_story.id},
+      {:id => "new_us", :title => l('new_task'),
+        :onclick => "Modalbox.show(this.href, {title: this.title, width: 900, height: 500}); return false;",
         :style => "float:right;padding:3px;",
         :remote => true}
-        %>
-        
-        <%#= link_to_remote image_tag("/plugin_assets/redmine_sprints/images/task_add.png")+" "+l('add_task'),
+      %>
+
+      <%#= link_to_remote image_tag("/plugin_assets/redmine_sprints/images/task_add.png")+" "+l('add_task'),
         :url => {:controller => 'issues',:action => 'new', :project_id => @project, :user_story_id => user_story.id},
         :complete => "Modalbox.show($('hidden_item'), {title: this.title, width: 900, height: 500}); return false;",
         :update => "hidden_item",
@@ -32,6 +32,11 @@
               %>
             </td>
           </tr>
+          <tr>
+            <td colspan="3">
+              <%= t("spent_hours") %>: <span><%= sprintf("%.2f", user_story.total_assigned_hours) %></span>
+            </td>
+          </tr>
           <tr>
             <td colspan="3" class="tab_us_description">
               <%= user_story.description -%>