chef-server-webui 0.9.18 → 0.10.0.beta.0

data/app/views/environments/_form.html.erb

@@ -0,0 +1,91 @@
+<div class="content environmentFormContainer">
+  <%= form(:action => form_url, :method => (method || :post), :id => form_id, :class => 'form') do -%>
+    <% unless form_for == 'edit' %>
+      <div class="group form">
+        <label class="label" for="environment_name">Name</label>
+        <% if !@environment.invalid_fields[:name].nil? && @environment.invalid_fields[:name].size != 0 %>
+          <span class="inline_error_message">The environment name contains illegal characters. The following characters are allowed: a-z, A-Z, 0-9, _, and -.</span>
+        <% end %>
+
+        <%= text_field :id => "environment_name", :name => "name", :class => "text_field", :value => params.has_key?(:name) ? h(params[:name]) : @environment.name %>
+        <span class="description">The name of the Environment</span>
+      </div>
+    <% end %>
+
+    <div class="group form">
+      <label class="label" for="environment_description">Description</label>
+      <%= text_area(params.has_key?(:description) ? h(params[:description]) : @environment.description, :name => "description", :class => "text_area", :id => "environment_description") %>
+      <span class="description">A description of this Environment</span>
+    </div>
+
+    <div class="group form cbVerPicker" id=<%=form_for%>>
+      <label class="label" for="cookbook_version_constraints">Cookbook Version Constraints</label>
+      <% if !@environment.invalid_fields[:cookbook_version].nil? && !@environment.invalid_fields[:cookbook_version].empty? %>
+        <span class="inline_error_message" id='error'>There was a problem in one of your constraints. Please enter version constraints in acceptable formats (e.g. 0.0.0). </span>
+      <% end %>
+      <table class="table" id="cbVerPickerTable">
+        <tbody>
+          <tr>
+            <th class = "first" id="CookbookVersionConstraints">Name</th>
+            <th class="operator" id="CookbookVersionConstraints">Operator</th>
+            <th class="version" id="CookbookVersionConstraints">Version</th>
+            <th class="last" id="CookbookVersionConstraints">&nbsp;</th>
+          </tr>
+          <tr id="cbVerAddRow">
+              <td>
+                <select size="1" name="cookbook_selector"
+                        id="cookbook_name_0000"
+                        onchange="jQuerySuggest('0000')"
+                        onfocus="clearCookbookError()">
+                  <option value=""></option>
+                  <% @cookbooks.each do |book| %>
+                  <option value="<%= book %>"><%= book %></option>
+                  <% end %>
+                </select>
+              </td>
+              <td>
+                <select size="1" name="cookbook_operator_selector"
+                        id="cookbook_operator_selector">
+                  <% constraint_operators.each do |op| %>
+                  <option value="<%= op %>"><%= op %></option>
+                  <% end %>
+                </select>
+              </td>
+              <td>
+                <input id="cookbook_version_0000"
+                       class="text" name="cookbook_version_selector" 
+                       onfocus="clearVersionBox(this, '0000')"
+                       onblur="validateVersionBoxValue(this, '0000')"
+                       value="0.0.0">
+              </td>
+              <td>
+                <a href="javascript:void(0)"
+                   onclick="addTableRow0000()">Add</a>
+              </td>
+            </tr>
+        </tbody>
+      </table>
+    </div>
+
+    <div class="group form attrEditor">
+      <label class="label">Environment Attributes</label>
+      <%= partial 'layout/jsonedit', :json =>  @environment.attributes.to_json%>
+      <span class="description">
+        A JSON hash for attributes of this environment. These attributes will be applied according to the attribute precedence rules.
+      </span>
+    </div>
+
+    <div class="group">
+      <div class="actions-bar">
+        <%= submit(submit_name, :id => submit_id, :class => 'button') -%>
+      </div>
+    </div>
+  <% end =%>
+</div>
+
+<script type='text/javascript'>
+  function cookbook_versions() {
+    return <%= cookbook_version_constraints.to_json %>;
+  }
+</script>
+<script type='text/javascript' charset="utf-8" src="/javascripts/cookbook_constraint_ctrl.js"></script>

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

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

