machinery-tool 1.20.0 → 1.21.0

data/html/assets/show/machinery.js

@@ -7,6 +7,10 @@ $(document).ready(function () {
     $("#filter").val("").change()
   });
 
+  $(".description-filterable").searcher({
+    inputSelector: "#descriptions-filter"
+  });
+
   // Align content below floating menu
   var header_height =  $("#nav-bar").height() + 20;
   $("#content_container, #angular-content").css("margin-top", header_height);
@@ -178,3 +182,17 @@ $(document).ready(function () {
   });
   highlightCurrentScope();
 });
+
+$(document).on("click", ".open-description-selector", function () {
+  if ($(this).hasClass("show")) {
+    $(".description-selector-action").text("show its details.");
+    $("a.show-description").show();
+    $("a.compare-description").hide();
+  }else{
+    descriptionName = $(".description-name:first").val();
+    $(".description-selector-action").text("compare with description \"" + descriptionName + "\".");
+    $("a.show-description").hide();
+    $("a.compare-description").show();
+  }
+});
+

data/html/comparison.html.haml

@@ -44,37 +44,36 @@
             %button.btn.btn-primary{"type" => "button", "data-dismiss" => "modal"}
               Close
 
+    = render_partial "description_selector"
+
     .container-fluid
       #nav-bar
-        .row
-          .col-xs-1
-          .col-xs-10
-            %h1
-              Comparing '#{@description_a.name}' with '#{@description_b.name}'
-        .row
-          .col-xs-1
-            %a#expand-all{:href => "#", :style => "display: none"}
+        = render_partial "nav_bar"
+
+        .row.toolbar
+          %small.col-xs-1
+            %a#expand-all{ :href => "#", :style => "display: none" }
               Expand all
-            %a#collapse-all{:href => "#"}
+            %a#collapse-all{ :href => "#" }
               Collapse all
-        .row
-          .col-xs-1
-          .col-xs-10
-            %small.pull-right
-              created by
-              %a{:href => "http://machinery-project.org", :target => "_blank"}
-                Machinery
-              %br
-              %a{ :href => "/site/docs/", :target => "_blank" }
-                Machinery documentation
 
-            %span.scope-navigation
-              Scopes:
-              - scopes.each do |scope|
-                %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
-                  "data-toggle"=>"popover", "data-content" => scope_help(scope),
-                  :class => nav_class(scope), "ng-show" => "diff.#{scope}" }
-                  %span= scope_initials(scope)
+          .col-xs-11.nav-buttons
+            .col-xs-10
+              %span.scope-navigation
+                Scopes:
+                - scopes.each do |scope|
+                  %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
+                    "data-toggle"=>"popover", "data-content" => scope_help(scope),
+                    :class => nav_class(scope), "ng-show" => "diff.#{scope}" }
+                    %span= scope_initials(scope)
+            .col-xs-2
+              %small.pull-right
+                created by
+                %a{ :href => "http://machinery-project.org", :target => "_blank" }
+                  Machinery
+                %br
+                %a{ :href => "/site/docs/", :target => "_blank" }
+                  Machinery documentation
 
       #content_container
         %div

data/html/homepage.html.haml

@@ -0,0 +1,24 @@
+!!!
+%html
+  %head
+    %title
+      Machinery System Descriptions
+    %meta{ :charset => 'utf-8' }
+    %link{ :href => "assets/machinery-base.css", :rel => "stylesheet", :type => "text/css" }
+    %link{ :href => "assets/machinery.css", :rel => "stylesheet", :type => "text/css" }
+    %script{ :src => "assets/jquery-2.1.1.min.js" }
+    %script{ :src => "assets/jquery.searcher.min.js" }
+    %script{ :src => "assets/machinery-base.js" }
+    %script{ :src => "assets/show/machinery.js" }
+    %script{ :src => "assets/bootstrap-tooltip.js" }
+    %script{ :src => "assets/bootstrap-popover.js" }
+    %script{ :src => "assets/bootstrap-modal.js" }
+
+  %body
+    .container-fluid
+      #content_container
+        = render_partial "description_selector"
+
+    .container-fluid
+      #nav-bar
+        = render_partial "nav_bar"

data/html/index.html.haml

