bastion 0.1.14 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY3Y2Y4NmY0YzMzNTM2Mzc3ZmE3Mzc3MDBmMzI1ODk2YmFhNTAyZg==
+    MDBiMDFhNTA0YTc5ODhhYTBhN2JiYTJhYjgwNTdkMzgyZDc1NmRjMA==
   data.tar.gz: !binary |-
-    M2RjYTY4YmEyOTQxNTE4OGU5YjNiZDIzZTRiYzhkMjQwZjIxNDc2Ng==
+    MTkwM2QwZmE1ZTI3ZjBmZWYxYmYzOGFmMTM0MzNmMjA1ZWQxMjhjNg==
 SHA512:
   metadata.gz: !binary |-
-    NGQ1MTFhMGRhNjRmOWZhMzlkMTY5NTNjMGM4Y2E1ODY4MGNlYjlhZGU5YmRi
-    NDg5YTljYzUyYTE2YTkzM2RkMGZlZTBkOThlOWUzNjczZmU3M2NmNjE2ZDU5
-    OTk2OWJjNjg0ZmQ5NzMyODIwZDA0ZGRlMTM3NTFkYTdkYjdmZmQ=
+    YzA1MmZhNDQ4MDhhNzhhOTk4N2NiYmU0NzA4N2E0NjNkNWEwZDY0ZmU4ZTEw
+    ODY0ZDQ1OWFiNTc3YjA5M2QzMWEwMWQxNTlmYTg5NmFkMTc1YTFhY2Y3MDBi
+    OGZiYWIzZjE4MzRkZjEyNGI5MWQxNzI5ZDExYzA4OTRhMDI5N2Y=
   data.tar.gz: !binary |-
-    YjhkNDQ5ZTE0ZjgxZTFlNzdhMDRmNjQyMTNjYWI0ZTM4OTMwZTMwYmJkYWVh
-    NjIwZWQxY2UzZjUxNWZlMGFmNDdmNDcxNmM4NGYwM2Y5YjcyYjU4NjRhMDVk
-    N2U5MDAzZTliZWZjN2NjOWU5MzU1ODE3ODJkNzVkZDdkN2EzN2E=
+    ZGE3ODMyNjNhZTVmZWYyZWU3YzNkNDRkNjlkMDYwYzQ5MWJiNTk0YTYwMzdi
+    MWQ5MjdkODQyOWY3MTEwYzcyZGJlM2EzMWExOGFjZTMzMTJlNjUxOTdjNDk3
+    NzNmMWY2Njk0M2JhZTVjZjYzNTNhMTdjMmNiYWNhMWIzYTU4Y2M=

data/app/assets/javascripts/bastion/bastion.module.js

@@ -159,17 +159,19 @@ angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextC
 
         // Set the current language
         gettextCatalog.currentLanguage = currentLocale;
