machinery-tool 1.14.2 → 1.15.0

data/html/partials/changed_managed_files.html.haml

@@ -15,11 +15,11 @@
               %tr
                 %th Name
                 %th Package Name
-                %th Package Version
-                %th Changes
-                %th Mode
-                %th User
-                %th Group
+                %th.medium Package Version
+                %th.medium Changes
+                %th.small Mode
+                %th.small User
+                %th.small Group
             %tbody
               - changed_managed_files.files.each do |file|
                 %tr

data/html/partials/compare/changed_managed_file_list.html.haml

@@ -6,7 +6,7 @@
       %tr
         %th Name
         %th Package Name
-        %th Package Version
+        %th.medium Package Version
         %th.small Changes
         %th.small Mode
         %th.small User

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

@@ -1,57 +1,51 @@
 - if @diff["changed_managed_files"]
-  %a.scope_anchor{ id: "changed_managed_files" }
+  - scope = "changed_managed_files"
+  %a.scope_anchor{ id: scope }
   .scope#changed_managed_files_container
     .row
       .col-xs-1
-        %a{ href: "#changed_managed_files" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-changed-managed-files.png",
-            "data-toggle" => "popover",
-            :title => "Changed Managed Files",
-            "data-content" => "#{scope_help("changed_managed_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
           Changed Managed Files
-          .scope-summary
-            - if @diff["changed_managed_files"].only_in1
-              %span.summary-part
-                #{@description_a.name}:
-                #{safe_length(@diff["changed_managed_files"].only_in1, :files)} files
-            - if @diff["changed_managed_files"].only_in2
-              %span.summary-part
-                #{@description_b.name}:
-                #{safe_length(@diff["changed_managed_files"].only_in2, :files)} files
-            - if @diff["changed_managed_files"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#changed_managed_files_both" }<
-                  both
-                = ": #{safe_length(@diff["changed_managed_files"].common, :files)} files"
+          = render_partial "compare/summary",
+            scope: "changed_managed_files",
+            singular: "file",
+            plural: "files"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["changed_managed_files"].only_in1, :files) > 0
-            = only_in_a
-            = render_partial "compare/changed_managed_file_list",
-              list: @diff["changed_managed_files"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["changed_managed_files"].only_in2, :files) > 0
-            = only_in_b
-            = render_partial "compare/changed_managed_file_list",
-              list: @diff["changed_managed_files"].only_in2
-      - if safe_length(@diff["changed_managed_files"].common, :files) > 0
-        %a.both_anchor{ id: "changed_managed_files_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-11
-            %a.show-common-elements{ href: "#changed_managed_files_both" }
-              Show common elements in changed-managed-files
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in changed-managed-files
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/changed_managed_file_list",
-              list: @diff["changed_managed_files"].common
+          .col-xs-6.table_container
+            - if safe_length(@diff["changed_managed_files"].only_in1, :files) > 0
+              = only_in_a
+              = render_partial "compare/changed_managed_file_list",
+                list: @diff["changed_managed_files"].only_in1
+          .col-xs-6.table_container
+            - if safe_length(@diff["changed_managed_files"].only_in2, :files) > 0
+              = only_in_b
+              = render_partial "compare/changed_managed_file_list",
+                list: @diff["changed_managed_files"].only_in2
+        - if @diff["changed_managed_files"].changed
+          %a.both_anchor{ id: "changed_managed_files_changed" }
+          .row
+            .col-xs-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("changed_managed_files",
+                key: "name")
+        - if safe_length(@diff["changed_managed_files"].common, :files) > 0
+          %a.both_anchor{ id: "changed_managed_files_both" }
+          .row
+            .col-xs-12
+              %a.show-common-elements{ href: "#changed_managed_files_both" }
+                Show common elements in changed-managed-files
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in changed-managed-files
+          .row.scope_common_content.collapse
+            .col-xs-12.table_container
+              = in_both
+              = render_partial "compare/changed_managed_file_list",
+                list: @diff["changed_managed_files"].common

data/html/partials/compare/changes.html.haml

@@ -0,0 +1,8 @@
+%ul.changed
+  - changes.each do |change|
+    %li
+      = change[:id] + " " + change[:change]
+      - if change[:diffable]
+        %a.diff-unmanaged-files{ "data-toggle" => "modal",
+            "data-target" => "#diff-unmanaged-files", "data-file" => change[:id] }
+          (diff)

data/html/partials/compare/config_file_list.html.haml

@@ -6,11 +6,11 @@
       %tr
         %th Name
         %th Package Name
-        %th Package Version
-        %th Changes
-        %th Mode
-        %th User
-        %th Group
+        %th.medium Package Version
+        %th.medium Changes
+        %th.small Mode
+        %th.small User
+        %th.small Group
     %tbody
       - list.files.each do |file|
         %tr

data/html/partials/compare/config_files.html.haml

@@ -1,54 +1,48 @@
 - if @diff["config_files"]
-  %a.scope_anchor{ id: "config_files" }
+  - scope = "config_files"
+  %a.scope_anchor{ id: scope }
   .scope#config_files_container
     .row
       .col-xs-1
-        %a{ href: "#groups" }
-          %img.over.scope_logo_big{ src: "/assets/logo-config-files.png",
-            "data-toggle" => "popover",
-            :title => "Config Files",
-            "data-content" => "#{scope_help("config_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
           Config Files
-          .scope-summary
-            - if @diff["config_files"].only_in1
-              %span.summary-part
-                #{@description_a.name}:
-                #{safe_length(@diff["config_files"].only_in1, :files)} files
-            - if @diff["config_files"].only_in2
-              %span.summary-part
-                #{@description_b.name}:
-                #{safe_length(@diff["config_files"].only_in2, :files)} files
-            - if @diff["config_files"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#config_files_both" }<
-                  both
-                = ": #{safe_length(@diff["config_files"].common, :files)} files"
+          = render_partial "compare/summary",
+            scope: "config_files",
+            singular: "file",
+            plural: "files"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["config_files"].only_in1, :files) > 0
-            = only_in_a
-            = render_partial "compare/config_file_list", list: @diff["config_files"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if safe_length(@diff["config_files"].only_in2, :files) > 0
-            = only_in_b
-            = render_partial "compare/config_file_list", list: @diff["config_files"].only_in2
-      - if safe_length(@diff["config_files"].common, :files) > 0
-        %a.both_anchor{ id: "config_files_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-11
-            %a.show-common-elements{ href: "#config_files_both" }
-              Show common elements in config-files
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in config-files
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/config_file_list", list: @diff["config_files"].common
+          .col-xs-6.table_container
+            - if safe_length(@diff["config_files"].only_in1, :files) > 0
+              = only_in_a
+              = render_partial "compare/config_file_list", list: @diff["config_files"].only_in1
+          .col-xs-6.table_container
+            - if safe_length(@diff["config_files"].only_in2, :files) > 0
+              = only_in_b
+              = render_partial "compare/config_file_list", list: @diff["config_files"].only_in2
+        - if @diff["config_files"].changed
+          %a.both_anchor{ id: "config_files_changed" }
+          .row
+            .col-xs-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("config_files",
+                key: "name")
+        - if safe_length(@diff["config_files"].common, :files) > 0
+          %a.both_anchor{ id: "config_files_both" }
+          .row
+            .col-xs-12
+              %a.show-common-elements{ href: "#config_files_both" }
+                Show common elements in config-files
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in config-files
+          .row.scope_common_content.collapse
+            .col-xs-12.table_container
+              = in_both
+              = render_partial "compare/config_file_list", list: @diff["config_files"].common

data/html/partials/compare/group_list.html.haml

@@ -2,9 +2,9 @@
   %thead
     %tr
       %th Name
-      %th GID
-      %th Password
-      %th Users
+      %th.small GID
+      %th.small Password
+      %th.medium Users
   %tbody
     - list.each do |group|
       %tr

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

@@ -1,52 +1,44 @@
 - if @diff["groups"]
-  %a.scope_anchor{ id: "groups" }
+  - scope = "groups"
+  %a.scope_anchor{ id: scope }
   .scope#groups_container
     .row
       .col-xs-1
-        %a{ href: "#groups" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-groups.png",
-            "data-toggle" => "popover",
-            :title => "Groups",
-            "data-content" => "#{scope_help("groups")}" }
+        %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
           Groups
-          .scope-summary
-            - if @diff["groups"].only_in1
-              %span.summary-part
-                #{@description_a.name}: #{@diff["groups"].only_in1.length} groups
-            - if @diff["groups"].only_in2
-              %span.summary-part
-                #{@description_b.name}: #{@diff["groups"].only_in2.length} groups
-            - if @diff["groups"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#groups_both" }<
-                  both
-                = ": #{@diff["groups"].common.length} groups"
+          = render_partial "compare/summary", scope: "groups", singular: "group", plural: "groups"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["groups"].only_in1
-            = only_in_a
-            = render_partial "compare/group_list", list: @diff["groups"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["groups"].only_in2
-            = only_in_b
-            = render_partial "compare/group_list", list: @diff["groups"].only_in2
-      - if @diff["groups"].common
-        %a.both_anchor{ id: "groups_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-2
-            %a.show-common-elements{ href: "#groups_both" }
-              Show common elements in groups
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in groups
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/group_list", list: @diff["groups"].common
+          .col-md-6.table_container
+            - if @diff["groups"].only_in1
+              = only_in_a
+              = render_partial "compare/group_list", list: @diff["groups"].only_in1
+          .col-md-6.table_container
+            - if @diff["groups"].only_in2
+              = only_in_b
+              = render_partial "compare/group_list", list: @diff["groups"].only_in2
+        - if @diff["groups"].changed
+          %a.both_anchor{ id: "groups_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("groups", key: "name")
+        - if @diff["groups"].common
+          %a.both_anchor{ id: "groups_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#groups_both" }
+                Show common elements in groups
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in groups
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/group_list", list: @diff["groups"].common

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

@@ -1,32 +1,30 @@
 - if @diff["os"]
-  %a.scope_anchor{ id: "os" }
+  - scope = "os"
+  %a.scope_anchor{ id: scope }
     .scope#os_container
       .row
         .col-xs-1
-          %a{ href: "#os" }
-            %img.over.scope_logo_big{ :src => "/assets/logo-os.png",
-              "data-toggle" => "popover",
-              :title => "Operating System",
-              "data-content" => "#{scope_help("os")}" }
+          %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
             Operating System
       .row.scope_content.collapse.in
-        .row
-          .col-xs-1
-          .col-xs-5.table_container
-            - if @diff["os"].only_in1
-              = only_in_a
-              = render_partial "compare/os_table", os: @diff["os"].only_in1
-          .col-xs-1
-          .col-xs-5.table_container
-            - if @diff["os"].only_in2
-              = only_in_b
-              = render_partial "compare/os_table", os: @diff["os"].only_in2
-        - if @diff["os"].common
-          .row.scope_common_content
-            .col-xs-1
-            .col-xs-11.table_container.collapse.in
-              = in_both
-              = render_partial "compare/os_table", os: @diff["os"].common
+        .col-md-12
+          .row
+            .col-md-6.table_container
+              - if @diff["os"].only_in1
+                = only_in_a
+                = render_partial "compare/os_table", os: @diff["os"].only_in1
+            .col-md-6.table_container
+              - if @diff["os"].only_in2
+                = only_in_b
+                = render_partial "compare/os_table", os: @diff["os"].only_in2
+          - if @diff["os"].common
+            .row.scope_common_content
+              .col-md-12.table_container.collapse.in
+                = in_both
+                = render_partial "compare/os_table", os: @diff["os"].common

data/html/partials/compare/package_list.html.haml

@@ -5,8 +5,8 @@
       %th.small Version
       %th.small.visible-md.visible-lg Release
       %th.small.visible-md.visible-lg Arch
-      %th.visible-lg Vendor
-      %th.visible-lg Checksum
+      %th.medium.visible-lg Vendor
+      %th.medium.visible-lg Checksum
       %th.tiny.hidden-lg
   %tbody
     - list.each do |package|

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

@@ -1,66 +1,50 @@
 - if @diff["packages"]
-  %a.scope_anchor{ id: "packages" }
+  - scope = "packages"
+  %a.scope_anchor{ id: scope }
   .scope#packages_container
     .row
       .col-xs-1
-        %a{ href: "#packages" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-packages.png",
-            "data-toggle" => "popover",
-            :title => "Packages",
-            "data-content" => "#{scope_help("packages")}" }
+        %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
           Packages
-          .scope-summary
-            - if @diff["packages"].only_in1
-              %span.summary-part
-                #{@description_a.name}: #{@diff["packages"].only_in1.length} packages
-            - if @diff["packages"].only_in2
-              %span.summary-part
-                #{@description_b.name}: #{@diff["packages"].only_in2.length} packages
-            - if @diff["packages"].changed
-              %span.summary-part
-                %a{ href: "#packages_changed" }
-                Changed
-                = ": #{@diff["packages"].changed.length} packages"
-            - if @diff["packages"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#packages_both" }<
-                  both
-                = ": #{@diff["packages"].common.length} packages"
+          = render_partial "compare/summary",
+            scope: "packages",
+            singular: "package",
+            plural: "packages"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["packages"].only_in1
-            = only_in_a
-            = render_partial "compare/package_list", list: @diff["packages"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["packages"].only_in2
-            = only_in_b
-            = render_partial "compare/package_list", list: @diff["packages"].only_in2
-      - if @diff["packages"].changed
-        %a.both_anchor{ id: "packages_changed" }
-        .row
-          .col-xs-1
-          .col-xs-11.table_container
-            = changed
-            %ul.changed
-              - changed_packages.each do |change|
-                %li= change
-      - if @diff["packages"].common
-        %a.both_anchor{ id: "packages_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-2
-            %a.show-common-elements{ href: "#packages_both" }
-              Show common elements in packages
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in packages
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/package_list", list: @diff["packages"].common
+          .col-md-6.table_container
+            - if @diff["packages"].only_in1
+              = only_in_a
+              = render_partial "compare/package_list", list: @diff["packages"].only_in1
+          .col-md-6.table_container
+            - if @diff["packages"].only_in2
+              = only_in_b
+              = render_partial "compare/package_list", list: @diff["packages"].only_in2
+        - if @diff["packages"].changed
+          %a.both_anchor{ id: "packages_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("packages",
+                key: "name",
+                attributes: ["version", "vendor", "arch"],
+                optional_attributes: ["version", "release", "checksum"])
+        - if @diff["packages"].common
+          %a.both_anchor{ id: "packages_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#packages_both" }
+                Show common elements in packages
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in packages
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/package_list", list: @diff["packages"].common