commit 4b1d9bca4782ab12a8c5dc1daf795200465f0600

Author: Pavel Skrylev <majioa@altlinux.org>

Date:   Fri Oct 29 22:00:44 2021 +0300

    ALT patch to foreman

diff --git a/app/assets/stylesheets/fix-views.scss b/app/assets/stylesheets/fix-views.scss

new file mode 100644

index 000000000..b98dee0ff

--- /dev/null

+++ b/app/assets/stylesheets/fix-views.scss

@@ -0,0 +1,152 @@

+@font-face {

+ font-family:'fontawesome';

+ font-style:normal;

+ font-weight:normal;

+ src:font-url('fontawesome-webfont.eot') format('embedded-opentype');

+ src: local('fontawesome'), font-url('fontawesome-webfont.woff') format('woff'),

+ font-url('fontawesome-webfont.eot#iefix') format('embedded-opentype'),

+ font-url('fontawesome-webfont.woff2') format('woff2'),

+ font-url('fontawesome-webfont') format('truetype'),

+ font-url('fontawesome-webfont.svg#fontawesome') format('svg')

+}

+@font-face {

+ font-family:'FontAwesome';

+ font-style:normal;

+ font-weight:normal;

+ src:font-url('fontawesome-webfont.eot') format('embedded-opentype');

+ src: local('fontawesome'), font-url('fontawesome-webfont.woff') format('woff'),

+ font-url('fontawesome-webfont.eot#iefix') format('embedded-opentype'),

+ font-url('fontawesome-webfont.woff2') format('woff2'),

+ font-url('fontawesome-webfont') format('truetype'),

+ font-url('fontawesome-webfont.svg#fontawesome') format('svg')

+}

+.caret:before {

+ bottom:0;

+ content:"\f107";

+ left:0;

+ line-height:12px;

+ position:absolute;

+ text-align:center;

+ top:-1px;

+ right:0

+}

+.dropup .caret:before {

+ content:"\f106"

+}

+.secondary-nav-item-pf>a:after {

+ color:#72767b;

+ content:"\f105";

+ display:block;

+ font-family:"FontAwesome";

+ font-size:24px;

+ line-height:30px;

+ padding:14px 0;

+ position:absolute;

+ right:20px;

+ top:0

+}

+.nav-pf-secondary-nav .list-group-item.tertiary-nav-item-pf>a:after {

+ color:#72767b;

+ content:"\f105";

+ display:block;

+ font-family:"FontAwesome";

+ font-size:20px;

+ line-height:20px;

+ padding:0;

+ position:absolute;

+ right:20px;

+ top:4px

+}

+.breadcrumb>li+li:before {

+ color:#9c9c9c;

+ content:"\f105";

+ font-family:"FontAwesome";

+ font-size:11px;

+ padding:0 9px 0 7px

+}

+.dropdown-submenu>a:after {

+ content:"\f105";

+ font-family:"FontAwesome";

+ display:block;

+ position:absolute;

+ right:10px;

+ top:2px

+}

+.btn-group>.btn+.dropdown-toggle {

+ padding-right:1px;

+ padding-left:1px

+}

+.fa-exchange:before {

+ content:"\f362"

+}

+.fa-edit:before,

+.fa-pencil-square-o:before {

+ content:"\f044"

+}

+.fa-share-square-o:before {

+ content:"\f045"

+}

+.fa-check-square-o:before {

+ content:"\f046"

+}

+.fa-arrows:before {

+ content:"\f047"

+}

+.fa-step-backward:before {

+ content:"\f048"

+}

+.fa-angle-double-left:before {

+ font-family:'fontawesome';

+ content:"\f100"

+}

+.fa-angle-double-right:before {

+ font-family:'fontawesome';

+ content:"\f101"

+}

+.fa-angle-left:before {

+ font-family:'fontawesome';

+ content:"\f104"

+}

+.fa-angle-right:before {

+ font-family:'fontawesome';

+ content:"\f105"

+}

+.form-control {

+ display:inline-block

+}

+.form-control {

+ width:100%;

+ height:26px;

+ padding:2px 6px;

+ font-size:12px;

+ line-height:1.66666667;

+ color:#363636;

+ background-color:#fff;

+ background-image:none;

+ border:1px solid #bbb;

+ border-radius:1px;

+ -webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);

+ box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);

+ -webkit-transition:border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;

+ -o-transition:border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;

+ transition:border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s

+}

+

+table.dataTable thead .sorting_asc:after,

+table.dataTable thead .sorting_desc:after {

+ content:"\f107";

+ font-family:"FontAwesome";

+ font-size:10px;

+ font-weight:normal;

+ height:9px;

+ left:7px;

+ line-height:12px;

+ position:relative;

+ top:2px;

+ vertical-align:baseline;

+ width:12px

+}

