Hi, one note inline )maybe wrong idea).
On 07/07/2011 02:54 PM, Jozef Zigmund wrote:
---
src/app/controllers/pools_controller.rb | 6 +++---
src/app/views/deployments/_filter_view.haml | 2 ++
src/app/views/deployments/_pretty_view.haml | 4 +++-
src/app/views/pools/_history_filter.haml | 2 ++
src/app/views/pools/_history_pretty.haml | 2 ++
src/app/views/pools/_permissions.haml | 2 ++
src/app/views/pools/_properties.haml | 2 ++
src/public/javascripts/application.js | 14 ++++----------
8 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index 8830ab6..e9cedb9 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -70,9 +70,9 @@ class PoolsController< ApplicationController
end
#TODO add links to real data for history,properties,permissions
@tabs = [{:name => 'Deployments', :view => @view, :id =>
'deployments', :count => @pool.deployments.count},
- {:name => 'History', :view => @view, :id =>
'history'},
- {:name => 'Properties', :view => 'properties', :id
=> 'properties'},
- {:name => 'Permissions', :view => 'permissions',
:id => 'permissions'}
+ # {:name => 'History', :view => @view, :id =>
'history'}, not implemented yet
+ {:name => 'Properties', :view => 'properties', :id
=> 'properties'}
+ # {:name => 'Permissions', :view => 'permissions',
:id => 'permissions'} not implemented yet
]
details_tab_name = params[:details_tab].blank? ? 'deployments' :
params[:details_tab]
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} ||
@tabs.first[:name].downcase
diff --git a/src/app/views/deployments/_filter_view.haml
b/src/app/views/deployments/_filter_view.haml
index efa9da7..f6c5a1e 100644
--- a/src/app/views/deployments/_filter_view.haml
+++ b/src/app/views/deployments/_filter_view.haml
@@ -12,3 +12,5 @@
= deployment.instances.count
%td
= link_to(deployment.provider.provider_type.name, deployment.provider) if
deployment.provider
+:javascript
+ Conductor.setupPrettyFilterURL("deployments")
diff --git a/src/app/views/deployments/_pretty_view.haml
b/src/app/views/deployments/_pretty_view.haml
index b62f0f8..c532b5a 100644
--- a/src/app/views/deployments/_pretty_view.haml
+++ b/src/app/views/deployments/_pretty_view.haml
@@ -1 +1,3 @@
-= render :partial => @deployments
\ No newline at end of file
+= render :partial => @deployments
+:javascript
+ Conductor.setupPrettyFilterURL("deployments")
diff --git a/src/app/views/pools/_history_filter.haml
b/src/app/views/pools/_history_filter.haml
index 709dabe..d46fa14 100644
--- a/src/app/views/pools/_history_filter.haml
+++ b/src/app/views/pools/_history_filter.haml
@@ -1,2 +1,4 @@
%h3
History(filter view) has not been implemented yet.
+:javascript
+ Conductor.setupPrettyFilterURL("history")
diff --git a/src/app/views/pools/_history_pretty.haml
b/src/app/views/pools/_history_pretty.haml
index f3aa855..3ac4073 100644
--- a/src/app/views/pools/_history_pretty.haml
+++ b/src/app/views/pools/_history_pretty.haml
@@ -1,2 +1,4 @@
%h3
History(pretty view) has not been implemented yet.
+:javascript
+ Conductor.setupPrettyFilterURL("history")
diff --git a/src/app/views/pools/_permissions.haml
b/src/app/views/pools/_permissions.haml
index 43e570f..fa72f87 100644
--- a/src/app/views/pools/_permissions.haml
+++ b/src/app/views/pools/_permissions.haml
@@ -1,2 +1,4 @@
%h3
Permissions have not been implemented yet.
+:javascript
+ Conductor.setupPrettyFilterURL("permissions")
maybe you could pass whole links to avoid url regexp replacing,
something like this (not tested, just idea):
Conductor.setupPrettyFilterURL(url_for :view => 'filter', url_for :view
=> 'pretty')
\ No newline at end of file
diff --git a/src/app/views/pools/_properties.haml b/src/app/views/pools/_properties.haml
index 3e757f2..ff85a89 100644
--- a/src/app/views/pools/_properties.haml
+++ b/src/app/views/pools/_properties.haml
@@ -2,3 +2,5 @@
Properties for
= @pool.name
= link_to "Edit", edit_pool_path(@pool), { :class => 'button' }
+:javascript
+ Conductor.setupPrettyFilterURL("properties")
\ No newline at end of file
diff --git a/src/public/javascripts/application.js
b/src/public/javascripts/application.js
index 38741af..21e1474 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -70,22 +70,16 @@ var Conductor = {
.show();
});
- if ($(this).hasClass("show"))
- $.get('/pools/show/viewstate', function(data){
- var data = JSON.parse(data);
- Conductor.setupToogleTypeViewUrl(data.details_tab);
- });
-
Conductor.tabRemoveActiveClass();
$(this).addClass('active');
- });
+ });
},
- setupToogleTypeViewUrl: function (tab) {
+ setupPrettyFilterURL: function (tabname) {
var oldPrettyUrl = $("span.view-toggle
a#pretty_view").attr('href');
var oldFilterUrl = $("span.view-toggle
a#filter_view").attr('href');
- var prettyUrl = oldPrettyUrl.replace(/tab=.*&/, "tab=" + tab +
"&");
- var filterUrl = oldFilterUrl.replace(/tab=.*&/, "tab=" + tab +
"&");
+ var prettyUrl = oldPrettyUrl.replace(/tab=.*&/, "tab=" + tabname +
"&");
+ var filterUrl = oldFilterUrl.replace(/tab=.*&/, "tab=" + tabname +
"&");
$("span.view-toggle a#pretty_view").attr('href', prettyUrl);
$("span.view-toggle a#filter_view").attr('href', filterUrl);
and setupPrettyFilterURL is simpler then:
setupPrettyFilterURL: function (filterUrl, prettyUrl) {
$("span.view-toggle a#pretty_view").attr('href', prettyUrl);
$("span.view-toggle a#filter_view").attr('href', filterUrl);
}
This is just idea, if you/someone else has strong opnion on this, feel
free to review/ack/push.
Jan