chef-server-webui 0.8.16 → 0.9.0.a3

data/app/helpers/global_helpers.rb

@@ -16,20 +16,24 @@
 # limitations under the License.
 #
 
-module Merb
-  module ChefServerWebui
+# Possibly Dead Code. To revive it, move the GlobalHelpers module into the
+# Merb namespace
 
-    module GlobalHelpers
-      # helpers defined here available to all views.
-      def resource_collection(collection)
-        html = "<ul>"
-        collection.each do |resource|
-          html << "<li><b>#{resource.class}</b></li>"
-        end
-        html << "</ul>"
-        html
-      end
-
-    end
-  end
-end
+# module Merb
+#   module ChefServerWebui
+# 
+#     module GlobalHelpers
+#       # helpers defined here available to all views.
+#       def resource_collection(collection)
+#         html = "<ul>"
+#         collection.each do |resource|
+#           html << "<li><b>#{resource.class}</b></li>"
+#         end
+#         html << "</ul>"
+#         html
+#       end
+# 
+#     end
+#   end
+# end
+# 

data/app/helpers/nodes_helper.rb

@@ -17,25 +17,27 @@
 # limitations under the License.
 #
 
-module Merb
-  module ChefServerWebui
-    module NodesHelper
-      def recipe_list(node)
-        response = ""
-        node.recipes.each do |recipe|
-          response << "<li>#{recipe}</li>\n"
-        end
-        response
-      end
-
-      def attribute_list(node)
-        response = ""
-        node.each_attribute do |k,v|
-          response << "<li><b>#{k}</b>: #{v}</li>\n"
-        end
-        response
-      end
-      
-    end
-  end
-end
+# Possibly dead code. to revive it, move NodesHelper into the Merb namespace.
+# module Merb
+#   module ChefServerWebui
+#     module NodesHelper
+#       def recipe_list(node)
+#         response = ""
+#         node.recipes.each do |recipe|
+#           response << "<li>#{recipe}</li>\n"
+#         end
+#         response
+#       end
+# 
+#       def attribute_list(node)
+#         response = ""
+#         node.each_attribute do |k,v|
+#           response << "<li><b>#{k}</b>: #{v}</li>\n"
+#         end
+#         response
+#       end
+#       
+#     end
+#   end
+# end
+# 

data/app/helpers/openid_server_helpers.rb

@@ -16,14 +16,17 @@
 # limitations under the License.
 #
 
-module Merb
-  module ChefServerWebui
-    module OpenidServerHelper
-      
-      def url_for_user
-        url(:openid_node, :username => session[:username])
-      end
+# possibly dead code.
 
-    end
-  end
-end
+# module Merb
+#   module ChefServerWebui
+#     module OpenidServerHelper
+#       
+#       def url_for_user
+#         url(:openid_node, :username => session[:username])
+#       end
+# 
+#     end
+#   end
+# end
+# 

data/app/helpers/search_helper.rb

@@ -1,38 +1,44 @@
-module Merb
-  module ChefServerWebui
-    module SearchHelper
-      def output_path(attributes)
-        res = Hash.new
-        attributes.each do |path|
-          parts = path.split("/")
-          unless parts[0].nil?
-            parts.shift if parts[0].length == 0
-          end
-          res[path] = ohai_walk(parts)
-        end
-        res
-      end
-      
-      def ohai_walk(path)
-        unless path[0]
-          @@ohai.to_json
-        else
-          ohai_walk_r(@@ohai, path)
-        end
-      end
-          
-      def ohai_walk_r(ohai, path)
-        hop = (ohai.is_a?(Array) ? path.shift.to_i : path.shift)
-        if ohai[hop]
-          if path[0]
-            ohai_walk_r(ohai[hop], path)
-          else
-            ohai[hop].to_json
-          end
-        else
-          nil
-        end
-      end
-    end
-  end  
-end # Merb
+# TODO: missing license header.
+
+
+# possibly dead code. to revive, move SearchHelper to the Merb namespace.
+
+# module Merb
+#   module ChefServerWebui
+#     module SearchHelper
+#       def output_path(attributes)
+#         res = Hash.new
+#         attributes.each do |path|
+#           parts = path.split("/")
+#           unless parts[0].nil?
+#             parts.shift if parts[0].length == 0
+#           end
+#           res[path] = ohai_walk(parts)
+#         end
+#         res
+#       end
+#       
+#       def ohai_walk(path)
+#         unless path[0]
+#           @@ohai.to_json
+#         else
+#           ohai_walk_r(@@ohai, path)
+#         end
+#       end
+#           
+#       def ohai_walk_r(ohai, path)
+#         hop = (ohai.is_a?(Array) ? path.shift.to_i : path.shift)
+#         if ohai[hop]
+#           if path[0]
+#             ohai_walk_r(ohai[hop], path)
+#           else
+#             ohai[hop].to_json
+#           end
+#         else
+#           nil
+#         end
+#       end
+#     end
+#   end  
+# end # Merb
+# 