data/app/views/environments/_version_selector.html.erb

@@ -0,0 +1,8 @@
+<div class="cookbook_version_constraint_control_container">
+  <span class="label">
+    <label for="cookbook_version[<%= cookbook_version_index -%>]">cookbook version constraint:</label>
+  </span>
+  <span>
+    <%= text_field(:name => "cookbook_version[#{cookbook_version_index}]", :value => "#{cookbook_name} #{constraint}")%>
+  </span>
+</div>

data/app/views/environments/edit.html.erb

@@ -0,0 +1,17 @@
+<div id="block-tables" class="block">
+  <div class="content">
+    <h2 class="title">Environment <%= params[:id] %></h2>
+    <div class="inner">
+      <%= partial "environments/navigation", :environment => @environment, :active => 'edit'%>
+    </div>
+    <%= partial 'environments/form',  :environment => @environment,
+                                      :route => :environments,
+                                      :method => :put,
+                                      :form_url => url(:environment, @environment.name),
+                                      :form_id => 'edit_environment',
+                                      :form_for => 'edit',
+                                      :submit_name => "Update Environment",
+                                      :submit_id => "edit_environment_button",
+                                      :new_object => true %>
+  </div>
+</div>

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

@@ -0,0 +1,26 @@
+.block#block-tables
+  .content
+    %h2.title Environments 
+    .inner
+      = partial('navigation', :active => 'index')
+    .content
+      .inner
+        %table.table
+          %tr
+            %th.first{:colspan => 2} Name
+            %th  
+            %th.last  
+          - even = false;
+          - @environment_list.each do |env|
+            %tr{ :class => even ? "even" : "odd" }
+              %td{:colspan => 2}= link_to(env[0], url(:environment, env[0]))
+              %td
+                - if session[:environment] != env[0]
+                  = link_to('Select', url(:environment_select, env[0]))
+                - else
+                  Select
+                |
+                = link_to('Edit', url(:edit_environment, env[0])) 
+                |
+                = link_to('Delete', url(:environment, env[0]), :method => "delete", :confirm => "Really delete Environment #{env[0]}?  there is no undo.")
+              - even = (not even)

data/app/views/environments/new.html.erb

@@ -0,0 +1,17 @@
+<div id="block-tables" class="block">
+  <div class="content">
+    <h2 class="title">Environment <%= params[:id] %></h2>
+    <div class="inner">
+      <%= partial "environments/navigation", :environment => @environment, :active => 'create'%>
+    </div>
+    <%= partial 'environments/form',  :environment => @environment,
+                                      :route => :environments,
+                                      :method => :post,
+                                      :form_url => url(:environments),
+                                      :form_id => 'create_environment',
+                                      :form_for => 'create',
+                                      :submit_name => "Create Environment",
+                                      :submit_id => "create_environment_button",
+                                      :new_object => true %>
+  </div>
+</div>

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

@@ -0,0 +1,31 @@
+.block#block-tables
+  .content
+    %h2.title= "Environment #{h @environment.name}"
+    .inner
+      = partial("navigation", :active => "show")
+      .content
+        .inner
+          .left
+            %h3 Name
+            = @environment.name
+          .left
+            %h3 Description
+            = @environment.description
+          .left
+            %h3 Cookbook Version Constraints
+            %table.table
+              %tr
+                %th.first Name
+                %th.last Version Constraints
+              - if @environment.cookbook_versions.empty?
+                %tr
+                  %td{:colspan => 2} This environment does not include any cookbook version constraints.
+              - else
+                - @environment.cookbook_versions.keys.sort.each do |name|
+                  - versions = @environment.cookbook_versions[name]
+                  %tr
+                    %td= name
+                    %td= versions
+          .left
+            %h3 Attributes
+            = build_tree('attrs', @environment.attributes)

data/app/views/layout/application.html.haml

