bastion 0.2.9 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +8 -8
  2. data/app/assets/javascripts/bastion/components/nutupane.factory.js +7 -0
  3. data/app/assets/javascripts/bastion/layouts/details-nutupane.html +9 -6
  4. data/app/assets/javascripts/bastion/layouts/nutupane.html +6 -2
  5. data/app/assets/stylesheets/bastion/nutupane.less +0 -4
  6. data/lib/bastion/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YWE4MDllZDc1NzlmZTgwMDczYmIwY2UyYzYzMDlkYTE4ZWMwNWQ3Nw==
4
+ ZTc4M2VjZmVmNjhkZWMwMDEyYzM2NmIxM2M2M2VmODViMzBlNGFhMQ==
5
5
  data.tar.gz: !binary |-
6
- M2UzNjdlM2FjZmMzNWJlN2Q3MDUyYzUxMjkzMzE4MmNjMTU1MTk5OA==
6
+ N2FiZTY2MjkxMzU4NjMwNjJmZWE2YTNhYmQ0ZDA0MmJiNDI2NDMxZQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZTYyOTU1YjE5OGFmMTk4M2FmNGQ1YmE5ZjQ2MzRmN2VjNjI2ZjIyYjUxYjk3
10
- ZmQ3YjMyOGQyMDcyN2ViNTk4YThlYmI0NGYzNDQ3Njk1MWMyMTdlZDMzMzU2
11
- YWFjYjBkNzY1MjJhMTc1OGU4M2U3ODM3YzY1YWY0YjMzZmZkYmM=
9
+ YzA2ZDVkMzI1MGNiODY5ZGU5NWU1YzY4NGQ1MjcxODMwZTQ0MmM2YTIwZjkz
10
+ YjNkMDAwMjQ4NmQ3NjE0YWEzNzYxMDg3YzA2MzUwMzU4MjBkMWIxZWM5NTZm
11
+ NjY2Mzg4NWVhMTY3NWMxNDk0NWUzYzk4MmUwOWJkODhjYTFjOWQ=
12
12
  data.tar.gz: !binary |-
13
- MjljZTBkMDZkODU0ZmU5MzI3ZWNjNzIzNTE5YjA2MmU4NDgxMTMxMzY2NDQ3
14
- ZGViY2E4OGU5OTI3YjQ2NzY5YjQxYzlkZWQ0YmIxMjVkMzJjZGM5NWZlMjY2
15
- MDhjYTllYmRhNWJmZmVkODBiNmUyZDY2ZmY1OTY2OWQ0YjBjMzI=
13
+ OWIzMTY3ZDI0MjZhYWYyNjNiNmNlMzI4NmExNzFkMjZjYTk0OTQ4NzBlNjI4
14
+ ZGU1NzBjYTM0ZGNiMjMxYjIzOTU4Mjc2MmQwYjg2YWQxNDI2NmRlZTQ0MzZl
15
+ Mjc3YTMyMDlkMjBjZTNlN2Q2NDIxMDc2NGI5MzE5MzI5NzdlZDE=
data/app/assets/javascripts/bastion/components/nutupane.factory.js CHANGED
@@ -70,6 +70,11 @@ angular.module('Bastion.components').factory('Nutupane',
70
70
  replace = replace || false;
71
71
  table.working = true;
72
72
 
73
+ if (table.initialLoad) {
74
+ table.refreshing = true;
75
+ table.initialLoad = false;
76
+ }
77
+
73
78
  params.page = table.resource.page + 1;
74
79
  params.search = table.searchTerm || "";
75
80
  params.search = self.searchTransform(params.search);
@@ -183,6 +188,7 @@ angular.module('Bastion.components').factory('Nutupane',
183
188
  };
184
189
 
185
190
  self.refresh = function () {
191
+ self.table.refreshing = true;
186
192
  self.table.resource.page = 0;
187
193
  return self.load(true);
188
194
  };
@@ -256,6 +262,7 @@ angular.module('Bastion.components').factory('Nutupane',
256
262
  self.table.selectAllResults(false);
257
263
 
258
264
  if (!self.table.working) {
265
+ self.table.refreshing = true;
259
266
  self.query();
260
267
  }
261
268
  };
data/app/assets/javascripts/bastion/layouts/details-nutupane.html CHANGED
@@ -50,12 +50,11 @@
50
50
  </div>
51
51
  </div>
52
52
 
53
- <div class="working-indicator text-center" ng-show="detailsTable.working">
54
- <i class="fa fa-spinner icon-spin"></i>
55
- <span translate>Working...</span>
56
- </div>
57
-
58
53
  <div class="nutupane" bst-table="detailsTable" nutupane-table>
54
+ <div class="loading-mask loading-mask-collapsed" ng-show="detailsTable.refreshing">
55
+ <i class="fa fa-spinner fa-spin"></i>
56
+ <span ng-hide="$root.$state.current.collapsed">{{ "Loading..." | translate }}</span>
57
+ </div>
59
58
 
60
59
  <div bst-container-scroll bst-infinite-scroll="detailsTable.nextPage()"
61
60
  data="detailsTable.rows" skip-initial-load="!detailsTable.initialLoad">
@@ -70,7 +69,11 @@
70
69
  <a ng-click="detailsTable.selectAllResults(false)" translate>Deselect all</a>
71
70
  </div>
72
71
 
73
- <div data-block="table"></div>
72
+ <p bst-alert="info" ng-show="detailsTable.rows.length === 0 && !detailsTable.working">
73
+ <span data-block="no-rows-message"></span>
74
+ </p>
75
+
76
+ <div ng-show="detailsTable.rows.length > 0" data-block="table"></div>
74
77
  </div>
75
78
  </div>
76
79
 
data/app/assets/javascripts/bastion/layouts/nutupane.html CHANGED
@@ -52,12 +52,16 @@
52
52
  </div>
53
53
 
54
54
  <div class="row nutupane" bst-table="table" nutupane-table ng-class="{'table-reduced': $root.$state.current.collapsed}">
55
- <div class="loading-mask" ng-show="table.working" ng-class="{ 'loading-mask-collapsed': $root.$state.current.collapsed }">
55
+ <div class="loading-mask" ng-show="table.refreshing" ng-class="{ 'loading-mask-collapsed': $root.$state.current.collapsed }">
56
56
  <i class="fa fa-spinner fa-spin"></i>
57
57
  <span ng-hide="$root.$state.current.collapsed">{{ "Loading..." | translate }}</span>
58
58
  </div>
59
59
 
60
- <div bst-container-scroll bst-infinite-scroll="table.nextPage()" data="table.rows">
60
+ <p bst-alert="info" ng-show="table.rows.length === 0 && !table.working">
61
+ <span data-block="no-rows-message"></span>
62
+ </p>
63
+
64
+ <div ng-show="table.rows.length > 0" bst-container-scroll bst-infinite-scroll="table.nextPage()" data="table.rows">
61
65
  <div ui-view="table"></div>
62
66
  </div>
63
67
  </div>
data/app/assets/stylesheets/bastion/nutupane.less CHANGED
@@ -390,10 +390,6 @@ div.alch-dialog.open.info-value {
390
390
  padding: 0 15px;
391
391
  }
392
392
 
393
- .working-indicator {
394
- font-size: 200%;
395
- }
396
-
397
393
  table .progress {
398
394
  margin-bottom: 0;
399
395
  }
data/lib/bastion/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bastion
2
- VERSION = "0.2.9"
2
+ VERSION = "0.3.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bastion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.9
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Katello
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-03 00:00:00.000000000 Z
11
+ date: 2015-03-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: angular-rails-templates