diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/oxidized/api/web/views/head.haml | 2 | ||||
| -rw-r--r-- | lib/oxidized/api/web/views/nodes.haml | 52 | ||||
| -rw-r--r-- | oxidized.gemspec | 2 |
4 files changed, 33 insertions, 25 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1dd5c2e..be9dd32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - oxidized (0.0.34) + oxidized (0.0.36) grit haml net-ssh diff --git a/lib/oxidized/api/web/views/head.haml b/lib/oxidized/api/web/views/head.haml index 55fdb7c..f8c41f8 100644 --- a/lib/oxidized/api/web/views/head.haml +++ b/lib/oxidized/api/web/views/head.haml @@ -1,3 +1,5 @@ %head %title oxidized + %script{:src=>'//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js'} + %script{:src=>'//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.13.3/jquery.tablesorter.min.js'} %link{:rel=>'stylesheet', :href=>'/stylesheets/oxidized.css'} diff --git a/lib/oxidized/api/web/views/nodes.haml b/lib/oxidized/api/web/views/nodes.haml index 87549cc..336a4c2 100644 --- a/lib/oxidized/api/web/views/nodes.haml +++ b/lib/oxidized/api/web/views/nodes.haml @@ -1,28 +1,34 @@ %html !=haml :head %body - %table{:class=>'center'} - %tr - %th Name - %th IP - %th Group - %th Last Status - %th Last Time - %th Config - %th Update - -trclass = %w(even odd) - -@data.sort_by{|e|e[:name]}.each do |node| - -klass = trclass.rotate!.first - %tr{:class=>klass} - %td - %a(href="/node/show/#{node[:name]}") #{node[:name]} - %td= node[:ip] - %td= node[:group] - %td= node[:status] - %td= node[:time] - %td - %a(href="/node/fetch/#{node[:full_name]}") config - %td - %a(href="/node/next/#{node[:full_name]}") update + %table{:id=>'nodesTable', :class=>'center tablesorter'} + %thead + %tr + %th Name + %th IP + %th Group + %th Last Status + %th Last Time + %th Config + %th Update + %tbody + -trclass = %w(even odd) + -@data.sort_by{|e|e[:name]}.each do |node| + -klass = trclass.rotate!.first + %tr{:class=>klass} + %td + %a(href="/node/show/#{node[:name]}") #{node[:name]} + %td= node[:ip] + %td= node[:group] + %td= node[:status] + %td= node[:time] + %td + %a(href="/node/fetch/#{node[:full_name]}") config + %td + %a(href="/node/next/#{node[:full_name]}") update %p{:class=>'center'} %a(href="/reload") reload list of nodes + :javascript + $(function(){ + $("#nodesTable").tablesorter(); + }); diff --git a/oxidized.gemspec b/oxidized.gemspec index 559c53a..12058ed 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'oxidized' - s.version = '0.0.35' + s.version = '0.0.36' s.platform = Gem::Platform::RUBY s.authors = [ 'Saku Ytti' ] s.email = %w( saku@ytti.fi ) |