I can't apply this patch.
Some errors raise, look:
error: patch failed: app/views/sprints/_list.html.erb:39
error: app/views/sprints/_list.html.erb: patch does not apply
--
Benjamin LAN-SUN-LUK
Le 06/12/08 01:40, « Darryl L. Pierce » <mcpierce(a)gmail.com> a écrit :
Signed-off-by: Darryl L. Pierce <mcpierce(a)gmail.com>
---
app/views/items/_list.html.erb | 8 ++++----
app/views/items/show.html.erb | 12 ++++++------
app/views/products/_list.html.erb | 4 ++--
app/views/products/show.html.erb | 8 ++++----
app/views/projects/index.html.erb | 4 ++--
app/views/projects/show.html.erb | 6 +++---
app/views/sprints/_list.html.erb | 8 +++++---
app/views/sprints/show.html.erb | 8 ++++----
app/views/stories/_list.html.erb | 6 +++---
app/views/stories/show.html.erb | 4 ++--
app/views/tasks/_list.html.erb | 6 +++---
app/views/tasks/show.html.erb | 6 +++---
app/views/users/_list.html.erb | 4 ++--
app/views/users/show.html.erb | 6 +++---
14 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/app/views/items/_list.html.erb b/app/views/items/_list.html.erb
index d9ec7ea..249f666 100644
--- a/app/views/items/_list.html.erb
+++ b/app/views/items/_list.html.erb
@@ -76,16 +76,16 @@
<td><%= item.state_text %></td>
<td><%= show_hours_as_ear(item) %>
<td>
- <%= link_to(image_tag("icons/item_accept.png"),
+ <%= link_to(image_tag("icons/item_accept.png", :title =>
"Accept this item..."),
accept_product_sprint_item_path(product, sprint, item,
:source => request.request_uri)) if item.can_accept?(@user) %>
- <%= link_to(image_tag("icons/item_drop.png"),
+ <%= link_to(image_tag("icons/item_drop.png", :title =>
"Drop this item..."),
drop_product_sprint_item_path(product, sprint,item,
:source => request.request_uri)) if item.can_drop?(@user) %>
- <%= link_to(image_tag("icons/item_complete.png"),
+ <%= link_to(image_tag("icons/item_complete.png", :title
=>"Mark this item completed..."),
complete_product_sprint_item_path(product, sprint, item,
:source => request.request_uri)) if item.can_complete?(@user) %>
- <%= link_to(image_tag("icons/item_reopen.png"),
+ <%= link_to(image_tag("icons/item_reopen.png", :title =>
"Reopen this item..."),
reopen_product_sprint_item_path(product, sprint, item,
:source => request.request_uri)) if item.can_reopen?(@user) %>
</td>
diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb
index 4c2b7d4..f7a05e3 100644
--- a/app/views/items/show.html.erb
+++ b/app/views/items/show.html.erb
@@ -8,20 +8,20 @@
<tbody>
<tr>
<td class="toolbar" colspan="2">
- <%= link_to(image_tag("icons/back.png", :alt => "Return to
sprint..."),
+ <%= link_to(image_tag("icons/back.png", :title =>
"Back..."),
product_sprint_path(@product, @sprint)) %>
- <%= link_to(image_tag("icons/new.png", :alt => "Add
task..."),
+ <%= link_to(image_tag("icons/new.png", :title => "Add
task..."),
new_user_task_path(@user, :item => @backlog_item)) if
@backlog_item.can_add_tasks?(@user) %>
- <%= link_to(image_tag("icons/item_accept.png"),
+ <%= link_to(image_tag("icons/item_accept.png", :title =>
"Accept this item..."),
accept_product_sprint_item_path(@product, @sprint, @backlog_item,
:url => request.request_uri)) if @backlog_item.can_accept?(@user) %>
- <%= link_to(image_tag("icons/item_drop.png"),
+ <%= link_to(image_tag("icons/item_drop.png", :title => "Drop
this item..."),
drop_product_sprint_item_path(@product, @sprint,@backlog_item,
:url => request.request_uri)) if @backlog_item.can_drop?(@user) %>
- <%= link_to(image_tag("icons/item_complete.png"),
+ <%= link_to(image_tag("icons/item_complete.png", :title =>
"Mark this item completed..."),
complete_product_sprint_item_path(@product, @sprint, @backlog_item,
:url => request.request_uri)) if @backlog_item.can_complete?(@user) %>
- <%= link_to(image_tag("icons/item_reopen.png"),
+ <%= link_to(image_tag("icons/item_reopen.png", :title =>
"Reopen this item..."),
reopen_product_sprint_item_path(@product, @sprint, @backlog_item,
:url => request.request_uri)) if @backlog_item.can_reopen?(@user) %>
</td>
diff --git a/app/views/products/_list.html.erb b/app/views/products/_list.html.erb
index a7e181d..b4e9053 100644
--- a/app/views/products/_list.html.erb
+++ b/app/views/products/_list.html.erb
@@ -62,9 +62,9 @@
<td><%= link_to "#{product.sprints.size}",
product_sprints_path(product) %></td>
<td><%= link_to "#{product.product_roles.size}",
product_roles_path(product) %>
<td>
- <%= link_to(image_tag("icons/view.png", :alt => "View
product..."),
+ <%= link_to(image_tag("icons/view.png", :title => "View
this product..."),
product_path(product)) %>
- <%= link_to(image_tag("icons/edit.png", :alt => "Edit
product..."),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit
this product..."),
edit_product_path(product)) if product.can_edit?(@user) %>
</tr>
<% end %>
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb
index 1bfe486..46066f4 100644
--- a/app/views/products/show.html.erb
+++ b/app/views/products/show.html.erb
@@ -14,13 +14,13 @@
<tbody>
<tr>
<td class="toolbar" colspan="2">
- <%= link_to(image_tag("icons/product_join.png", :alt =>
"Join this product team..."),
+ <%= link_to(image_tag("icons/product_join.png", :title =>
"Join this product team..."),
new_product_role_path(@product)) unless @product.is_member?(@user) %>
- <%= link_to(image_tag("icons/edit.png", :alt => "Edit this
product..."),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit this
product..."),
edit_product_path(@product, :url => request.request_uri)) if
@product.can_edit?(@user) %>
- <%= link_to(image_tag("icons/story_add.png", :alt => "Create
a new user story..."),
+ <%= link_to(image_tag("icons/story_add.png", :title =>
"Create a new user story..."),
new_product_story_path(@product, :source => request.request_uri)) if
@product.can_create_user_stories?(@user) %>
- <%= link_to(image_tag("icons/sprint_add.png", :alt =>
"Create a new sprint..."),
+ <%= link_to(image_tag("icons/sprint_add.png", :title =>
"Create a new sprint..."),
new_product_sprint_path(@product)) if @product.can_create_sprints?(@user)
%>
</td>
</tr>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index d091f66..be4a910 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -44,10 +44,10 @@
<td><%= show_date(project.created_at) %></td>
<td>
<%= link_to(
- image_tag("icons/view.png", :alt => "View"),
+ image_tag("icons/view.png", :title => "View this
project..."),
project_path(project)) %>
<%= link_to(
- image_tag("icons/edit.png", :alt => "Edit"),
+ image_tag("icons/edit.png", :title => "Edit this
project..."),
edit_project_path(project, :source => request.request_uri)) if
project.can_edit?(@user)%>
</td>
</tr>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 0b7fffa..d402e71 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -8,11 +8,11 @@
<tbody>
<tr>
<td class="toolbar" colspan="2">
- <%= link_to(image_tag("icons/back.png", :alt => "Project
list..."),
+ <%= link_to(image_tag("icons/back.png", :title =>
"Back..."),
projects_path) %>
- <%= link_to(image_tag("icons/edit.png", :alt =>
"Edit"),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit this
project..."),
edit_project_path(@project)) if @project.can_edit?(@user) %>
- <%= link_to(image_tag("icons/new.png", :alt => "New
product..."),
+ <%= link_to(image_tag("icons/new.png", :title => "Create a
new product..."),
new_product_path(:project => @project)) if
@project.can_create_products?(@user) %>
</td>
</tr>
diff --git a/app/views/sprints/_list.html.erb b/app/views/sprints/_list.html.erb
index a66ad21..e65fd9f 100644
--- a/app/views/sprints/_list.html.erb
+++ b/app/views/sprints/_list.html.erb
@@ -39,12 +39,14 @@
<td><%= "#{show_date(sprint.end_date)} (#{sprint.duration}
days)" %></td>
<td><%= show_hours_as_ear(sprint) %></td>
<td>
- <%= link_to(image_tag("icons/view.png"),
product_sprint_path(@product, sprint)) %>
+ <%= link_to(image_tag("icons/view.png", :title => "View
this sprint..."),
+ product_sprint_path(@product, sprint)) %>
<% if sprint.can_edit?(@user) %>
<%= link_to(
- image_tag("icons/edit.png"), edit_product_sprint_path(@product,
sprint)) %>
+ image_tag("icons/edit.png", :title => "Edit this
sprint..."),
+ edit_product_sprint_path(@product, sprint)) %>
<% end %>
- <%= link_to(image_tag("icons/delete.png"),
+ <%= link_to(image_tag("icons/delete.png", :title =>
"Delete this sprint..."),
product_sprint_path(@product, sprint), :method => :delete,
:confirm => "Delete? Are you sure?") if
sprint.can_delete?(@user) %>
</td>
diff --git a/app/views/sprints/show.html.erb b/app/views/sprints/show.html.erb
index 0b826c6..83ffbbc 100644
--- a/app/views/sprints/show.html.erb
+++ b/app/views/sprints/show.html.erb
@@ -9,19 +9,19 @@
<tr>
<td colspan="2" class="toolbar">
<%= link_to(
- image_tag("icons/back.png", :alt => "Return to sprint
list..."),
+ image_tag("icons/back.png", :title => "Back..."),
product_sprints_path(@product)) %>
<% if @sprint.can_edit?(@user) %>
<%= link_to(
- image_tag("icons/edit.png", :alt => "Edit this
sprint"),
+ image_tag("icons/edit.png", :title => "Edit this
sprint"),
edit_product_sprint_path(@product, @sprint)) %>
<% end %>
<% if @sprint.can_populate?(@user) %>
<%= link_to(
- image_tag("icons/sprint_plan.png", :alt => "Plan this
sprint"),
+ image_tag("icons/sprint_plan.png", :title => "Plan this
sprint..."),
plan_product_sprint_path(@product, @sprint)) %>
<% end %>
- <%= link_to(image_tag("icons/delete.png", :alt => "Delete
this sprint"),
+ <%= link_to(image_tag("icons/delete.png", :title => "Delete
this sprint..."),
product_sprint_path(@product, @sprint), :method => :delete,
:confirm => "Delete? Are you sure?") if @sprint.can_delete?(@user)
%>
</td>
diff --git a/app/views/stories/_list.html.erb b/app/views/stories/_list.html.erb
index 964c892..fd2e9bb 100644
--- a/app/views/stories/_list.html.erb
+++ b/app/views/stories/_list.html.erb
@@ -32,12 +32,12 @@
<td><%= story.priority %></td>
<td><%= story.title %></td>
<td>
- <%= link_to(image_tag("icons/view.png", :alt =>
"View"),
+ <%= link_to(image_tag("icons/view.png", :title => "View
this user story..."),
product_story_path(story.product,story)) %>
- <%= link_to(image_tag("icons/edit.png", :alt =>
"Edit"),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit
this user story..."),
edit_product_story_path(story.product,story,
:source => request.request_uri)) if story.can_edit?(@user) %>
- <%= link_to(image_tag("icons/delete.png", :alt =>
"Delete"),
+ <%= link_to(image_tag("icons/delete.png", :title =>
"Delete this user story..."),
product_story_path(story.product, story,
:source => request.request_uri), :method => :delete,
:confirm => "Delete? Are you sure?") if
story.can_delete?(@user) %>
diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb
index e17c0c1..f0d4aea 100644
--- a/app/views/stories/show.html.erb
+++ b/app/views/stories/show.html.erb
@@ -9,9 +9,9 @@
<tr>
<td class="toolbar" colspan="2">
- <%= link_to(image_tag("icons/back.png", :alt => "Return to
the list..."),
+ <%= link_to(image_tag("icons/back.png", :title =>
"Back..."),
product_stories_path(@product)) %>
- <%= link_to(image_tag("icons/edit.png", :alt =>
"Edit"),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit this
user story..."),
edit_product_story_path(@product, @user_story,
:url => request.request_uri)) if @user_story.can_edit?(@user) %>
</td>
diff --git a/app/views/tasks/_list.html.erb b/app/views/tasks/_list.html.erb
index 31f5a8c..b725b0d 100644
--- a/app/views/tasks/_list.html.erb
+++ b/app/views/tasks/_list.html.erb
@@ -35,11 +35,11 @@
<td><%= link_to(task.backup, user_path(task.backup)) if task.backup
%></td>
<td><%= format "%0.2f", task.hours %>
<td>
- <%= link_to(image_tag("icons/view.png", :alt => "View
task..."),
+ <%= link_to(image_tag("icons/view.png", :title => "View
this task..."),
user_task_path(task.primary, task)) %>
- <%= link_to(image_tag("icons/edit.png", :atl => "Edit
task..."),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit
this task..."),
edit_user_task_path(task.primary, task)) if task.can_edit?(@user) %>
- <%= link_to(image_tag("icons/delete.png", :alt => "Delete
task..."),
+ <%= link_to(image_tag("icons/delete.png", :title =>
"Delete this task..."),
user_task_path(task.primary, task), :confirm => "Are you
sure?",
:method => :delete) if task.can_delete?(@user) %>
</td>
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 89b003f..0657f7b 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -8,11 +8,11 @@
<tbody>
<tr>
<td class="toolbar" colspan="2">
- <%= link_to(image_tag("icons/back.png", :alt =>
"Back..."),
+ <%= link_to(image_tag("icons/back.png", :title =>
"Back..."),
user_tasks_path((a)task.primary)) %>
- <%= link_to(image_tag("icons/edit.png", :alt =>
"Edit..."),
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit this
task..."),
edit_user_task_path((a)task.primary, @task)) if @task.can_edit?(@user) %>
- <%= link_to(image_tag("icons/delete.png", :alt =>
"Delete..."),
+ <%= link_to(image_tag("icons/delete.png", :title => "Delete
this task..."),
user_task_path((a)task.primary, @task, :confirm => "Delete? Are you
sure?",
:html => {:method => :delete})) if @task.can_delete?(@user) %>
</td>
diff --git a/app/views/users/_list.html.erb b/app/views/users/_list.html.erb
index d4bb89f..696fc54 100644
--- a/app/views/users/_list.html.erb
+++ b/app/views/users/_list.html.erb
@@ -36,8 +36,8 @@
<td><%= link_to "#{user.product_roles.size} roles",
roles_user_path(user) %></td>
<td><%= show_date(user.created_at) %></td>
<td>
- <%= link_to(image_tag("icons/view.png", :alt => "View
user..."), user_path(user)) %>
- <%= link_to(image_tag("icons/edit.png", :alt =>
"Edit"),
+ <%= link_to(image_tag("icons/view.png", :title => "View
this user..."), user_path(user)) %>
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit
this user..."),
edit_user_path(user)) if user.can_edit?(@user) %>
</td>
</tr>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index ab1cde5..a2a772f 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -8,10 +8,10 @@
<tbody>
<tr>
<td class="toolbar" colspan="2">
- <%= link_to(image_tag("icons/back.png", :alt => "Back to
users list..."), users_path) %>
- <%= link_to(image_tag("icons/edit.png", :alt =>
"Edit"),
+ <%= link_to(image_tag("icons/back.png", :title =>
"Back..."), users_path) %>
+ <%= link_to(image_tag("icons/edit.png", :title => "Edit this
user..."),
edit_user_path(@this_user)) if @this_user.can_edit?(@user) %>
- <%= link_to(image_tag("icons/password.png", :alt => "Change
password"),
+ <%= link_to(image_tag("icons/password.png", :title =>
"Change the account password..."),
password_user_path(@this_user)) if @this_user.can_edit?(@user) %>
</td>
</tr>
--
1.6.0.2
_______________________________________________
projxp-devel mailing list
projxp-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/projxp-devel