On 07/07/2011 03:11 PM, Jozef Zigmund wrote:
---
src/app/views/deployments/_header_show.haml | 4 +---
src/app/views/deployments/show.haml | 3 +++
src/app/views/pools/_header_show.haml | 2 --
src/app/views/pools/show.haml | 3 +++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/views/deployments/_header_show.haml
b/src/app/views/deployments/_header_show.haml
index 3a70aaa..bfab0b4 100644
--- a/src/app/views/deployments/_header_show.haml
+++ b/src/app/views/deployments/_header_show.haml
@@ -3,7 +3,5 @@
= [@deployment.name, "Deployment"].join(' ')
#obj_actions.button-container
.button-group
- = pretty_filter_toggle(deployment_path(@deployment, :view =>
'pretty'), deployment_path(@deployment, :view => 'filter'))
- .button-group
- = button_to 'Delete', deployment_path(@deployment), :method =>
:delete, :confirm => t("deployments.confirm_delete"), :class =>
"button pill danger"
+ = button_to 'Delete', deployment_path(@deployment), :method =>
:delete, :confirm => "Are you sure you vant to delete this deployment?",
:class => "button pill danger"
Why did you change the confirm message back to using a string? We should
gradually move towards having all text using the I18N API.
Could you please change this back?
.corner
diff --git a/src/app/views/deployments/show.haml b/src/app/views/deployments/show.haml
index fdc6b99..f6ee34a 100644
--- a/src/app/views/deployments/show.haml
+++ b/src/app/views/deployments/show.haml
@@ -10,6 +10,9 @@
= tab[:name]
-if tab[:count]
%span.label.badge.count.dark=tab[:count]
+ #obj_actions.button-container
+ .button-group
+ = pretty_filter_toggle(deployment_path(@deployment, :view =>
'pretty'), deployment_path(@deployment, :view => 'filter'))
.section-controls
%a.collapse{'href'=>'#'} Collapse
.content.collapsible.toggle-view.deployments#tab
diff --git a/src/app/views/pools/_header_show.haml
b/src/app/views/pools/_header_show.haml
index db5e032..8eb3a04 100644
--- a/src/app/views/pools/_header_show.haml
+++ b/src/app/views/pools/_header_show.haml
@@ -2,8 +2,6 @@
%h1.pools
= [@pool.name, "Pool"].join(' ')
#obj_actions.button-container
- .button-group
- = pretty_filter_toggle(pool_path(@pool, :view => 'pretty',
:details_tab => @details_tab[:id]), pool_path(@pool, :view => 'filter',
:details_tab => @details_tab[:id]))
= link_to 'New Deployment', launch_new_deployments_path(:pool_id =>
@pool.id), :class => 'button primary', :id =>
'new_deployment_button'
.button-group
= link_to 'Edit', edit_pool_path(@pool), :class => 'button
pill', :id => 'edit_pool_button'
diff --git a/src/app/views/pools/show.haml b/src/app/views/pools/show.haml
index eebff5e..216ac14 100644
--- a/src/app/views/pools/show.haml
+++ b/src/app/views/pools/show.haml
@@ -15,6 +15,9 @@
= tab[:name]
-if tab[:count]
%span.label.badge.count.dark=tab[:count]
+ #obj_actions.button-container
+ .button-group
+ = pretty_filter_toggle(pool_path(@pool, :view => 'pretty',
:details_tab => @details_tab[:id]), pool_path(@pool, :view => 'filter',
:details_tab => @details_tab[:id]))
.section-controls
%a.collapse{'href'=>'#'} Collapse
.content.collapsible.toggle-view.pools#tab
ACK with a small note inline.
Thomas|shadow
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.