@@ -1,22 +1,30 @@
-!!! XML
-!!!
+!!! 5
 %html
   %head
     %meta{ "http-equiv" => "content-type", :content => "text/html; charset=utf-8" }
     %title Chef Server
-    = css_include_tag "base", "themes/djime-cerulean/style", "chef", "/facebox/facebox.css", "jquery-ui-1.7.1.custom", "jquery.treeTable", "jsonedit_main.css"
-    = js_include_tag "jquery-1.3.2.min", "jquery.jeditable.mini", "jquery.livequery", "jquery.localscroll", "jquery.scrollTo", "jquery.tools.min"
+    = css_include_tag "base", "themes/djime-cerulean/style", "chef", "/facebox/facebox.css", "jquery-ui-1.7.1.custom", "jquery.treeTable", "jsonedit_main.css", "jquery.suggest.css"
+    = js_include_tag "jquery-1.4.4.min", "jquery.jeditable.mini", "jquery.livequery", "jquery.localscroll", "jquery.scrollTo", "jquery.tools.min"
     = js_include_tag "/facebox/facebox.js"
     = js_include_tag "jquery-ui-1.7.1.custom.min"
     = js_include_tag "jquery.treeTable.min"
     = js_include_tag "chef"
+    = js_include_tag "drop_down_menu"
+    = js_include_tag "jquery.suggest"
 
     = catch_content :header_content
         
   %body
     #container
       #header
-        %h1= link_to "Chef Server", url(:top)
+        %h1
+          = link_to "Chef Server", url(:top)
+          %label{:for => 'environment-select'} Environment:
+          %select{:name => 'environment-select', :onchange => 'jump(this)', :size => 1, :class => 'title-select'}
+            - current_env = session[:environment]
+            %option{:value => url(:environment_select, :environment_id => '_none'), :selected => current_env == nil} None
+            - @environments.each do |env|
+              %option{:value => url(:environment_select, :environment_id => env), :selected => current_env == env}= env
         #user-navigation
           %ul
             - if session[:user]
@@ -27,14 +35,15 @@
           .clear
         #main-navigation
           %ul
-            %li= link_to "Search", url(:searches)
-            %li= link_to "Status", url(:status)
-            %li= link_to "Roles", url(:roles)
-            %li= link_to "Nodes", url(:nodes)
-            %li= link_to "Cookbooks", url(:cookbooks)
-            %li= link_to "Databags", url(:databags)
-            %li= link_to "Clients", url(:clients)
-            %li= link_to "Users", url(:users)
+            = nav_link_item("Environments", :environments)
+            = nav_link_item("Search", :searches)
+            = nav_link_item("Status", :status)
+            = nav_link_item("Roles", :roles)
+            = nav_link_item("Nodes", :nodes)
+            = nav_link_item("Cookbooks", :cookbooks)
+            = nav_link_item("Databags", :databags)
+            = nav_link_item("Clients", :clients)
+            = nav_link_item("Users", :users)
           .clear
       #wrapper
         #main

data/app/views/layout/login.html.haml

@@ -1,5 +1,5 @@
 !!! XML
-!!!
+!!! 5
 %html
   %head
     %meta{ "http-equiv" => "content-type", :content => "text/html; charset=utf-8" }
@@ -16,7 +16,7 @@
       #header
         %h1= link_to "Chef Server", url(:top)
       #wrapper
-        #main
+        #main.loginPage
           - unless message.empty?
             .block#block-messages
               .content

data/app/views/nodes/_form.html.erb