+table.dataTable thead .sorting_asc:after {

+ content:"\f106";

+ top:-3px

+}

diff --git a/lib/tasks/alt.rake b/lib/tasks/alt.rake

new file mode 100644

index 000000000..6c7a45bff

--- /dev/null

+++ b/lib/tasks/alt.rake

@@ -0,0 +1,44 @@

+namespace :alt do

+  task :pre do

+    Dir["public/{webpack,assets}"].each do |dir|

+      FileUtils.rm_rf(dir)

+    end

+    @begun_at = Time.now

+    puts @begun_at.to_i

+  end

+

+  desc <<~EOF

+    Compile webpack and assets bundles for ALT Linux Team package

+  EOF

+  task :build, %i(path) => %i(alt:pre webpack:compile assets:precompile) do |t, args|

+    list = Dir["public/{webpack,assets}/**/*"].select do |file|

+      # maybe use ::mtime

+      File.file?(file) && File.birthtime(file) >= @begun_at

+    end

+

+    if args[:path]

+      list.each do |file|

+        dir = File.join(args[:path], File.dirname(file))

+        filebase = File.basename(file)

+        FileUtils.mkdir_p(dir)

+

+        if /^(?<name>.*)-(\w{64})\.(?<ext>.*)$/ =~ filebase

+          puts "#{file} -> #{dir}/#{filebase}"

+          FileUtils.cp(file, dir)

+          puts "#{filebase} => #{dir}/#{name}.#{ext}"

+          FileUtils.ln_s(filebase, "#{dir}/#{name}.#{ext}")

+        else

+          puts "#{file} -> #{dir}/#{filebase}"

+          FileUtils.cp(file, dir)

+        end

+      end

+

+      %w(images javascripts stylesheets).each do |folder|

+        puts "#{"assets"} => #{File.join(args[:path], "public", folder)}"

+        FileUtils.ln_s("assets", File.join(args[:path], "public", folder))

+      end

+    else

+      puts list

+    end

+  end

+end

diff --git a/webpack/assets/javascripts/react_app/routes/common/PageLayout/PageLayout.js b/webpack/assets/javascripts/react_app/routes/common/PageLayout/PageLayout.js

index ee5f4c7f8..d9ddd0244 100644

--- a/webpack/assets/javascripts/react_app/routes/common/PageLayout/PageLayout.js

+++ b/webpack/assets/javascripts/react_app/routes/common/PageLayout/PageLayout.js

@@ -22,7 +22,7 @@ const PageLayout = ({

   children,

 }) => (

   <div id="main">

-    <div id="react-content">

+    <div id="react-content" class="container-fluid container-pf-nav-pf-vertical nav-pf-persistent-secondary">

       <Head>

         <title>{header}</title>

       </Head>

--- a/app/assets/stylesheets/application.scss	2022-09-16 09:15:10.516000000 +0000

+++ b/app/assets/stylesheets/application.scss	2022-09-16 09:14:59.372000000 +0000

@@ -6,3 +6,4 @@

 @import 'colors';

 @import 'patternfly';

 @import '/*';

+@import 'fix-views';

diff --git a/db/migrate/20150525081931_remove_duplicate_tokens.rb b/db/migrate/20150525081931_remove_duplicate_tokens.rb

deleted file mode 100644

index a43edd20..00000000

--- a/db/migrate/20150525081931_remove_duplicate_tokens.rb

+++ /dev/null

@@ -1,15 +0,0 @@

-class RemoveDuplicateTokens < ActiveRecord::Migration[4.2]

-  def up

-    remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-    remove_index :tokens, :host_id if index_exists? :tokens, :host_id

-    add_index :tokens, :host_id, :unique => true

-    add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-  end

-

-  def down

-    remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-    remove_index :tokens, :host_id if index_exists? :tokens, :host_id

-    add_index :tokens, :host_id

-    add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-  end

-end

diff --git a/db/migrate/20180613100703_add_type_to_token.rb b/db/migrate/20180613100703_add_type_to_token.rb

deleted file mode 100644

index 1f1e7901..00000000

--- a/db/migrate/20180613100703_add_type_to_token.rb

+++ /dev/null

@@ -1,19 +0,0 @@

-class AddTypeToToken < ActiveRecord::Migration[5.1]

-  def up

-    remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-    remove_index :tokens, :host_id if index_exists? :tokens, :host_id # was unique

-    add_index :tokens, :host_id

-    add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-    add_column :tokens, :type, :string, default: 'Token::Build', null: false, index: true

-    change_column :tokens, :value, :text

-  end

-

-  def down

-    change_column :tokens, :value, :string, limit: 255

-    remove_column :tokens, :type

-    remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-    remove_index :tokens, :host_id if index_exists? :tokens, :host_id

-    add_index :tokens, :host_id, :unique => true

-    add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" })

-  end

-end