@@ -9,12 +9,12 @@
     %script{ :src => "assets/jquery-2.1.1.min.js" }
     %script{ :src => "assets/transition.js" }
     %script{ :src => "assets/collapse.js" }
-    %script{ :src => "assets/modal.js" }
     %script{ :src => "assets/jquery.searcher.min.js" }
     %script{ :src => "assets/machinery-base.js" }
     %script{ :src => "assets/show/machinery.js" }
     %script{ :src => "assets/bootstrap-tooltip.js" }
     %script{ :src => "assets/bootstrap-popover.js" }
+    %script{ :src => "assets/bootstrap-modal.js" }
 
   %body{ "data-description" => @description.name }
     - scopes = ["os", "packages", "patterns", "repositories", "users", "groups",
@@ -42,43 +42,48 @@
       .body
         %textarea.content
 
+    = render_partial "description_selector"
+
     .container-fluid
       #nav-bar
-        .row
-          .col-xs-1
-          .col-xs-10
-            %h1
-              System '#{@description.name}'
-
-            %a.inspection_details{ :href => "#", "data-toggle" => "popover" } (inspection details)
-        .row
-          .col-xs-1
+        = render_partial "nav_bar"
+        .row.toolbar
+          %small.col-xs-1
             %a#expand-all{ :href => "#", :style => "display: none" }
               Expand all
             %a#collapse-all{ :href => "#" }
               Collapse all
-          .col-xs-10.nav-buttons
-            %small.pull-right
-              created by
-              %a{ :href => "http://machinery-project.org", :target => "_blank" }
-                Machinery
-              %br
-              %a{ :href => "/site/docs/", :target => "_blank" }
-                Machinery documentation
-            .filter-input.col-md-4
-              %input.col-md-8#filter{ :placeholder => "Type To Filter" }
-              %a.btn.btn-default.btn-reset{ :href => "#", :title => "Reset Filter" }
-                %span Reset
 
-            %span.scope-navigation
-              %span.nav-bar-title
-                Scopes:
+          .col-xs-11.nav-buttons
+            .col-xs-3
+              .filter-input
+                .input-group
+                  %input.form-control.col-md-8#filter{ :placeholder => "Type To Filter" }
+                  .input-group-btn
+                    %a.btn.btn-default.reset-filter{ :href => "#", :title => "Reset Filter" }
+                      %span Reset
+
+            .col-xs-5
+              %span.scope-navigation
+                %span.nav-bar-title
+                  Scopes:
 
-              - scopes.each do |scope|
-                %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
-                  "data-toggle"=>"popover", "data-content" => scope_help(scope),
-                  :class => nav_class(scope) }
-                  %span= scope_initials(scope)
+                - scopes.each do |scope|
+                  %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
+                    "data-toggle"=>"popover", "data-content" => scope_help(scope),
+                    :class => nav_class(scope) }
+                    %span= scope_initials(scope)
+            .col-xs-2
+              %a.btn.btn-default.inspection_details{ :href => "#", "data-toggle" => "popover" }
+                inspection details
+            .col-xs-2
+              %small.pull-right
+                created by
+                %a{ :href => "http://machinery-project.org", :target => "_blank" }
+                  Machinery
+                %br
+                %a{ :href => "/site/docs/", :target => "_blank" }
+                  Machinery documentation
 
       #content_container
 

data/html/partials/compare/changed_config_files.html.haml

@@ -23,7 +23,7 @@
             - if @diff["changed_config_files"].only_in1
               = only_in_a
               = render_partial "compare/changed_config_files_list", list: @diff["changed_config_files"].only_in1
-          .col-xs-6.table_container
+          .col-xs-6.table_container{ class: offset_class(@diff["changed_config_files"].only_in1) }
             - if @diff["changed_config_files"].only_in2
               = only_in_b
               = render_partial "compare/changed_config_files_list", list: @diff["changed_config_files"].only_in2

data/html/partials/compare/changed_managed_files.html.haml

@@ -24,7 +24,7 @@
               = only_in_a
               = render_partial "compare/changed_managed_file_list",
                 list: @diff["changed_managed_files"].only_in1
-          .col-xs-6.table_container
+          .col-xs-6.table_container{ class: offset_class(@diff["changed_managed_files"].only_in1) }
             - if @diff["changed_managed_files"].only_in2
               = only_in_b
               = render_partial "compare/changed_managed_file_list",