@@ -0,0 +1,69 @@
+<div class="content nodeFormContainer">
+    <%= form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do -%>
+    <% unless form_for == 'edit' %>
+      <div class="group form">
+        <label class="label" for="node_name">Name</label>
+        <%= text_field :id => "node_name", :name => "name", :class => "text_field", :value => params.has_key?(:name) ? h(params[:name]) : @node.name %>
+        <span class="description">The name of the Node</span>
+      </div>
+    <% end %>
+
+    <div>
+      <label class="label" for="nodeEnvironment">Environment:</label>
+      <%= select :chef_environment, :collection => @environments, :id => 'nodeEnvironment', :selected => @env %>
+      <br />
+      <span class="description">The node's environment</span>
+    </div>
+
+    <div class="group form" id="run_list_editor_container">
+      <div id="availableRunListItemContainer" class="runListEditorColumn">
+        <div id="available_roles_container" class="runListItemListContainer">
+          <div class="runListEditorLabel">Available Roles</div>
+          <div class="sortable runListAvailableItemContainer">
+            <ul id="node_available_roles" class="connectedSortable runListAvailableItemList">
+              <% @available_roles.each do |role| %>
+                <li id="role[<%=h(role)  -%>]" class="ui-state-highlight runListItem"><%= h(role) -%></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+        <div id="available_recipes_container" class="runListItemListContainer">
+          <div class="runListEditorLabel">Available Recipes</div>
+          <div class="sortable runListAvailableItemContainer">
+            <ul id="node_available_recipes" class="connectedSortable runListAvailableItemList availableRecipes">
+              <% @available_recipes.each do |recipe| %>
+                <li id="recipe[<%= h(recipe) -%>]" class="ui-state-default runListItem"><%= h(recipe) -%></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div id="run_list_container" class="runListEditorColumn">
+        <div class="runListItemListContainer">
+          <div class="runListEditorLabel">Run List</div>
+          <div class="sortable runListContainer runListContainerForNode">
+            <ul class="ui-sortable connectedSortable runListItemList" id="for_node">
+              <% @run_list.each do |entry| %>
+                <li id="<%=h(entry)%>" class="<%= class_for_run_list_item(entry) -%> runListItem"><%=h(entry.name) -%></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="group form attrEditor">
+      <label class="label">Attributes</label>
+      <%= partial 'layout/jsonedit', :json => @node.normal_attrs.to_json %>
+      <span class="description">
+        A JSON hash for default attributes for nodes of this node.  These attributes will only be applied if the node does not already have a value for the attributes.
+      </span>
+    </div>
+
+    <div class="group">
+      <div class="actions-bar">
+        <%= submit(submit_name, :id => submit_id, :class => 'button') -%>
+      </div>
+    </div>
+  <% end =%>
+</div>

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

@@ -1,6 +1,7 @@
 .block#block-tables
   .content
-    %h2.title Node List
+    %h2.title
+      Node List
     .inner
       = partial('navigation', :active => 'index')
     .content
@@ -12,7 +13,10 @@
             %th.last  
           - even = false
           - if @node_list.empty?
-            %td{:colspan => 4}= "You appear to have no nodes - try connecting one, or creating or editing a #{link_to('client', url(:clients))}"
+            - if session[:environment]
+              %td{:colspan => 4}= "The environment #{session[:environment]} has no nodes"
+            - else
+              %td{:colspan => 4}= "You have no nodes - try connecting one, or creating or editing a #{link_to('node', url(:nodes))}"
           - else
             - @node_list.each do |node|
               %tr{:class => even ? "even": "odd" }

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

@@ -7,12 +7,14 @@
       .content
         .inner
           .left
+            %h3 Environment: #{@node.chef_environment}
             %h3 Run List
             %table.table
               %thead
                 %tr
                   %th.first Position
                   %th Name
+                  %th Version
                   %th.last Type
               %tbody
                 - if @node.run_list.empty?
@@ -23,10 +25,11 @@
                     %tr
                       %td.position= i
                       %td= run_list_item.name
+                      %td= run_list_item.version
                       %td= run_list_item.type
           .left.accordion
             %h3.head= link_to("Recipes", "#")
-            - recipes = @node.run_list.expand('server').recipes
+            - recipes = @node.run_list.expand(@node.chef_environment, 'server').recipes
             %div
               %span.description.form.help
                 This is the list of recipes, fully expanded, as they will be applied to the node in question.  

data/app/views/roles/_form.html.erb