data/app/helpers/status_helper.rb

@@ -18,9 +18,16 @@
 require 'chef' / 'node'
 
 module Merb
-  module ChefServerWebui
-    module StatusHelper
+  module StatusHelper
+    def time_difference_in_hms(unix_time)
+      now = Time.now.to_i
+      difference = now - unix_time.to_i
+      hours = (difference / 3600).to_i
+      difference = difference % 3600
+      minutes = (difference / 60).to_i
+      seconds = (difference % 60)
+      return [hours, minutes, seconds]
     end
-
+    
   end
 end

data/app/views/clients/_navigation.html.haml

@@ -1,9 +1,9 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:clients))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', slice_url(:new_client))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:clients))
+    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:new_client))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:client, @client.name))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', slice_url(:edit_client, @client.name))
-      %li= link_to('Delete', slice_url(:client, @client.name), :method => "delete", :confirm => "Really delete Role #{@client.name}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:client, @client.name))
+      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:edit_client, @client.name))
+      %li= link_to('Delete', url(:client, @client.name), :method => "delete", :confirm => "Really delete Role #{@client.name}? There is no undo.")
   .clear

data/app/views/clients/edit.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Client: #{h @client.name}"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit Client #{@client.name}", :form_id => 'edit_client', :submit_name => "Save Client", :submit_id => "edit_client_button", :form_for => 'edit', :form_url => slice_url(:client, @client.name) )
+  = partial('form', :header => "Edit Client #{@client.name}", :form_id => 'edit_client', :submit_name => "Save Client", :submit_id => "edit_client_button", :form_for => 'edit', :form_url => url(:client, @client.name) )

data/app/views/clients/index.html.haml

@@ -13,9 +13,9 @@
           - even = false;
           - @clients_list.each do |client|
             %tr{ :class => even ? "even" : "odd" }
-              %td{:colspan => 2}= link_to(client[0], slice_url(:client, client[0]))
+              %td{:colspan => 2}= link_to(client, url(:client, client))
               %td
-                = link_to('Edit', slice_url(:edit_client, client[0])) 
+                = link_to('Edit', url(:edit_client, client)) 
                 |
-                = link_to('Delete', slice_url(:client, client[0]), :method => "delete", :confirm => "Really delete Role #{client[0]}?  there is no undo.")
-              - even ? even = false: even = true
+                = link_to('Delete', url(:client, client), :method => "delete", :confirm => "Really delete Role #{client}?  there is no undo.")
+              - even = (not even)

data/app/views/clients/new.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Client"
     .inner
       = partial('navigation', :active => 'create')
-  = partial('form', :header => "Create new Client", :form_id => 'create_client', :submit_name => "Create Client", :submit_id => "create_client_button", :form_for => 'create', :form_url => slice_url(:clients))
+  = partial('form', :header => "Create new Client", :form_id => 'create_client', :submit_name => "Create Client", :submit_id => "create_client_button", :form_for => 'create', :form_url => url(:clients))

data/app/views/cookbooks/index.html.haml

@@ -7,4 +7,4 @@
           %th.first Cookbook Name
           - @cl.sort.each_with_index do |cookbook, index|
             %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-              %td= link_to cookbook[0], slice_url(:cookbook, { :id => cookbook[0] })
+              %td= link_to cookbook[0], url(:cookbook, { :id => cookbook[0] })

data/app/views/cookbooks/show.html.haml

@@ -1,40 +1,49 @@
+%script{:type=>"text/javascript", :src => "/javascripts/drop_down_menu.js"}
 .block#block-text
   .content
-    %h2.title= "Cookbook: #{h @cookbook["name"]}"
+    %h2
+      .title
+        = "Cookbook: #{h @cookbook.manifest["name"]}"
+        - unless @other_versions.nil? || @other_versions.empty?    
+          %select{:name => "choice", :onchange => "jump(this)", :size => "1"}
+            %option{:value => ""} Other Versions
+            %option{:value => ""} --------------
+            - @other_versions.each do |v|
+              %option{:value => url(:show_specific_version_cookbook, :cookbook_id => @cookbook_id, :cb_version => v)} "#{v}"
     .inner
       .accordion
