bastion 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5c8f13cfb5327ac09ecd123a93eafd564affa1
-  data.tar.gz: 1e385621752b7030f54cc6883237c9b891c5e1cc
+  metadata.gz: 1ea08df26ebbfde937254c13e38daa24b323872b
+  data.tar.gz: 9949ffcc14503c38fea1d94c40c8572ed42e93ec
 SHA512:
-  metadata.gz: d45c125536689e914b9669634864ecf76b610adbea30f68a93c24856dd3e179ee590fad0edd58167d786734391b64e122b9e40ba9917a715270e141326b20a4e
-  data.tar.gz: 39f6aaec0260871e53a94350f22cb0097e7fd0b6a9cbed0831283b1a4e13839985cc09cab5db0a436ff9fc8341bdf651b2d8236e35207d7ac0705cb2434bddfe
+  metadata.gz: 6d88553cd63d10ab1892fe8299787667eb12f4484ce10249b244baefd2e9539c16288301d2608e3475ec41d61fa811619c8f0e4775918b6313fe047980bbe7aa
+  data.tar.gz: b87c0950c2aa55a28542a4f9a6391344dd672592463052e87b2dd89df75d6fdc74878ff24b0635caff1550cffe8d763775bfb61370fdb4f824aaaabc663257c5

data/Rakefile

@@ -1,22 +1,8 @@
+require 'open3'
 require 'bastion/engine'
 
 namespace :bastion do
 
-  desc 'Compile assets for Bastion'
-  task 'assets:precompile' do
-    require 'uglifier'
-
-    SETTINGS = {
-      :bastion => {
-        :assets => {
-          :js_compressor => Uglifier.new(:mangle => false)
-        }
-      }
-    }
-
-    Rake::Task["plugin:assets:precompile"].invoke('bastion')
-  end
-
   desc 'Run linting and tests for the plugin'
   task 'ci' do
     success = grunt('ci')

data/app/assets/stylesheets/bastion/{bastion.less → bastion.scss}

@@ -1,16 +1,8 @@
-
 .modal-dialog {
   word-wrap: break-word;
 }
 
-// Third-party Libraries
-//
-// Temporary namespace to prevent Boostrap3/RCUE from
-// Colliding with Boostrap2 from Foreman core
-// TODO remove?
-.patternfly-styles {
-  @import "patternfly/patternfly";
-
+.bastion {
   // Bastion Components
   @import "mixins";
   @import "variables";
@@ -54,13 +46,13 @@
       color: #9e292b;
     }
     &.light-blue {
-      color: @brand-info;
+      color: $brand-info;
     }
     &.gray {
-      color: @gray-light;
+      color: $gray-light;
     }
     &.orange {
-      color: @brand-warning;
+      color: $brand-warning;
     }
   }
 
@@ -74,7 +66,7 @@
 
   //used for small panes such 'copy' actions
   .action-pane {
-    border:  1px solid @border_color;
+    border:  1px solid $border_color;
     background-color: white;
     color: black;
     padding:  10px;
@@ -144,10 +136,10 @@
   }
 
   .inline-confirmation {
-    .border-radius(5px);
-    .box-shadow(rgba(0,0,0,0.4), 2px, 2px, 2px);
+    @include border-radius(5px);
+    @include box-shadow(rgba(0,0,0,0.4), 2px, 2px, 2px);
     background-color: white;
-    border: 1px solid @border_color;
+    border: 1px solid $border_color;
     padding: 15px;
     margin: 4px auto;
     width: 85%;

data/app/assets/stylesheets/bastion/{forms.less → forms.scss}

@@ -18,7 +18,7 @@
     -moz-appearance: none;
     text-indent: 0.01px;
     text-overflow: '';
-    color: @input-color;
+    color: $input-color;
   }
 
 }

data/app/assets/stylesheets/bastion/mixins.scss

@@ -0,0 +1,15 @@
+@mixin border-radius ($radius: 0) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
+  -ms-border-radius: $radius;
+  -o-border-radius: $radius;
+  border-radius: $radius;
+}
+
+@mixin box-shadow ($color: #000, $horizontal: 0, $vertical: 0, $blur: 0, $spread: 0) {
+  -webkit-box-shadow: $horizontal $vertical $blur $spread $color;
+  -moz-box-shadow: $horizontal $vertical $blur $spread $color;
+  -ms-box-shadow: $horizontal $vertical $blur $spread $color;
+  -o-box-shadow: $horizontal $vertical $blur $spread $color;
+  box-shadow: $horizontal $vertical $blur $spread $color;
+}

data/app/assets/stylesheets/bastion/{nutupane.less → nutupane.scss}

@@ -1,5 +1,4 @@
 @import "variables";