@@ -0,0 +1,92 @@
+<div class="content roleFormContainer">
+  <%= form(:action => form_url, :method => method, :id => form_id, :class => 'form roleForm') do -%>
+    <% unless form_for == 'edit' %>
+      <div class="group form">
+        <label class="label" for="role_name">Name</label>
+        <%= text_field :id => "role_name", :name => "name", :class => "text_field", :value => params.has_key?(:name) ? h(params[:name]) : @role.name %>
+        <span class="description">The name of the Role</span>
+      </div>
+    <% end %>
+
+    <div class="group form">
+      <label class="label" for="role_description">Description</label>
+      <%= text_area(params.has_key?(:description) ? h(params[:description]) : @role.description, :name => "description", :class => "text_area", :id => "role_description") %>
+      <span class="description">A description of this Role</span>
+    </div>
+
+    <div class="group form" id="run_list_editor_container">
+      <div id="availableRunListItemContainer" class="runListEditorColumn">
+        <div id="available_roles_container" class="runListItemListContainer">
+          <div class="runListEditorLabel">Available Roles</div>
+          <div class="sortable runListAvailableItemContainer">
+            <ul id="availableRoles" class="connectedSortable runListAvailableItemList" data-role-list='<%= @available_roles.to_json -%>'>
+              <% @available_roles.each do |role| %>
+                <li id="role[<%=h(role)  -%>]" class="ui-state-highlight runListItem"><%= h(role) -%></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+        <div id="available_recipes_container" class="runListItemListContainer">
+          <div class="runListEditorLabel">Available Recipes</div>
+          <div class="sortable runListAvailableItemContainer">
+            <div class="spinner">
+              <%= image_tag('indicator.gif') -%>
+            </div>
+            <ul id="role" class="connectedSortable runListAvailableItemList availableRecipes">
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div id="run_list_container" class="runListEditorColumn">
+        <div class="runListItemListContainer">
+          <div id="environmentRunListSelector" data-initial-env="<%=h @current_env -%>">
+            <div class="runListEditorLabel">
+              <span id="selectedRunListEditorLabel">
+                <% if @current_env == '_default' -%>
+                  Default Run List
+                <% else -%>
+                  Run List for <%= @current_env -%>
+                <% end -%>
+              </span>
+              <span id="environment_run_list_selection_control">
+                <%= select :environment, :collection => [['noop','Other Environments']].concat(@environments.map {|e| [e,e]}), :id => 'activeEnvironment'%>
+              </span>
+            </div>
+          </div>
+          <% @run_lists.each do |environment, run_list| %>
+            <%= partial('run_lists', :environment => environment, :run_list => run_list)%>
+          <% end %>
+        </div>
+      </div>
+      <div id="current_run_list_display_container" class="runListEditorColumn">
+        <div class="runListItemListContainer">
+          <div class="runListEditorLabel activeRunListLabel">Active Run List for <%= h(@current_env) -%></div>
+          <div class="sortable activeRunListContainer">
+            <% if @current_env != "_default"  && @role.env_run_lists[@current_env].nil? %>
+              <div id="activeRunListName">using <%= @role.active_run_list_for(@current_env).gsub('_default', 'default') -%> run list</div>
+            <% end %>
+            <ul class="runListItemList" id="active_run_list">
+              <% @role.run_list_for(@current_env).each do |item| %>
+                <li class="displayRunListItem"><%= h(item) -%></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="group form attrEditor">
+      <label class="label">Default and Override Attributes</label>
+      <%= partial 'layout/jsonedit', :json => { :defaults => @role.default_attributes, :overrides => @role.override_attributes }.to_json%>
+      <span class="description">
+        A JSON hash for default attributes for nodes of this role. These attributes will be applied according to the attribute precedence rules.
+      </span>
+    </div>
+
+    <div class="group">
+      <div class="actions-bar">
+        <%= submit(submit_name, :id => submit_id, :class => 'button') -%>
+      </div>
+    </div>
+  <% end =%>
+</div>