sw2at-ui 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e0a8b35a11c5588f17d1349f77c8466f67bbdd2
-  data.tar.gz: 68a958aaf317ad17653e8585576c3722151881b7
+  metadata.gz: 70519508dad88b8731b62a8b4b369fcd8a712c8a
+  data.tar.gz: b138100f5c3bdab3d07b9b84c4ac7c35f22deda0
 SHA512:
-  metadata.gz: a7b6b22de0aec8cd9500b0db6103d8883409661c74a9b53f09eb03ca25e308fef10aa33614b4bb6afaf0088fdcd75479285c0d4da7fa1d4de13a464b65a42de5
-  data.tar.gz: 8912bc850c1431d80af7accd5efb393c160de3e21c90af9b4914ae2bcbe9e39d94c793634ae5ab8e5bbfab4d41c442462f1e8fe531080c4d3cfb4c9f70820b7c
+  metadata.gz: 298136f656f4323fc40c107944b7f4eb4ceb68452f47f991912aa1e20a6b2cc5dbdc570daa838e1b197b13117eca2ebf9f91926c1ffafcfd4d1a5b935cfa74ae
+  data.tar.gz: aafd9f51075ee11e9c0417009545c1faaff7146bf86fa5453d31b69fec2bd8907c8dba4f74071307779ddccaaf08090c5ab1725add2a86ce3350cfa69ffe2496

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/app/assets/javascripts/swat/app/app.coffee

@@ -6,7 +6,7 @@
 #= require_tree ./directives
 
 window.Swat =
-  debug: true#false
+  debug: false
   log: (message)->
     return unless window.Swat.debug
     console.log(message)

data/app/assets/javascripts/swat/app/controllers/management/configuration.coffee

@@ -1,13 +1,17 @@
 angular.module("SWAT").controller "ConfigurationCtrl", ($rootScope, $scope, $state, $stateParams, $timeout
                                                         ConfigurationService) ->
   $scope.init = ->
-    $timeout($scope.reloadConfig, 1000)
     $rootScope.globalControl.setReloader($scope.reloadConfig)
+    #$timeout($rootScope.globalControl.reload, 1000)
+    $rootScope.globalControl.reload()
+
 
   $scope.reloadConfig = ->
     $scope.configPromise = ConfigurationService.get()
     $scope.configPromise.$promise.then((resp)->
       $scope.config = resp
     )
+    $scope.configPromise
+
 
   $scope.init()

data/app/assets/javascripts/swat/app/controllers/management/console.coffee