-
         $rootScope.$on('$stateChangeStart',
             function () {
-            //save location.search so we can add it back after transition is done
-            this.locationSearch = $location.search();
-        });
+                //save location.search so we can add it back after transition is done
+                this.locationSearch = $location.search().search;
+            }
+        );
 
         $rootScope.$on('$stateChangeSuccess',
             function (event, toState, toParams, fromStateIn, fromParamsIn) {
                 //restore all query string parameters back to $location.search
-                $location.search(this.locationSearch);
+                if (this.locationSearch) {
+                    $location.search('search', this.locationSearch);
+                }
 
                 //Record our from state, so we can transition back there
                 if (!fromStateIn.abstract) {

data/app/assets/javascripts/bastion/components/bst-alert.directive.js

@@ -16,52 +16,23 @@
  * @name Bastion.components.directive:bstAlert
  *
  * @description
- *   Simple directive for encapsulating alert displays.
+ *   Simple directive for encapsulating an alert display.
  *
  * @example
  *   <pre>
- *     <div bst-alert
- *          successMessages="successMessages"
- *          errorMessages="errorMessages">
- *     </div>
+ *     <div bst-alert="success"></div>
+ *   </pre>
  */
 angular.module('Bastion.components').directive('bstAlert', function () {
     return {
         templateUrl: 'components/views/bst-alert.html',
+        transclude: true,
         scope: {
-            successMessages: '=',
-            infoMessages: '=',
-            warningMessages: '=',
-            errorMessages: '='
+            type: '@bstAlert',
+            close: '&'
         },
-
-        link: function (scope) {
-            scope.alerts = {};
-            scope.types = ['success', 'info', 'warning', 'danger'];
-
-            function handleMessages(type, messages) {
-                scope.alerts[type] =  messages;
-            }
-
-            scope.$watch('successMessages', function (messages) {
-                handleMessages('success', messages);
-            }, true);
-
-            scope.$watch('infoMessages', function (messages) {
-                handleMessages('info', messages);
-            }, true);
-
-            scope.$watch('warningMessages', function (messages) {
-                handleMessages('warning', messages);
-            }, true);
-
-            scope.$watch('errorMessages', function (messages) {
-                handleMessages('danger', messages);
-            }, true);
-
-            scope.closeAlert = function (type, index) {
-                scope.alerts[type].splice(index, 1);
-            };
+        controller: function ($scope, $attrs) {
+            $scope.closeable = 'close' in $attrs;
         }
     };
 });

data/app/assets/javascripts/bastion/components/bst-alerts.directive.js

@@ -0,0 +1,67 @@
+/**
+ * Copyright 2014 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public
+ * License as published by the Free Software Foundation; either version
+ * 2 of the License (GPLv2) or (at your option) any later version.
+ * There is NO WARRANTY for this software, express or implied,
+ * including the implied warranties of MERCHANTABILITY,
+ * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
+ * have received a copy of GPLv2 along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ **/
+
+/**
+ * @ngdoc directive
+ * @name Bastion.components.directive:bstAlerts
+ *
+ * @description
+ *   Simple directive for encapsulating alert displays.
+ *
+ * @example
+ *   <pre>
+ *     <div bst-alerts
+ *          successMessages="successMessages"
+ *          errorMessages="errorMessages">
+ *     </div>
+ */
+angular.module('Bastion.components').directive('bstAlerts', function () {
+    return {
+        templateUrl: 'components/views/bst-alerts.html',
+        scope: {
+            successMessages: '=',
+            infoMessages: '=',
+            warningMessages: '=',
+            errorMessages: '='
+        },
+
+        link: function (scope) {
+            scope.alerts = {};
+            scope.types = ['success', 'info', 'warning', 'danger'];
+
+            function handleMessages(type, messages) {
+                scope.alerts[type] =  messages;
+            }
+
+            scope.$watch('successMessages', function (messages) {
+                handleMessages('success', messages);
+            }, true);
+
+            scope.$watch('infoMessages', function (messages) {
+                handleMessages('info', messages);
+            }, true);
+
+            scope.$watch('warningMessages', function (messages) {
+                handleMessages('warning', messages);
+            }, true);
+
+            scope.$watch('errorMessages', function (messages) {
+                handleMessages('danger', messages);
+            }, true);
+
+            scope.closeAlert = function (type, index) {
+                scope.alerts[type].splice(index, 1);
+            };
+        }
+    };
+});

data/app/assets/javascripts/bastion/components/bst-container-scroll.directive.js

@@ -19,19 +19,14 @@ angular.module('Bastion.components').directive('bstContainerScroll', ['$window',
     return {
         restrict: 'A',
 
-        compile: function (tElement, attrs) {
+        compile: function (tElement) {
             tElement.addClass("container-scroll-wrapper");
             return function (scope, element) {
                 var windowElement = angular.element($window);
                 var addScroll = function () {
-                    var windowWidth = windowElement.width(),
-                        windowHeight = windowElement.height(),
-                        scrollWidth = element.scrollWidth || 0,
+                    var windowHeight = windowElement.height(),
                         offset = element.offset().top;
 
-                    if (attrs.controlWidth) {
-                        element.find(attrs.controlWidth).width(windowWidth - scrollWidth);
-                    }
                     element.outerHeight(windowHeight - offset);
                     element.height(windowHeight - offset);
                 };

data/app/assets/javascripts/bastion/components/bst-table.directive.js

@@ -147,7 +147,7 @@ angular.module('Bastion.components')
     }])
     .directive('bstTableColumn', ['$compile', function ($compile) {
         var sortIconTemplate = '<th ng-click="table.sortBy(column)">' +
-                                  '<i class="sort-icon" ng-show="table.resource.sort.by == column.id" ng-class="{\'icon-sort-down\': column.sortOrder == \'DESC\', \'icon-sort-up\': column.sortOrder == \'ASC\'}"></i>' +
+                                  '<i class="sort-icon" ng-show="table.resource.sort.by == column.id" ng-class="{\'fa fa-sort-down\': column.sortOrder == \'DESC\', \'fa fa-sort-up\': column.sortOrder == \'ASC\'}"></i>' +
                                '</th>';
         return {
             require: '^bstTableHead',
@@ -201,7 +201,7 @@ angular.module('Bastion.components')
         };
 
         activeRowTemplate = function (activeTest) {
-            return '<i class="icon-chevron-right selected-icon" ' +
+            return '<i class="fa fa-chevron-right selected-icon" ' +
                    'ng-show="' + activeTest  + ' "></i>';
         };
 

data/app/assets/javascripts/bastion/components/views/bst-alert.html

@@ -1,6 +1,18 @@
-<div ng-repeat="type in types">
-  <div alert ng-repeat="alert in alerts[type] track by $index" type="type" close="closeAlert(type, $index)">
-    {{ alert }}
-  </div>
-</div>
+<div class="alert" ng-class='"alert-" + (type || "warning")'>
+  <button ng-show="closeable" type="button" class="close" aria-hidden="true" ng-click="close()">
+    <span class="pficon pficon-close"></span>
+  </button>
+  <span class="pficon-layered">
+      <span ng-show="type === 'danger'" class="pficon pficon-error-octagon"></span>
+      <span ng-show="type === 'danger'" class="pficon pficon-error-exclamation"></span>
+
+      <span ng-show="type === 'warning'" class="pficon pficon-warning-triangle"></span>
+      <span ng-show="type === 'warning'" class="pficon pficon-warning-exclamation"></span>
+
+      <span ng-show="type === 'info'" class="pficon pficon-info"></span>
 
+      <span ng-show="type === 'success'" class="pficon pficon-ok"></span>
+  </span>
+
+  <div ng-transclude></div>
+</div>

data/app/assets/javascripts/bastion/components/views/bst-alerts.html

@@ -0,0 +1,6 @@
+<div ng-repeat="type in types">
+  <div bst-alert="{{type}}" ng-repeat="alert in alerts[type] track by $index" close="closeAlert(type, $index)">
+    {{ alert }}
+  </div>
+</div>
+

data/app/assets/javascripts/bastion/components/views/bst-dropdown.html

@@ -9,7 +9,7 @@
        href="{{ item.url }}"
        ng-class="{'menu-anchor' : item.type, 'dropdown-item-link-active' : item.active }">
       <span class="fl">{{ item.display }}</span>
-      <i class="icon-caret-right flyout-indicator" ng-show="item.type=='flyout'"></i> </a>
+      <i class="fa fa-caret-right flyout-indicator" ng-show="item.type=='flyout'"></i> </a>
     <ul bst-flyout="item.items"
         ng-if="item.type == 'flyout'"
         ng-show="item.active"

data/app/assets/javascripts/bastion/components/views/bst-edit-add-item.html

@@ -8,7 +8,7 @@
   </div>
 
   <span ng-show="workingMode">
-    <i class="icon-spinner inline-icon icon-spin"></i>
+    <i class="fa fa-spinner inline-icon fa-spin"></i>
     <span translate>Working</span>
   </span>
 

data/app/assets/javascripts/bastion/components/views/bst-edit-add-remove-cancel.html

@@ -1,5 +1,5 @@
 <div ng-show="workingMode">
-  <i class="icon-spinner inline-icon icon-spin"></i>
+  <i class="fa fa-spinner inline-icon fa-spin"></i>
   <span translate>Working</span>
 </div>
 

data/app/assets/javascripts/bastion/components/views/bst-edit-multiselect.html

@@ -1,5 +1,5 @@
 <div class="bst-dialog bst-multiselect" ng-class="{open: editMode, closed: !editMode}">
-  <i class="icon-remove fr" ng-click="editMode = false" ng-show="editMode"></i>
+  <i class="fa fa-remove fr" ng-click="editMode = false" ng-show="editMode"></i>
   <form ng-show="editMode" role="form">
     <h5 translate>Existing Items</h5>
     <input class="form-control"

data/app/assets/javascripts/bastion/components/views/bst-edit-save-cancel.html

@@ -1,5 +1,5 @@
 <div ng-show="workingMode">
-  <i class="icon-spinner inline-icon icon-spin"></i>
+  <i class="fa fa-spinner inline-icon fa-spin"></i>
   <span translate>Working</span>
 </div>
 

data/app/assets/javascripts/bastion/components/views/bst-edit.html

@@ -1,8 +1,8 @@
 <div class="bst-edit">
   <div class="value" ng-class="{ 'editable' : !readonly }" ng-click="edit()" ng-hide="editMode || workingMode">
     <span class="fr">
-      <i class="icon-edit inline-icon" ng-hide="editMode || readonly"></i>
-      <i class="icon-remove inline-icon" ng-click="delete($event)" ng-show="deletable && !editMode && !readonly"></i>
+      <i class="fa fa-edit inline-icon" ng-hide="editMode || readonly"></i>
+      <i class="fa fa-remove inline-icon" ng-click="delete($event)" ng-show="deletable && !editMode && !readonly"></i>
     </span>
     <span class="editable-value">{{ displayValue }}</span>
   </div>

data/app/assets/javascripts/bastion/components/views/bst-menu.html

@@ -10,7 +10,7 @@
            ng-class="{ 'active-item' : item.active, 'menu-anchor' : item.type }"
            class="menu-item-link"> 
           <span>{{ item.display }}</span>
-         <i class="icon-caret-down" ng-show="item.type == 'dropdown'"></i>
+         <i class="fa fa-caret-down" ng-show="item.type == 'dropdown'"></i>
         </a>
         <ul bst-dropdown="item.items"></ul>
     </li>

data/app/assets/javascripts/bastion/components/views/bst-modal.html

@@ -1,6 +1,6 @@
 <script type="text/ng-template">
   <div class="modal-header">
-    <i class="icon-remove close" ng-click="cancel()"></i>
+    <i class="fa fa-remove close" ng-click="cancel()"></i>
     <h3>{{ modalHeader | translate }}</h3>
   </div>
   <div class="modal-body">

data/app/assets/javascripts/bastion/components/views/bst-save-control.html

@@ -11,7 +11,7 @@
           ng-click="handleSave(); working = true"
           ng-disabled="invalid || working">
 
-    <i class="icon-spinner icon-spin" ng-show="working"></i>
+    <i class="fa fa-spinner fa-spin" ng-show="working"></i>
     <span ng-show="working" translate>Saving...</span>
     <span ng-hide="working" translate>Save</span>
   </button>

data/app/assets/javascripts/bastion/components/views/current-tasks.html

@@ -6,7 +6,7 @@
          ng-click="toggleVisibility()"
          ng-class="{'active-item': visible}">
         {{ count }}
-        <i class="icon-caret-down"></i>
+        <i class="fa fa-caret-down"></i>
       </a>
 
       <span class="dropdown current-tasks"

data/app/assets/javascripts/bastion/features/bst-feature-flag.directive.js

@@ -27,7 +27,7 @@
      *     <button class="btn btn-default"
      *             bst-feature-flag="custom_products"
      *             ui-sref="products.discovery.scan">
-     *       <i class="icon-screenshot"></i>
+     *       <i class="fa fa-screenshot"></i>
      *       {{ "Repo Discovery" | translate }}
      *     </button>
      *

data/app/assets/javascripts/bastion/layouts/details-nutupane.html

@@ -1,5 +1,5 @@
 <section>
-  <div data-block="messages" bst-alert success-messages="successMessages" error-messages="errorMessages"></div>
+  <div data-block="messages" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
   <h4>
     <span data-block="header"></span>
@@ -24,10 +24,10 @@
                  ng-trim="false"
                  typeahead="item.label for item in detailsTable.autocomplete($viewValue)"
                  typeahead-empty
-                 typeahead-template-url="widgets/views/autocomplete-scoped-search.html"/>
+                 typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
 
           <span class="input-group-btn">
-            <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="icon-search"></i></button>
+            <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
           </span>
         </div>
       </div>
@@ -51,7 +51,7 @@
   </div>
 
   <div class="working-indicator text-center" ng-show="detailsTable.working">
-    <i class="icon-spinner icon-spin"></i>
+    <i class="fa fa-spinner icon-spin"></i>
     <span translate>Working...</span>
   </div>
 

data/app/assets/javascripts/bastion/layouts/nutupane.html

@@ -1,6 +1,6 @@
 <section>
 
-  <div data-block="messages" bst-alert error-messages="errorMessages" success-messages="successMessages"></div>
+  <div data-block="messages" bst-alerts error-messages="errorMessages" success-messages="successMessages"></div>
 
   <div class="row nutupane-bar">
     <h2 class="col-sm-2">
@@ -11,11 +11,16 @@
   </div>
 
   <div class="row nutupane-bar">
-    <div class="col-sm-3">
-      <div class="input-group input-group">
 
-        <span data-block="search-filter"></span>
+    <div class="row">
+      <div class="col-sm-12">
+        <div data-block="search-filter"></div>
+      </div>
+    </div>
+
 
+    <div class="col-sm-3 nutupane-info">
+      <div class="input-group input-group">
         <input type="text"
                class="form-control"
                placeholder="{{ 'Search...' | translate }}"
@@ -26,7 +31,7 @@
                typeahead-empty
                typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
         <span class="input-group-btn">
-          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="icon-search"></i></button>
+          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
         </span>
       </div>
     </div>
@@ -44,16 +49,15 @@
         <div data-block="actions"></div>
       </div>
     </div>
-
   </div>
 
   <div class="row nutupane" bst-table="table" nutupane-table ng-class="{'table-reduced': $root.$state.current.collapsed}">
     <div class="loading-mask" ng-show="table.working" ng-class="{ 'loading-mask-collapsed': $root.$state.current.collapsed }">
-      <i class="icon-spinner icon-spin"></i>
+      <i class="fa fa-spinner fa-spin"></i>
       <span ng-hide="$root.$state.current.collapsed">{{ "Loading..." | translate }}</span>
     </div>
 
-    <div bst-container-scroll control-width="table" bst-infinite-scroll="table.nextPage()" data="table.rows">
+    <div bst-container-scroll bst-infinite-scroll="table.nextPage()" data="table.rows">
       <div ui-view="table"></div>
     </div>
   </div>

data/app/assets/stylesheets/bastion/bastion.less

@@ -2,8 +2,9 @@
 //
 // Temporary namespace to prevent Boostrap3/RCUE from
 // Colliding with Boostrap2 from Foreman core
-.rcue-styles {
-  @import "rcue/rcue";
+// TODO remove?
+.patternfly-styles {
+  @import "patternfly/patternfly";
 
   // Bastion Components
   @import "mixins";
@@ -37,7 +38,7 @@
     display: none;
   }
 
-  [class*="icon-"] {
+  [class*="fa-"] {
     &.green {
       color: #57a81c;
     }
@@ -98,14 +99,14 @@
     background: white;
     font-size: 3em;
 
-    .icon-spinner {
+    .fa-spinner {
       margin: 20% 0  0 40%;
     }
 
     &.loading-mask-panel {
       left: 20.1%;
 
-      .icon-spinner {
+      .fa-spinner {
         margin: 20% 0  0 33%;
       }
     }

data/app/assets/stylesheets/bastion/nutupane.less

@@ -1,4 +1,5 @@
 @import "variables";
+@import (reference) "patternfly/patternfly";
 
 .table {
   table-layout: fixed;
@@ -13,8 +14,8 @@
 
   th.row-select,
   td.row-select {
-    width: 25px;
-    max-width: 25px;
+    width: 30px;
+    max-width: 30px;
   }
 }
 
@@ -78,11 +79,11 @@ td.row-select {
         left: 4px;
       }
 
-      .icon-sort-down {
+      .fa-sort-down {
         bottom: 2px;
       }
 
-      .icon-sort-up {
+      .fa-sort-up {
         top: 4px;
       }
 
@@ -108,7 +109,7 @@ td.row-select {
     }
 
     .active-row {
-      .icon-active {
+      .fa-active {
         margin-top: 1px;
         font-size: 14px;
         position: absolute;
@@ -189,7 +190,7 @@ td.row-select {
 
 .filter-input {
   float: left;
-  margin-right: 10px;
+  margin: 0 0 10px;
   width: 33%;
 }
 
@@ -228,7 +229,7 @@ td.row-select {
 
   .details-header {
     min-height: 40px;
-  }
+  }                                                                                                                            y
 
   .nutupane-sub-section {
     height: 250px;
@@ -239,7 +240,7 @@ td.row-select {
     }
   }
 
-  .icon-backward {
+  .fa-backward {
     padding-right: 5px;
   }
 
@@ -289,8 +290,7 @@ td.row-select {
 }
 
 .nutupane-info {
-  padding: 7px 0 0;
-  margin-right: 10px;
+  padding: 2px 10px;
 }
 
 .detail:not(:last-child) {
@@ -397,3 +397,7 @@ div.alch-dialog.open.info-value {
 .working-indicator {
   font-size: 200%;
 }
+
+table .progress {
+  margin-bottom: 0;
+}

data/app/assets/stylesheets/bastion/overrides.less

@@ -6,8 +6,8 @@
 
 // FontAwesome overrides
 @FontAwesomePath: "../../../../bastion/font-awesome";
-@font-path: "../../bastion/rcue";
-
+@font-path: "../../bastion/patternfly";
+@fa-font-path: "/assets/bastion/font-awesome/";
 @icon-font-path: "/assets/bastion/bootstrap/";
 
 .alert {
@@ -22,6 +22,10 @@
   }
 }
 
+// Patternfly Overrides
+@table-cell-padding-top: 5px;
+@table-cell-padding-bottom: 5px;
+
 // Foreman Core Overrides
 table {
   margin-bottom: 0 !important;

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

@@ -1,3 +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,8 +8,10 @@
 <% end %>
 
 <% content_for(:content) do %>
-  <div class="article maincontent rcue-styles" data-no-turbolink="true">
-    <section class="container-fluid" ui-view></section>
+  <div class="article maincontent patternfly-styles" data-no-turbolink="true">
+    <section class="container-fluid">
+        <div class="row" ui-view></div>
+    </section>
   </div>
 <% end %>
 
@@ -19,7 +21,7 @@
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
-    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
+    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
     angular.module('Bastion').value('CurrentUser', {
       id: <%= User.current.id %>,
       admin: <%= User.current.admin %>