data/html/partials/compare/groups.html.haml

@@ -20,7 +20,7 @@
             - if @diff["groups"].only_in1
               = only_in_a
               = render_partial "compare/group_list", list: @diff["groups"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["groups"].only_in1) }
             - if @diff["groups"].only_in2
               = only_in_b
               = render_partial "compare/group_list", list: @diff["groups"].only_in2

data/html/partials/compare/os.html.haml

@@ -19,7 +19,7 @@
               - if @diff["os"].only_in1
                 = only_in_a
                 = render_partial "compare/os_table", os: @diff["os"].only_in1
-            .col-md-6.table_container
+            .col-md-6.table_container{ class: offset_class(@diff["os"].only_in1) }
               - if @diff["os"].only_in2
                 = only_in_b
                 = render_partial "compare/os_table", os: @diff["os"].only_in2

data/html/partials/compare/packages.html.haml

@@ -40,7 +40,7 @@
             - if @diff["packages"].only_in1
               = only_in_a
               = render_partial "compare/package_list", list: @diff["packages"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["packages"].only_in1) }
             - if @diff["packages"].only_in2
               = only_in_b
               = render_partial "compare/package_list", list: @diff["packages"].only_in2

data/html/partials/compare/pattern_list.html.haml

@@ -1,3 +1,6 @@
+%p
+  %strong Pattern Manager:
+  = list.patterns_system
 %table.table.table-striped.table-hover.table-condensed
   %thead
     %tr

data/html/partials/compare/patterns.html.haml

@@ -23,7 +23,7 @@
             - if @diff["patterns"].only_in1
               = only_in_a
               = render_partial "compare/pattern_list", list: @diff["patterns"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["patterns"].only_in1) }
             - if @diff["patterns"].only_in2
               = only_in_b
               = render_partial "compare/pattern_list", list: @diff["patterns"].only_in2
@@ -48,4 +48,3 @@
             .col-md-12.table_container
               = in_both
               = render_partial "compare/pattern_list", list: @diff["patterns"].common
-

data/html/partials/compare/repositories.html.haml

@@ -25,7 +25,7 @@
               - repo_system = @diff["repositories"].only_in1.repository_system
               = render_partial "compare/repository_list_#{repo_system}",
                 list: @diff["repositories"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["repositories"].only_in1) }
             - if @diff["repositories"].only_in2
               = only_in_b
               - repo_system = @diff["repositories"].only_in2.repository_system

data/html/partials/compare/services.html.haml

@@ -40,7 +40,7 @@
             - if @diff["services"].only_in1
               = only_in_a
               = render_partial "compare/service_list", list: @diff["services"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["services"].only_in1) }
             - if @diff["services"].only_in2
               = only_in_b
               = render_partial "compare/service_list", list: @diff["services"].only_in2

data/html/partials/compare/unmanaged_file_list.html.haml

@@ -7,20 +7,28 @@
       %tr
         %th Name
         %th.small Type
-        - if list.has_metadata
+        - if list.contains_metadata?
           %th.medium Mode
           %th.medium User
           %th.medium Group
           %th.medium Size
-          %th.medium Files in dir.
+          - if list.has_subdir_counts?
+            %th.medium Subdir.
+            %th.medium Files in dir.
+          - else
+            %th.medium File Objects
     %tbody
       - list.each do |file|
         %tr
           %td= file.name
           %td= file.type
-          - if list.has_metadata
+          - if list.contains_metadata?
             %td= file.mode
             %td= file.user
             %td= file.group
             %td= number_to_human_size(file.size)
-            %td= file.files
+            - if list.has_subdir_counts?
+              %td= file.dirs
+              %td= file.files
+            - else
+              %td= file.file_objects

data/html/partials/compare/unmanaged_files.html.haml

@@ -39,7 +39,7 @@
               = only_in_a
               = render_partial "compare/unmanaged_file_list",
                 list: @diff["unmanaged_files"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["unmanaged_files"].only_in1) }
             - if @diff["unmanaged_files"].only_in2
               = only_in_b
               = render_partial "compare/unmanaged_file_list",

data/html/partials/compare/users.html.haml