-        - unless @cookbook["libraries"].empty?
+        - unless @cookbook.manifest["libraries"].empty?
           %h2.head= link_to "Library Files", "JavaScript:void(0);"
           .files
-            - @cookbook["libraries"].each do |f|
+            - @cookbook.manifest["libraries"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["uri"])
-        - unless @cookbook["attributes"].empty?
+                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+        - unless @cookbook.manifest["attributes"].empty?
           %h2.head= link_to "Attribute Files", "JavaScript:void(0);"
           .files
-            - @cookbook["attributes"].each do |f|
+            - @cookbook.manifest["attributes"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["uri"])
-        - unless @cookbook["definitions"].empty?
+                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+        - unless @cookbook.manifest["definitions"].empty?
           %h2.head= link_to "Definition Files", "JavaScript:void(0);"
           .files
-            - @cookbook["definitions"].each do |f|
+            - @cookbook.manifest["definitions"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["uri"])
-        - unless @cookbook["recipes"].empty?
+                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+        - unless @cookbook.manifest["recipes"].empty?
           %h2.head= link_to "Recipe Files", "JavaScript:void(0);"
           .files
-            - @cookbook["recipes"].each do |f|
+            - @cookbook.manifest["recipes"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["uri"])
-        - unless @cookbook["templates"].empty?
+                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+        - unless @cookbook.manifest["templates"].empty?
           %h2.head= link_to "Template Files", "JavaScript:void(0);"
           .files
-            - @cookbook["templates"].each do |f|
+            - @cookbook.manifest["templates"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["uri"])
+                %pre.ruby= syntax_highlight(get_file(f["uri"]))   

data/app/views/databag_items/_form.html.haml

@@ -4,7 +4,7 @@
       %label.label Data
     %div.group.form{:style => "position:relative;"}
       %label.label Attributes 
-      = partial '../layout/jsonedit', :json =>@default_data.to_json
+      = partial 'layout/jsonedit', :json =>@default_data.to_json
 
 
     = form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do

data/app/views/databag_items/_navigation.html.haml

@@ -1,9 +1,9 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:databag_databag_items, :databag_id=>@databag_name))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', slice_url(:new_databag_databag_item, :databag_id => @databag_name))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:databag_databag_items, :databag_id=>@databag_name))
+    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:new_databag_databag_item, :databag_id => @databag_name))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:databag_databag_item, :id => @databag_item_name, :databag_id=>@databag_name))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', slice_url(:edit_databag_databag_item, :id => @databag_item_name, :databag_id=>@databag_name))
-      %li= link_to('Delete', slice_url(:databag_databag_item, :id => @databag_item_name, :databag_id=>@databag_name), :method => "delete", :confirm => "Really delete Databag Item #{@databag_item_name}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:databag_databag_item, :id => @databag_item_name, :databag_id=>@databag_name))
+      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:edit_databag_databag_item, :id => @databag_item_name, :databag_id=>@databag_name))
+      %li= link_to('Delete', url(:databag_databag_item, :id => @databag_item_name, :databag_id=>@databag_name), :method => "delete", :confirm => "Really delete Databag Item #{@databag_item_name}? There is no undo.")
   .clear

data/app/views/databag_items/edit.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Databag Item"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit Databag Item", :form_id => 'edit_databag_item', :submit_name => "Edit Databag Item", :submit_id => "edit_databag_item_button", :form_for => 'edit', :form_url => slice_url(:databag_databag_item, :databag_id=>params[:databag_id], :id=>params[:id]))
+  = partial('form', :header => "Edit Databag Item", :form_id => 'edit_databag_item', :submit_name => "Edit Databag Item", :submit_id => "edit_databag_item_button", :form_for => 'edit', :form_url => url(:databag_databag_item, :databag_id=>params[:databag_id], :id=>params[:id]))

data/app/views/databag_items/new.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Databag Item"
     .inner
       = partial('navigation', :active => 'create')
-  = partial('form', :header => "Create new Databag Item", :form_id => 'create_databag_item', :submit_name => "Create Databag Item", :submit_id => "create_databag_item_button", :form_for => 'create', :form_url => slice_url(:databag_databag_items))
+  = partial('form', :header => "Create new Databag Item", :form_id => 'create_databag_item', :submit_name => "Create Databag Item", :submit_id => "create_databag_item_button", :form_for => 'create', :form_url => url(:databag_databag_items))

data/app/views/databags/_item_navigation.html.haml