@@ -7,9 +7,8 @@ angular.module("SWAT").controller "ConsoleCtrl", ($rootScope, $scope, $state, $s
       user: { name: '' }
       period: { name: '' }
       revision: { name: '' }
-
-    $scope.loadConsoleData()
     $rootScope.globalControl.setReloader($scope.loadConsoleData)
+    $rootScope.globalControl.reload()
 
 
   $scope.loadConsoleData = ->
@@ -17,6 +16,7 @@ angular.module("SWAT").controller "ConsoleCtrl", ($rootScope, $scope, $state, $s
     $scope.consoleDataPromise.$promise.then((resp)->
       $scope.consoleData = resp
     )
+    $scope.consoleDataPromise
 
   $scope.sum = (data)->
    _.sum(_.values(data))

data/app/assets/javascripts/swat/app/controllers/revision.coffee

@@ -3,14 +3,15 @@ angular.module("SWAT").controller "RevisionCtrl", ($rootScope, $scope, $state, $
 
   $scope.init = ->
     $scope.currentState = $state.current.name
-    $scope.reloadData()
     $rootScope.globalControl.setReloader($scope.reloadData)
+    $rootScope.globalControl.reload()
 
   $scope.reloadData = ->
     return if $scope.revisionPromise && !$scope.revisionPromise.$resolved
     params = { branch: decodeURI($stateParams.branch), user: $stateParams.user, time: $stateParams.time }
     $scope.revisionPromise = RevisionService.get(params)
     $scope.revisionPromise.$promise.then($scope.initTabs)
+    $scope.revisionPromise
 
   $scope.initTabs = (revision)->
     $scope.revision = revision

data/app/assets/javascripts/swat/app/controllers/revisions.coffee

@@ -2,14 +2,15 @@ angular.module("SWAT").controller "RevisionsCtrl", ($rootScope, $scope, $state,
 
   $scope.init = ->
     window.Swat.log('Revisions Controller initalized!')
-    $scope.initRevisions()
     $rootScope.globalControl.setReloader($scope.initRevisions)
+    $rootScope.globalControl.reload()
 
   $scope.initRevisions = ->
     $scope.revisionsPromise = RevisionService.query()
     $scope.revisionsPromise.$promise.then((resp)->
       $scope.revisions = resp
     )
+    $scope.revisionsPromise
 
   $scope.testsProgress = (revision)->
 

data/app/assets/javascripts/swat/app/controllers/summary.coffee

@@ -4,14 +4,15 @@ angular.module("SWAT").controller "SummaryCtrl", ($rootScope, $scope, $state, $s
   $scope.init = ->
     $scope.currentState = $state.current.name
     $scope.summary = {}
-    $scope.reloadData()
     $rootScope.globalControl.setReloader($scope.reloadData)
+    $rootScope.globalControl.reload()
 
   $scope.reloadData = ->
-    return if $scope.revisionPromise && !$scope.revisionPromise.$resolved
+    return $scope.revisionPromise if $scope.revisionPromise && !$scope.revisionPromise.$resolved
     params = { branch: $stateParams.branch, user: $stateParams.user, time: $stateParams.time }
     $scope.revisionPromise = RevisionService.get(params)
     $scope.revisionPromise.$promise.then($scope.initInformation)
+    $scope.revisionPromise
 
   $scope.initInformation = (revision)->
     $scope.revision = revision

data/app/assets/javascripts/swat/app/factories/global_control.coffee

@@ -24,5 +24,8 @@ angular.module("SWAT").factory "GlobalControl", ($cookies)->
       @reloader = func
 
     reload: ->
-      @reloader()
+      @promise = @reloader()
+
+    isLoading: ->
+      @promise && @promise.$promise && !@promise.$resolved
 

data/app/assets/stylesheets/swat/confirmation.scss

@@ -42,6 +42,7 @@
       border-top: 1px solid rgba(190, 190, 190, 0.28);
       padding: 12px;
       background-color: rgb(236, 236, 236);
+      height: 53px;
 
       .controls {
         text-align: right;
@@ -67,6 +68,8 @@
     display: inline-block;
     float: left;
     margin-left: 16px;
+    margin-top: -10px;
+    margin-bottom: 2px;
   }
 
 }

data/app/assets/stylesheets/swat/header.scss

@@ -46,7 +46,12 @@
         margin-top: -3px;
         padding: 7px;
         line-height: 25px;
-        &:after { content: 'F5' }
+        background-image: url("/assets/swat/preloader-black-bg-static.png");
+        background-size: 39px;
+        &.loading {
+          background-image: url("/assets/swat/preloader-black-bg.gif");
+        }
+        //&:after { content: 'F5' }
       }
     }
 

data/app/assets/stylesheets/swat/vars.scss

@@ -2,7 +2,7 @@
 
 // Application Colors
 
-$greenMain: greenyellow;
+$greenMain: #ADFF2F;
 
 $blackColor: black;
 $whiteColor: white;

data/app/views/swat/pages/management/configuration.slim

@@ -1,5 +1,4 @@
 #configuration
-  span.loader ng-class="{ true: 'invisible' }[(configPromise && configPromise.$resolved)]"
   h1.title Configuration
   .configuration-info-container.info-widget-container ng-if="config"
     #configuration-info.info-widget

data/app/views/swat/pages/management/console.slim

@@ -1,5 +1,4 @@
 #console
-  span.loader ng-class="{ true: 'invisible' }[(consoleDataPromise && consoleDataPromise.$resolved)]"
   h1.title Console
   .info-widget-container
     .info-widget ng-if="(consoleDataPromise && consoleDataPromise.$resolved)"

data/app/views/swat/pages/revisions/index.slim

@@ -1,5 +1,4 @@
 #revisions-container
-  span.loader ng-class="{ true: 'invisible' }[(revisionsPromise && revisionsPromise.$resolved)]"
   h2.revisions-header Revisions
   .controls
   .list ng-if="revisions && (revisions.length > 0)"

data/app/views/swat/pages/revisions/partials/_revision_header.slim

@@ -3,7 +3,6 @@ h1.revision
 
   span.revision-status ng-class="revision.data.status.name"
     | {{  '   '+revision.data.status.label  }}
-  span.loader ng-class="{ true: 'invisible' }[(revisionPromise && revisionPromise.$resolved)]"
   .controls
     button.btn.revisions ui-sref="revisions" title="See all revisions list" ng-disabled="(currentState == 'revisions')"
       | Revisions

data/app/views/swat/shared/_header.slim

@@ -7,4 +7,9 @@
       .to
       .A
       .T
-    .control.refresh ng-click="globalControl.reload()" title="Refresh"
+    .control.refresh[
+      title="Refresh"
+      ng-click="globalControl.reload()"
+      ng-class="{'loading': globalControl.isLoading()}"
+      ng-disabled="globalControl.isLoading()"
+    ]

data/sw2at-ui.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sw2at-ui 0.0.15 ruby lib
+# stub: sw2at-ui 0.0.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sw2at-ui"
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vitaly Tarasenko"]
-  s.date = "2015-07-06"
+  s.date = "2015-07-26"
   s.description = " Control your tests, run them parallel. Check statuses of your revisions online. Share results to all team members. "
   s.email = "vetal.tarasenko@gmail.com"
   s.executables = ["rails"]
@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/images/swat/loading-green.gif",
+    "app/assets/images/swat/preloader-black-bg-static.png",
+    "app/assets/images/swat/preloader-black-bg.gif",
+    "app/assets/images/swat/preloader-trans-bg.gif",
     "app/assets/javascripts/swat/.bowerrc",
     "app/assets/javascripts/swat/app/app.coffee",
     "app/assets/javascripts/swat/app/controllers/global_nav.coffee",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sw2at-ui
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Vitaly Tarasenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,6 +237,9 @@ files:
 - Rakefile
 - VERSION
 - app/assets/images/swat/loading-green.gif
+- app/assets/images/swat/preloader-black-bg-static.png
+- app/assets/images/swat/preloader-black-bg.gif
+- app/assets/images/swat/preloader-trans-bg.gif
 - app/assets/javascripts/swat/.bowerrc
 - app/assets/javascripts/swat/app/app.coffee
 - app/assets/javascripts/swat/app/controllers/global_nav.coffee