@@ -23,7 +23,7 @@
             - if @diff["users"].only_in1
               = only_in_a
               = render_partial "compare/user_list", list: @diff["users"].only_in1
-          .col-md-6.table_container
+          .col-md-6.table_container{ class: offset_class(@diff["users"].only_in1) }
             - if @diff["users"].only_in2
               = only_in_b
               = render_partial "compare/user_list", list: @diff["users"].only_in2

data/html/partials/description_selector.html.haml

@@ -0,0 +1,57 @@
+.modal.fade#description-selector{ "aria-labelledby" => "description-selector-label",
+  :role => "dialog", :tabindex => "-1" }
+  .modal-dialog.large{ :role => "document" }
+    .modal-content
+      .modal-header
+        %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
+          %span{ "aria-hidden" => "true" } ×
+        %h4.modal-title#description-selector-label
+          Select a description from the list below to
+          %span.description-selector-action
+            show its details.
+      .modal-body
+        = render_partial "alert"
+        .row
+          .filter-input.col-md-3
+            .input-group
+              %input.col-md-8.form-control#descriptions-filter{ :placeholder => "Type to filter" }
+              .input-group-btn
+                %a.btn.btn-default.reset-descriptions-filter{ :href => "#",
+                  :title => "Reset Filter" }
+                  %span Reset
+
+        - if @all_descriptions.empty?
+          %p.col-md-5.col-md-offset-1
+            %strong
+              No system descriptions available on your machine.
+        - else
+          %table.table.table-striped.table-condensed.description-filterable
+            %thead
+              %tr
+                %th Name
+                %th Host
+                %th Scopes
+                %th Last update
+            %tbody
+              - @all_descriptions.each do |key, value|
+                %tr
+                  %td
+                    - case
+                    - when @description
+                      %a.show-description{ :href => "/#{key}" }
+                        #{key}
+                      %a.compare-description{ :href => "/compare/#{@description.name}/#{key}" }
+                        #{key}
+                    - when @description_a && @description_b
+                      %a.show-description{ :href => "/compare/#{key}/#{@description_b.name}" }
+                        #{key}
+                      %a.compare-description{ :href => "/compare/#{@description_a.name}/#{key}" }
+                        #{key}
+                    - else
+                      %a.show-description{ :href => "/#{key}" }
+                        #{key}
+                  %td= value["host"].join(", ")
+                  %td= value["scopes"].join(", ")
+                  %td= value["date"]
+      .modal-footer
+        %button.btn.btn-default{ "data-dismiss" => "modal", :type => "button" } Close

data/html/partials/nav_bar.html.haml

@@ -0,0 +1,34 @@
+- if @description
+  - show_description_name = @description.name
+  - compare_description_name = ""
+  - compare_description_class = "missing"
+  - close_comparison_attrs = { href: "#", disabled: "disabled" }
+- elsif @description_a && @description_b
+  - show_description_name = @description_a.name
+  - compare_description_name = @description_b.name
+  - compare_description_class = ""
+  - close_comparison_attrs = { href: "/#{@description_a.name}" }
+- else
+  - show_description_name = ""
+  - compare_description_name = ""
+  - compare_description_class = ""
+  - close_comparison_attrs = { href: "#", disabled: "disabled" }
+.row
+  .col-xs-4.col-xs-offset-1
+    .input-group.input-group-lg
+      %input.description-name{ :type => "text",
+        :placeholder => "No description selected", :value => show_description_name }
+      .input-group-btn
+        %button.btn.btn-default.open-description-selector.show{ "data-target" => "#description-selector",
+          "data-toggle" => "modal", :type => "button" }
+          %span.glyphicon.glyphicon-option-horizontal
+  .col-xs-4.col-xs-offset-1
+    .input-group.input-group-lg
+      %input.description-name{ :type => "text",
+        :placeholder => "No description selected for comparison", :class => compare_description_class, :value => compare_description_name }
+      .input-group-btn
+        %button.btn.btn-default.open-description-selector.compare{ "data-target" => "#description-selector",
+          "data-toggle" => "modal", :type => "button" }
+          %span.glyphicon.glyphicon-option-horizontal
+        %a.btn.btn-default.close-comparison{ close_comparison_attrs }
+          %span.glyphicon.glyphicon-remove