projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9ff1c5
)
9587: rename pane name to "Recent trash"
author
radhika <radhika@curoverse.com>
Tue, 6 Jun 2017 15:01:06 +0000
(11:01 -0400)
committer
radhika <radhika@curoverse.com>
Tue, 6 Jun 2017 15:01:06 +0000
(11:01 -0400)
apps/workbench/app/controllers/trash_items_controller.rb
patch
|
blob
|
history
apps/workbench/app/views/application/_breadcrumbs.html.erb
patch
|
blob
|
history
apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
[moved from
apps/workbench/app/views/trash_items/_show_recent.html.erb
with 100% similarity]
patch
|
blob
|
history
diff --git
a/apps/workbench/app/controllers/trash_items_controller.rb
b/apps/workbench/app/controllers/trash_items_controller.rb
index 7d60f50f1c5b0af27267a425c43228f3e0864f1d..5f91a60ca1d4c627e8701d6a3ac8dabca50871e0 100644
(file)
--- a/
apps/workbench/app/controllers/trash_items_controller.rb
+++ b/
apps/workbench/app/controllers/trash_items_controller.rb
@@
-3,8
+3,8
@@
class TrashItemsController < ApplicationController
Collection
end
- def
show
_pane_list
- %w(Recent)
+ def
index
_pane_list
+ %w(Recent
_trash
)
end
def find_objects_for_index
diff --git
a/apps/workbench/app/views/application/_breadcrumbs.html.erb
b/apps/workbench/app/views/application/_breadcrumbs.html.erb
index 2db43eda6251ceee56356ff71ba3fc00e07ca616..1ead5787b8b54363bec746003a8aa878d7f356b9 100644
(file)
--- a/
apps/workbench/app/views/application/_breadcrumbs.html.erb
+++ b/
apps/workbench/app/views/application/_breadcrumbs.html.erb
@@
-69,7
+69,7
@@
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/trash">
- <%= image_tag("trash-icon.png", size: "
19x19
" ) %> Trash
+ <%= image_tag("trash-icon.png", size: "
20x20
" ) %> Trash
</a>
</li>
</ul>
diff --git
a/apps/workbench/app/views/trash_items/_show_recent.html.erb
b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
similarity index 100%
rename from
apps/workbench/app/views/trash_items/_show_recent.html.erb
rename to
apps/workbench/app/views/trash_items/_show_recent_trash.html.erb