@@ -1,8 +1,8 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:databags))
-    %li{ :class => (active == 'create_item' ? "active" : '')}= link_to('Create Item', slice_url(:new_databag_databag_item, :databag_id => @databag_name))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:databags))
+    %li{ :class => (active == 'create_item' ? "active" : '')}= link_to('Create Item', url(:new_databag_databag_item, :databag_id => @databag_name))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:databag, :id => params[:id]))
-      %li= link_to('Delete', slice_url(:databag, :id => params[:id]), :method => "delete", :confirm => "Really delete Databag #{params[:id]}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:databag, :id => params[:id]))
+      %li= link_to('Delete', url(:databag, :id => params[:id]), :method => "delete", :confirm => "Really delete Databag #{params[:id]}? There is no undo.")
   .clear

data/app/views/databags/_navigation.html.haml

@@ -1,9 +1,9 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:databags))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', slice_url(:new_databag))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:databags))
+    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:new_databag))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:databag, @databag_name))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', slice_url(:edit_databag, @databag_name))
-      %li= link_to('Delete', slice_url(:databag, @databag_name), :method => "delete", :confirm => "Really delete Databag #{@databag_name}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:databag, @databag_name))
+      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:edit_databag, @databag_name))
+      %li= link_to('Delete', url(:databag, @databag_name), :method => "delete", :confirm => "Really delete Databag #{@databag_name}? There is no undo.")
   .clear

data/app/views/databags/edit.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Databag: #{params[:id]}"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit Databag", :form_id => 'edit_databag', :submit_name => "Edit Databag", :submit_id => "edit_databag_button", :form_for => 'edit', :form_url => slice_url(:databag, :databag_id=>params[:id]))
+  = partial('form', :header => "Edit Databag", :form_id => 'edit_databag', :submit_name => "Edit Databag", :submit_id => "edit_databag_button", :form_for => 'edit', :form_url => url(:databag, :databag_id=>params[:id]))

data/app/views/databags/index.html.haml

@@ -12,8 +12,8 @@
             %th.last  
             - @databags.sort.each_with_index do |databag, index|
               %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-                %td{:colspan => 2}= link_to databag[0], slice_url(:databag, { :id => databag[0] })
+                %td{:colspan => 2}= link_to databag[0], url(:databag, { :id => databag[0] })
                 %td
-                  = link_to('Edit', slice_url(:databag, :id => databag[0])) 
+                  = link_to('Edit', url(:databag, :id => databag[0])) 
                   |
-                  = link_to('Delete', slice_url(:databag, :id => databag[0]), :method => "delete", :confirm => "Really delete Databag #{databag[0]}?  There is no undo.")
+                  = link_to('Delete', url(:databag, :id => databag[0]), :method => "delete", :confirm => "Really delete Databag #{databag[0]}?  There is no undo.")

data/app/views/databags/new.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Databag"
     .inner
       = partial('navigation', :active => 'create')
-  = partial('form', :header => "Create new Databag", :form_id => 'create_databag', :submit_name => "Create Databag", :submit_id => "create_databag_button", :form_for => 'create', :form_url => slice_url(:databags))
+  = partial('form', :header => "Create new Databag", :form_id => 'create_databag', :submit_name => "Create Databag", :submit_id => "create_databag_button", :form_for => 'create', :form_url => url(:databags))

data/app/views/databags/show.html.haml

@@ -12,8 +12,8 @@
             %th.last  
             - @databag.sort.each_with_index do |databag_item_uri, index|
               %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-                %td{:colspan => 2}= link_to databag_item_uri[0], slice_url(:databag_databag_item, :id => databag_item_uri[0], :databag_id => @databag_name)
+                %td{:colspan => 2}= link_to databag_item_uri[0], url(:databag_databag_item, :id => databag_item_uri[0], :databag_id => @databag_name)
                 %td
-                  = link_to('Edit', slice_url(:edit_databag_databag_item, :id => databag_item_uri[0], :databag_id => @databag_name)) 
+                  = link_to('Edit', url(:edit_databag_databag_item, :id => databag_item_uri[0], :databag_id => @databag_name)) 
                   |
-                  = link_to('Delete', slice_url(:databag_databag_item, :id => databag_item_uri[0], :databag_id => @databag_name), :method => "delete", :confirm => "Really delete Databag Item #{databag_item_uri[0]}?  There is no undo.")
+                  = link_to('Delete', url(:databag_databag_item, :id => databag_item_uri[0], :databag_id => @databag_name), :method => "delete", :confirm => "Really delete Databag Item #{databag_item_uri[0]}?  There is no undo.")