From: Jan Provaznik jprovazn@redhat.com
Task https://www.aeolusproject.org/redmine/issues/1772 'content-section' class shouldn't be used as toggle selector as it's used for other content too (for example alerts). --- src/app/views/pools/index.haml | 2 +- src/app/views/pools/show.haml | 2 +- src/public/javascripts/application.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/views/pools/index.haml b/src/app/views/pools/index.haml index f326d89..1eb7fc5 100644 --- a/src/app/views/pools/index.haml +++ b/src/app/views/pools/index.haml @@ -7,5 +7,5 @@
= render :partial => 'scoreboard_index' = render :partial => 'alerts_index' -%section.content-section.pools +%section.content-section.toggle-view.pools = render :partial => @view diff --git a/src/app/views/pools/show.haml b/src/app/views/pools/show.haml index 7199a74..cde2890 100644 --- a/src/app/views/pools/show.haml +++ b/src/app/views/pools/show.haml @@ -5,5 +5,5 @@ -#= render :partial => 'alerts'
-# TODO: %w(Deployments History Properties Permissions) links/tabs, plus filter links/icons, go here -%section.content-section +%section.content-section.toggle-view = render :partial => @view, :locals => {:deployments => @pool.deployments} diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js index 90aedfb..b4dfd6e 100644 --- a/src/public/javascripts/application.js +++ b/src/public/javascripts/application.js @@ -95,12 +95,12 @@ var Conductor = { bind_pretty_toggle: function() { Conductor.nicelyHookAjaxClick($("#pretty_view"), function() { $.get($(this).attr("href"), $(this).serialize(), function(result) { - $('#content .content-section').html(result); + $('#content .toggle-view').html(result); }); }); Conductor.nicelyHookAjaxClick($("#filter_view"), function() { $.get($(this).attr("href"), $(this).serialize(), function(result) { - $('#content .content-section').html(result); + $('#content .toggle-view').html(result); $('#details-selected').hide(); $('#details-view').tabs(); });
On 06/15/2011 10:52 AM, jprovazn@redhat.com wrote:
From: Jan Provaznikjprovazn@redhat.com
Task https://www.aeolusproject.org/redmine/issues/1772 'content-section' class shouldn't be used as toggle selector as it's used for other content too (for example alerts).
src/app/views/pools/index.haml | 2 +- src/app/views/pools/show.haml | 2 +- src/public/javascripts/application.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/views/pools/index.haml b/src/app/views/pools/index.haml index f326d89..1eb7fc5 100644 --- a/src/app/views/pools/index.haml +++ b/src/app/views/pools/index.haml @@ -7,5 +7,5 @@
= render :partial => 'scoreboard_index' = render :partial => 'alerts_index' -%section.content-section.pools +%section.content-section.toggle-view.pools = render :partial => @view diff --git a/src/app/views/pools/show.haml b/src/app/views/pools/show.haml index 7199a74..cde2890 100644 --- a/src/app/views/pools/show.haml +++ b/src/app/views/pools/show.haml @@ -5,5 +5,5 @@ -#= render :partial => 'alerts'
-# TODO: %w(Deployments History Properties Permissions) links/tabs, plus filter links/icons, go here -%section.content-section +%section.content-section.toggle-view = render :partial => @view, :locals => {:deployments => @pool.deployments} diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js index 90aedfb..b4dfd6e 100644 --- a/src/public/javascripts/application.js +++ b/src/public/javascripts/application.js @@ -95,12 +95,12 @@ var Conductor = { bind_pretty_toggle: function() { Conductor.nicelyHookAjaxClick($("#pretty_view"), function() { $.get($(this).attr("href"), $(this).serialize(), function(result) {
$('#content .content-section').html(result);
$('#content .toggle-view').html(result); }); }); Conductor.nicelyHookAjaxClick($("#filter_view"), function() { $.get($(this).attr("href"), $(this).serialize(), function(result) {
$('#content .content-section').html(result);
$('#content .toggle-view').html(result); $('#details-selected').hide(); $('#details-view').tabs(); });
ACK with a few notes:
Deployments#show support the view toggle, too, so it should be fixed as well:
app/views/deployments/show.haml
In addition, there are two cucumber tests that need to be updated:
features/pool.feature, lines 184 and 190
Those tests are failing now anyway because of the Deployments update, but the selectors there still need fixing.
Feel free to push once this is fixed.
Thomas
On 06/15/2011 01:14 PM, Tomas Sedovic wrote:
On 06/15/2011 10:52 AM, jprovazn@redhat.com wrote:
From: Jan Provaznikjprovazn@redhat.com
Task https://www.aeolusproject.org/redmine/issues/1772 'content-section' class shouldn't be used as toggle selector as it's used for other content too (for example alerts).
src/app/views/pools/index.haml | 2 +- src/app/views/pools/show.haml | 2 +- src/public/javascripts/application.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/views/pools/index.haml b/src/app/views/pools/index.haml index f326d89..1eb7fc5 100644 --- a/src/app/views/pools/index.haml +++ b/src/app/views/pools/index.haml @@ -7,5 +7,5 @@
= render :partial => 'scoreboard_index' = render :partial => 'alerts_index' -%section.content-section.pools +%section.content-section.toggle-view.pools = render :partial => @view diff --git a/src/app/views/pools/show.haml b/src/app/views/pools/show.haml index 7199a74..cde2890 100644 --- a/src/app/views/pools/show.haml +++ b/src/app/views/pools/show.haml @@ -5,5 +5,5 @@ -#= render :partial => 'alerts'
-# TODO: %w(Deployments History Properties Permissions) links/tabs, plus filter links/icons, go here -%section.content-section +%section.content-section.toggle-view = render :partial => @view, :locals => {:deployments => @pool.deployments} diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js index 90aedfb..b4dfd6e 100644 --- a/src/public/javascripts/application.js +++ b/src/public/javascripts/application.js @@ -95,12 +95,12 @@ var Conductor = { bind_pretty_toggle: function() { Conductor.nicelyHookAjaxClick($("#pretty_view"), function() { $.get($(this).attr("href"), $(this).serialize(), function(result) {
- $('#content .content-section').html(result);
- $('#content .toggle-view').html(result);
}); }); Conductor.nicelyHookAjaxClick($("#filter_view"), function() { $.get($(this).attr("href"), $(this).serialize(), function(result) {
- $('#content .content-section').html(result);
- $('#content .toggle-view').html(result);
$('#details-selected').hide(); $('#details-view').tabs(); });
ACK with a few notes:
Deployments#show support the view toggle, too, so it should be fixed as well:
app/views/deployments/show.haml
In addition, there are two cucumber tests that need to be updated:
features/pool.feature, lines 184 and 190
Those tests are failing now anyway because of the Deployments update, but the selectors there still need fixing.
Feel free to push once this is fixed.
Thomas
Good catch. Pushed. Jan
aeolus-devel@lists.fedorahosted.org