-@import (reference) "patternfly/patternfly";
 
 .table {
   table-layout: fixed;
@@ -50,7 +49,7 @@ td.row-select {
 
     tr:hover td, tr:hover td a,
     tr.focus td, tr.focus td a {
-      background-color: @listhover_color;
+      background-color: $listhover_color;
       color: #FFF;
 
       button, select {
@@ -59,7 +58,7 @@ td.row-select {
     }
 
     tr.active, tbody tr:hover, tr.selected-row td {
-      background-color: @listhover_color;
+      background-color: $listhover_color;
       color: #FFF;
 
       a {
@@ -104,7 +103,7 @@ td.row-select {
     }
 
     td.active-row {
-      background-color: lighten(@listhover_color, 8%);
+      background-color: lighten($listhover_color, 8%);
       color: white;
 
       a {
@@ -145,18 +144,18 @@ td.row-select {
 }
 
 .nutupane-details-bar {
-  .nutupane-bar;
+  @extend .nutupane-bar;
   background: inherit;
   border: inherit;
 }
 
 .nutupane-select-all {
   text-align: center;
-  .alert-info;
+  @extend .alert-info;
 }
 .nutupane-select-all-selected {
   text-align: center;
-  .alert-success;
+  @extend .alert-success;
 }
 
 .details {
@@ -227,7 +226,7 @@ td.row-select {
   width: 80%;
   border-left: 1px solid #CCC;
   overflow-y: auto;
-  .box-shadow(0 0 5px #dddddd inset);
+  @include box-shadow(0 0 5px #dddddd inset);
 
   .details-header {
     min-height: 40px;
@@ -372,8 +371,8 @@ div.alch-dialog.open.info-value {
         color: black;
 
         &:hover {
-            color: @listhover_color;
-            border-bottom: 2px solid @listhover_color;
+            color: $listhover_color;
+            border-bottom: 2px solid $listhover_color;
         }
 
         &:first-child {
@@ -384,8 +383,8 @@ div.alch-dialog.open.info-value {
     .active {
 
       a {
-        color: @listhover_color;
-        border-bottom: 2px solid @listhover_color;
+        color: $listhover_color;
+        border-bottom: 2px solid $listhover_color;
       }
     }
 

data/app/assets/stylesheets/bastion/{overrides.less → overrides.scss}

@@ -1,15 +1,10 @@
 // Bootstrap overrides
+@import "patternfly";
 
 .filter-option label {
   font-weight: normal;
 }
 
-// FontAwesome overrides
-@FontAwesomePath: "../../../../bastion/font-awesome";
-@font-path: "../../bastion/patternfly";
-@fa-font-path: "/assets/bastion/font-awesome/";
-@icon-font-path: "/assets/bastion/bootstrap/";
-
 .alert {
   margin: 10px;
 
@@ -23,8 +18,8 @@
 }
 
 // Patternfly Overrides
-@table-cell-padding-top: 5px;
-@table-cell-padding-bottom: 5px;
+$table-cell-padding-top: 5px;
+$table-cell-padding-bottom: 5px;
 
 // Foreman Core Overrides
 table {
@@ -48,7 +43,7 @@ ul {
 }
 
 .breadcrumb > .active a {
-  color: @breadcrumb-active-color;
+  color: $breadcrumb-active-color;
 }
 
 .wizard li {

data/app/assets/stylesheets/bastion/{path-selector.less → path-selector.scss}

@@ -1,10 +1,10 @@
-@widget-border-color: #D7D7D7;
-@widget-background-color: #F9F8F8;
-@breadcrumbbg_color: #e9e9e9;
-@listhover_color: #00a8d6;
-@path-item-color: #FFF;//#e9e9e9;
-@disabled-item-color: #e9e9e9;
-@path-active-color: #005870;
+$widget-border-color: #D7D7D7;
+$widget-background-color: #F9F8F8;
+$breadcrumbbg_color: #e9e9e9;
+$listhover_color: #00a8d6;
+$path-item-color: #FFF;//#e9e9e9;
+$disabled-item-color: #e9e9e9;
+$path-active-color: #005870;
 
 .path-selector {
   margin-top: 20px;
@@ -15,7 +15,7 @@
     position: relative;
     margin-bottom: 10px;
     display: inline-block;
-    border: 1px solid @widget-border-color;
+    border: 1px solid $widget-border-color;
 
     .path-list-item {
       float: left;
@@ -33,12 +33,12 @@
 
           &:hover:not([disabled]) {
             color: white;
-            background: @listhover_color;
+            background: $listhover_color;
           }
           &:after {
             border: 0;
-            border-left: 0px solid @breadcrumbbg_color;
-            &:hover { border-left-color: @listhover_color; }
+            border-left: 0px solid $breadcrumbbg_color;
+            &:hover { border-left-color: $listhover_color; }
           }
         }
       }
@@ -52,19 +52,19 @@
         margin: 0;
         padding: 12px 10px 12px 30px;
         position: relative;
-        background: @path-item-color;
+        background: $path-item-color;
 
         &.active {
-          background: @path-active-color;
+          background: $path-active-color;
           color: white;
           text-shadow: 1px 1px #000;
-          &:after { border-left-color: @path-active-color; };
-          &:hover:after { border-left-color: @listhover_color; }
+          &:after { border-left-color: $path-active-color; };
+          &:hover:after { border-left-color: $listhover_color; }
         }
         &:hover:not([disabled])  {
-          background: @listhover_color;
+          background: $listhover_color;
           color: white;
-          &:after { border-left-color: @listhover_color; }
+          &:after { border-left-color: $listhover_color; }
         }
         &:after {
           content: " ";
@@ -73,7 +73,7 @@
           height: 0;
           border-top: 30px solid transparent;            //Go big on the size, and let overflow hide
           border-bottom: 30px solid transparent;
-          border-left: 15px solid @path-item-color;//@breadcrumbbg_color;
+          border-left: 15px solid $path-item-color;//$breadcrumbbg_color;
           position: absolute;
           top: 50%;
           margin-top: -30px;
@@ -87,7 +87,7 @@
           height: 0;
           border-top: 30px solid transparent;            //Go big on the size, and let overflow hide
           border-bottom: 30px solid transparent;
-          border-left: 15px solid @widget-border-color;
+          border-left: 15px solid $widget-border-color;
           position: absolute;
           top: 50%;
           margin-top: -30px;
@@ -107,10 +107,10 @@
       &.disabled-item {
 
         label:not(.active) {
-          background: @disabled-item-color;
+          background: $disabled-item-color;
 
           &:after {
-            border-left: 15px solid @breadcrumbbg_color;
+            border-left: 15px solid $breadcrumbbg_color;
           }
         }
 

data/app/assets/stylesheets/bastion/variables.scss

@@ -0,0 +1,4 @@
+$listhover_color: rgb(0, 153, 211);
+$label-color: #000;
+$border_color: #d7d7d7;
+$grid-gutter-width: 15px;

data/app/views/bastion/layouts/application.html.erb

@@ -8,7 +8,7 @@
 <% end %>
 
 <% content_for(:content) do %>
-  <div class="article maincontent patternfly-styles" data-no-turbolink="true">
+  <div class="article maincontent bastion" data-no-turbolink="true">
     <section class="container-fluid">
         <div class="row" ui-view></div>
     </section>

data/bower.json

@@ -18,11 +18,8 @@
     "underscore": "=1.5.2",
     "ngInfiniteScroll": "1.2.1",
     "ngUpload": "~0.5.5",
-    "bootstrap": "~3.1.1",
-    "font-awesome": "4.2.0",
     "angular-animate": "=1.2.0",
-    "angular-uuid4": "0.1.0",
-    "patternfly": "1.1.3"
+    "angular-uuid4": "0.1.0"
   },
   "devDependencies": {
     "jquery": "=1.9.1",
@@ -84,19 +81,6 @@
     },
     "ngInfiniteScroll": {
       "javascripts/bastion/ngInfiniteScroll": "build/ng-infinite-scroll.js"
-    },
-    "bootstrap": {
-      "stylesheets/bastion/bootstrap/less": "less/*.less",
-      "fonts/bastion/bootstrap": "dist/fonts/*"
-    },
-    "font-awesome": {
-      "stylesheets/bastion/font-awesome/less": "less/*.less",
-      "stylesheets/bastion/font-awesome/scss": "scss/*.scss",
-      "fonts/bastion/font-awesome/": "font/*"
-    },
-    "patternfly": {
-      "fonts/bastion/patternfly/": "dist/fonts",
-      "stylesheets/bastion/patternfly": "less/*.less"
     }
   }
 }

data/lib/bastion/engine.rb

@@ -14,15 +14,7 @@ module Bastion
       app.routes_reloader.paths.unshift("#{Bastion::Engine.root}/config/routes.rb")
     end
 
-    initializer "bastion.assets", :group => :all do |app|
-      if Rails.env.production?
-        app.config.assets.paths << "#{Bastion::Engine.root}/vendor/assets/stylesheets/bastion"
-      else
-        app.config.less.paths << "#{Bastion::Engine.root}/vendor/assets/stylesheets/bastion"
-      end
-    end
-
-    initializer "bastion.plugin", :group => :all do |app|
+    initializer "bastion.configure_assets", :group => :all do |app|
       SETTINGS[:bastion] = {:assets => {}} if SETTINGS[:bastion].nil?
 
       SETTINGS[:bastion][:assets][:precompile] = [
@@ -38,6 +30,10 @@ module Bastion
       SETTINGS[:bastion][:assets][:precompile].concat(locale_files)
     end
 
+    initializer 'bastion.assets.precompile', :after => 'bastion.configure_assets' do |app|
+      app.config.assets.precompile += SETTINGS[:bastion][:assets][:precompile]
+    end
+
     initializer "angular_templates", :group => :all do |app|
       app.config.angular_templates.ignore_prefix = %w([bastion]*\/+)
     end

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

data/lib/bastion.rb

@@ -1,7 +1,5 @@
 # to make Foreman#in_rake? helper available if Foreman's lib is available
 require 'rails'
-
-require 'less-rails' unless Rails.env.production?
 require 'angular-rails-templates'
 
 require File.expand_path('bastion/engine', File.dirname(__FILE__))