machinery-tool 1.14.2 → 1.15.0

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

@@ -2,8 +2,8 @@
   %thead
     %tr
       %th Name
-      %th Version
-      %th Release
+      %th.medium Version
+      %th.medium Release
   %tbody
     - list.each do |pattern|
       %tr

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

@@ -1,53 +1,51 @@
 - if @diff["patterns"]
-  %a.scope_anchor{ id: "patterns" }
+  - scope = "patterns"
+  %a.scope_anchor{ id: scope }
   .scope#patterns_container
     .row
       .col-xs-1
-        %a{ href: "#patterns" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-patterns.png",
-            "data-toggle" => "popover",
-            :title => "Patterns",
-            "data-content" => "#{scope_help("patterns")}" }
+        %a.btn.btn-default.btn-lg.scope_logo_big{ :href => "##{scope}",
+          :title => scope_title(scope), "data-toggle"=>"popover",
+          "data-content" => scope_help(scope) }
+          %span= scope_initials(scope)
         %span.toggle{ title: "Collapse/Expand" }
       .col-xs-11
         %h2
           Patterns
-          .scope-summary
-            - if @diff["patterns"].only_in1
-              %span.summary-part
-                #{@description_a.name}: #{@diff["patterns"].only_in1.length} patterns
-            - if @diff["patterns"].only_in2
-              %span.summary-part
-                #{@description_b.name}: #{@diff["patterns"].only_in2.length} patterns
-            - if @diff["patterns"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#patterns_both" }<
-                  both
-                = ": #{@diff["patterns"].common.length} patterns"
+          = render_partial "compare/summary",
+            scope: "patterns",
+            singular: "pattern",
+            plural: "patterns"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["patterns"].only_in1
-            = only_in_a
-            = render_partial "compare/pattern_list", list: @diff["patterns"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["patterns"].only_in2
-            = only_in_b
-            = render_partial "compare/pattern_list", list: @diff["patterns"].only_in2
-      - if @diff["patterns"].common
-        %a.both_anchor{ id: "patterns_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-2
-            %a.show-common-elements{ href: "#patterns_both" }
-              Show common elements in patterns
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in patterns
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/pattern_list", list: @diff["patterns"].common
+          .col-md-6.table_container
+            - if @diff["patterns"].only_in1
+              = only_in_a
+              = render_partial "compare/pattern_list", list: @diff["patterns"].only_in1
+          .col-md-6.table_container
+            - if @diff["patterns"].only_in2
+              = only_in_b
+              = render_partial "compare/pattern_list", list: @diff["patterns"].only_in2
+        - if @diff["patterns"].changed
+          %a.both_anchor{ id: "patterns_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("patterns",
+                key: "name",
+                attributes: ["version"],
+                optional_attributes: ["version", "release"])
+        - if @diff["patterns"].common
+          %a.both_anchor{ id: "patterns_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#patterns_both" }
+                Show common elements in patterns
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in patterns
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/pattern_list", list: @diff["patterns"].common
 

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

@@ -1,51 +1,50 @@
 - if @diff["repositories"]
-  %a.scope_anchor{ id: "repositories" }
+  - scope = "repositories"
+  %a.scope_anchor{ id: scope }
   .scope#repositories_container
     .row
       .col-xs-1
-        %img.over.scope_logo_big{ :src => "/assets/logo-repositories.png",
-            "data-toggle" => "popover",
-            :title => "Repositories",
-            "data-content" => "#{scope_help("repositories")}" }
+        %a.btn.btn-default.btn-lg.scope_logo_big{ :href => "##{scope}",
+          :title => scope_title(scope), "data-toggle"=>"popover",
+          "data-content" => scope_help(scope) }
+          %span= scope_initials(scope)
         %span.toggle{ title: "Collapse/Expand" }
       .col-xs-11
         %h2
           Repositories
-          .scope-summary
-            - if @diff["repositories"].only_in1
-              %span.summary-part
-                #{@description_a.name}: #{@diff["repositories"].only_in1.length} repositories
-            - if @diff["repositories"].only_in2
-              %span.summary-part
-                #{@description_b.name}: #{@diff["repositories"].only_in2.length} repositories
-            - if @diff["repositories"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#repositories_both" }<
-                  both
-                = ": #{@diff["repositories"].common.length} repositories"
+          = render_partial "compare/summary",
+            scope: "repositories",
+            singular: "repository",
+            plural: "repositories"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["repositories"].only_in1
-            = only_in_a
-            = render_partial "compare/repository_list", list: @diff["repositories"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["repositories"].only_in2
-            = only_in_b
-            = render_partial "compare/repository_list", list: @diff["repositories"].only_in2
-      - if @diff["repositories"].common
-        %a.both_anchor{ id: "repositories_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-2
-            %a.show-common-elements{ href: "#repositories_both" }
-              Show common elements in repositories
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in repositories
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/repository_list", list: @diff["repositories"].common
+          .col-md-6.table_container
+            - if @diff["repositories"].only_in1
+              = only_in_a
+              = render_partial "compare/repository_list", list: @diff["repositories"].only_in1
+          .col-md-6.table_container
+            - if @diff["repositories"].only_in2
+              = only_in_b
+              = render_partial "compare/repository_list", list: @diff["repositories"].only_in2
+        - if @diff["repositories"].changed
+          %a.both_anchor{ id: "repositories_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("repositories",
+                attributes: ["name", "url", "type", "enabled", "autorefresh", "gpgcheck",
+                  "priority"],
+                key: "alias")
+        - if @diff["repositories"].common
+          %a.both_anchor{ id: "repositories_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#repositories_both" }
+                Show common elements in repositories
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in repositories
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/repository_list", list: @diff["repositories"].common

data/html/partials/compare/service_list.html.haml

@@ -2,7 +2,7 @@
   %thead
     %tr
       %th Name
-      %th State
+      %th.medium State
   %tbody
     - list.services.each do |service|
       %tr

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

@@ -1,56 +1,64 @@
 - if @diff["services"]
-  %a.scope_anchor{ id: "services" }
+  - scope = "services"
+  %a.scope_anchor{ id: scope }
   .scope#services_container
     .row
       .col-xs-1
-        %a{ href: "#services" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-services.png",
-            "data-toggle" => "popover",
-            :title => "Services",
-            "data-content" => "#{scope_help("services")}" }
+        %a.btn.btn-default.btn-lg.scope_logo_big{ :href => "##{scope}",
+          :title => scope_title(scope), "data-toggle"=>"popover",
+          "data-content" => scope_help(scope) }
+          %span= scope_initials(scope)
         %span.toggle{ title: "Collapse/Expand" }
       .col-xs-11
         %h2
           Services
           .scope-summary
-            - if @diff["services"].only_in1
+            - if @diff["services"].only_in1 && @diff["services"].only_in1.length > 0
               %span.summary-part
                 #{@description_a.name}:
-                #{safe_length(@diff["services"].only_in1, :services)} services
+                #{pluralize_scope(@diff["services"].only_in1, "service", "services")}
                 (#{@diff["services"].only_in1.init_system})
-            - if @diff["services"].only_in2
+            - if @diff["services"].only_in2 && @diff["services"].only_in2.length > 0
               %span.summary-part
                 #{@description_b.name}:
-                #{safe_length(@diff["services"].only_in2, :services)} services
+                #{pluralize_scope(@diff["services"].only_in2, "service", "services")}
                 (#{@diff["services"].only_in2.init_system})
-            - if @diff["services"].common
+            - if @diff["services"].changed && @diff["services"].changed.length > 0
+              %span.summary-part
+                %a{ href: "#services_changed" }
+                  changed
+                = ": #{pluralize_scope(@diff["services"].changed, "service", "services")}"
+            - if @diff["services"].common && @diff["services"].common.length > 0
               %span.summary-part
                 %a.show-common-elements{ href: "#services_both" }<
                   both
-                = ": #{safe_length(@diff["services"].common, :services)} services"
+                = ": #{pluralize_scope(@diff["services"].common, "service", "services")}"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["services"].only_in1, :services) > 0
-            = only_in_a
-            = render_partial "compare/service_list", list: @diff["services"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["services"].only_in2, :services) > 0
-            = only_in_b
-            = render_partial "compare/service_list", list: @diff["services"].only_in2
-      - if safe_length(@diff["services"].common, :services) > 0
-        %a.both_anchor{ id: "services_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-11
-            %a.show-common-elements{ href: "#services_both" }
-              Show common elements in services
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in services
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/service_list", list: @diff["services"].common
+          .col-md-6.table_container
+            - if safe_length(@diff["services"].only_in1, :services) > 0
+              = only_in_a
+              = render_partial "compare/service_list", list: @diff["services"].only_in1
+          .col-md-6.table_container
+            - if safe_length(@diff["services"].only_in2, :services) > 0
+              = only_in_b
+              = render_partial "compare/service_list", list: @diff["services"].only_in2
+        - if @diff["services"].changed
+          %a.both_anchor{ id: "services_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("services", key: "name")
+        - if safe_length(@diff["services"].common, :services) > 0
+          %a.both_anchor{ id: "services_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#services_both" }
+                Show common elements in services
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in services
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/service_list", list: @diff["services"].common

data/html/partials/compare/summary.html.haml

@@ -0,0 +1,17 @@
+.scope-summary
+  - if @diff[scope].only_in1 && @diff[scope].only_in1.length > 0
+    %span.summary-part
+      #{@description_a.name}: #{pluralize_scope(@diff[scope].only_in1, singular, plural)}
+  - if @diff[scope].only_in2 && @diff[scope].only_in2.length > 0
+    %span.summary-part
+      #{@description_b.name}: #{pluralize_scope(@diff[scope].only_in2, singular, plural)}
+  - if @diff[scope].changed && @diff[scope].changed.length > 0
+    %span.summary-part
+      %a{ href: "#" + scope + "_changed" }
+        changed
+      = ": #{pluralize_scope(@diff[scope].changed, singular, plural)}"
+  - if @diff[scope].common && @diff[scope].common.length > 0
+    %span.summary-part
+      %a.show-common-elements{ href: "#" + scope + "_both" }<
+        both
+      = ": #{pluralize_scope(@diff[scope].common, singular, plural)}"

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

@@ -1,11 +1,12 @@
-%p
-  <strong>Files extracted:</strong> #{list.extracted ? "yes" : "no"}
+- if !list.extracted.nil?
+  %p
+    <strong>Files extracted:</strong> #{list.extracted ? "yes" : "no"}
 - if list.files
   %table.table.table-striped.table-hover.table-condensed.files-table
     %thead
       %tr
         %th Name
-        %th Type
+        %th.small Type
     %tbody
       - list.files.each do |file|
         %tr

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

@@ -1,13 +1,13 @@
 - if @diff["unmanaged_files"]
-  %a.scope_anchor{ id: "unmanaged_files" }
+  - scope = "unmanaged_files"
+  %a.scope_anchor{ id: scope }
   .scope#unmanaged_files_container
     .row
       .col-xs-1
-        %a{ href: "#unmanaged_files" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-unmanaged-files.png",
-            "data-toggle" => "popover",
-            :title => "Unmanaged Files",
-            "data-content" => "#{scope_help("unmanaged_files")}" }
+        %a.btn.btn-default.btn-lg.scope_logo_big{ :href => "##{scope}",
+          :title => scope_title(scope), "data-toggle"=>"popover",
+          "data-content" => scope_help(scope) }
+          %span= scope_initials(scope)
         %span.toggle{ title: "Collapse/Expand" }
       .col-xs-11
         %h2
@@ -16,44 +16,50 @@
             - if @diff["unmanaged_files"].only_in1
               %span.summary-part
                 #{@description_a.name}:
-                #{safe_length(@diff["unmanaged_files"].only_in1, :files)} files
+                = pluralize_scope(@diff["unmanaged_files"].only_in1, "file", "files")
             - if @diff["unmanaged_files"].only_in2
               %span.summary-part
                 #{@description_b.name}:
-                #{safe_length(@diff["unmanaged_files"].only_in2, :files)} files
+                = pluralize_scope(@diff["unmanaged_files"].only_in2, "file", "files")
+            - if @diff["unmanaged_files"].changed
+              %span.summary-part
+                %a{ href: "#unmanaged_files_changed" }
+                  changed
+                = ": #{pluralize_scope(@diff["unmanaged_files"].changed, "file", "files")}"
             - if @diff["unmanaged_files"].common
               %span.summary-part
                 %a.show-common-elements{ href: "#unmanaged_files_both" }<
                   both
-                = ": #{safe_length(@diff["unmanaged_files"].common, :files)} files"
-            - if diffable_unmanaged_files.length > 0
-              %span.summary-part
-                %a#diff-unmanaged-files{ "data-toggle" => "modal",
-                    "data-target" => "#diff-unmanaged-files" }
-                  Diff files
+                = ": #{pluralize_scope(@diff["unmanaged_files"].common, "file", "files")}"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["unmanaged_files"].only_in1, :files) > 0
-            = only_in_a
-            = render_partial "compare/unmanaged_file_list", list: @diff["unmanaged_files"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["unmanaged_files"].only_in2, :files) > 0
-            = only_in_b
-            = render_partial "compare/unmanaged_file_list", list: @diff["unmanaged_files"].only_in2
-      - if safe_length(@diff["unmanaged_files"].common, :files) > 0
-        %a.both_anchor{ id: "unmanaged_files_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-11
-            %a.show-common-elements{ href: "#unmanaged_files_both" }
-              Show common elements in unmanaged-files
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in unmanaged-files
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/unmanaged_file_list", list: @diff["unmanaged_files"].common
+          .col-md-6.table_container
+            - if @diff["unmanaged_files"].only_in1
+              = only_in_a
+              = render_partial "compare/unmanaged_file_list",
+                list: @diff["unmanaged_files"].only_in1
+          .col-md-6.table_container
+            - if @diff["unmanaged_files"].only_in2
+              = only_in_b
+              = render_partial "compare/unmanaged_file_list",
+                list: @diff["unmanaged_files"].only_in2
+        - if @diff["unmanaged_files"].changed
+          %a.both_anchor{ id: "unmanaged_files_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("unmanaged_files",
+                key: "name")
+        - if safe_length(@diff["unmanaged_files"].common, :files) > 0
+          %a.both_anchor{ id: "unmanaged_files_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#unmanaged_files_both" }
+                Show common elements in unmanaged-files
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in unmanaged-files
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/unmanaged_file_list", list: @diff["unmanaged_files"].common