Adding overall device stats (Experimental UI).

bower.json

@@ -34,7 +34,7 @@
     "venturocket-angular-slider": "~0.3.2",
     "font-awesome-bower": "~4.1.0",
     "bootstrap": "~3.1.1",
-    "font-lato-2-subset": "~0.3.5",
+    "font-lato-2-subset": "~0.4.0",
     "packery": "~1.2.3",
     "draggabilly": "~1.1.0",
     "angular-elastic": "~2.3.4",

gulpfile.js

@@ -110,7 +110,7 @@ gulp.task("webpack:others", function (callback) {
 
 gulp.task('translate', ['jade', 'translate:extract', 'translate:compile'])
 
-gulp.task('jade', function (callback) {
+gulp.task('jade', function () {
   return gulp.src([
     './res/**/*.jade'
     , '!./res/bower_components/**'
@@ -119,7 +119,7 @@ gulp.task('jade', function (callback) {
     .pipe(gulp.dest('./tmp/html/'))
 })
 
-gulp.task('translate:extract', function (callback) {
+gulp.task('translate:extract', function () {
   return gulp.src([
     './tmp/html/**/*.html'
     , './res/**/*.js'
@@ -129,7 +129,7 @@ gulp.task('translate:extract', function (callback) {
     .pipe(gulp.dest('./res/common/lang/po/'))
 })
 
-gulp.task('translate:compile', function (callback) {
+gulp.task('translate:compile', function () {
   return gulp.src('./res/common/lang/po/**/*.po')
     .pipe(gettext.compile({
       format: 'json'

res/app/device-list/device-list.css

@@ -153,3 +153,18 @@ ul.devices-icon-view .device-is-busy .device-photo-small img {
   margin-bottom: 0 !important;
   height: 17px !important;
 }
+
+
+.stf-stats-container .fa {
+  font-size: 0.8em;
+}
+
+.stf-stats-container.ng-enter {
+  -webkit-transition: 2000ms ease 1s;
+  transition: 2000ms ease 1s;
+  opacity: 0;
+}
+
+.stf-stats-container.ng-enter-active {
+  opacity: 1;
+}

res/app/device-list/device-list.jade

@@ -152,15 +152,25 @@ div.stf-device-list
                     td(data-title="'User'|translate", sortable='"owner.name"', filter='{"owner": "text"}')
                       a(ng-if='device.owner', ng-href='{{ device.enhancedUserContactUrl }}', role='button', target='_href') {{ device.enhancedUserName }}
                       a(ng-if='!device.owner') -
-
-
-
               //p
                 strong Sorting
                 pre {{tableParams.sorting() | json}}
                 pre {{tableParams.filter() | json}}
-
+  .row.stf-stats-container(ng-if='tracker.devices.length')
-
+    .col-md-12
-//ul
+      .widget-container.stats-container
-  li(ng-repeat='device in tracker.devices track by device.serial')
+        .col-md-4
-    pre {{device|json}}
+          .number
+            .icon.fa.fa-globe.visitors
+            span {{ tracker.devices.length }}
+          .text(translate) Total devices
+        .col-md-4
+          .number
+            .icon.fa.fa-check.visitors
+            span {{ (tracker.devices | filter:{usable:true}).length }}
+          .text(translate) Usable devices
+        .col-md-4
+          .number
+            .icon.fa.fa-users.visitors
+            span {{ (tracker.devices | filter:{state:"busy"}).length }}
+          .text(translate) Busy devices

res/common/lang/po/stf.ja.po

@@ -126,6 +126,10 @@ msgstr "ブラウザ"
 msgid "Busy"
 msgstr "貸し出し中"
 
+#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
+msgid "Busy devices"
+msgstr "貸し出し中"
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/info/info.html
 msgid "CPU"
 msgstr "CPU"
@@ -986,6 +990,10 @@ msgstr ""
 msgid "Time"
 msgstr "時刻"
 
+#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
+msgid "Total devices"
+msgstr "全機種"
+
 #: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/fatal-message/fatal-message.html
 msgid "Try to reconnect"
 msgstr "再接続する"
@@ -1042,6 +1050,10 @@ msgstr "アップロードされたファイル"
 msgid "Uploading..."
 msgstr "アップロード中..."
 
+#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
+msgid "Usable devices"
+msgstr "利用可能"
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/usb/usb.html
 msgid "Usb speed"
 msgstr "USB速度"
@@ -1200,9 +1212,6 @@ msgstr "この実機のリモート操作ができなくなりました。"
 #~ msgid "Inspect"
 #~ msgstr "要素の検証"
 
-#~ msgid "Just control device"
-#~ msgstr "端末を操作のみする"
-
 #~ msgid "Keyboard Input"
 #~ msgstr "キーボード入力"
 
@@ -1260,9 +1269,6 @@ msgstr "この実機のリモート操作ができなくなりました。"
 #~ msgid "USB Speed Benchmark"
 #~ msgstr "USBベンチマーク"
 
-#~ msgid "View device"
-#~ msgstr "デバイスを表示する"
-
 #~ msgid "{{ started ? 'Stop' : 'Start' }}"
 #~ msgstr "{{ started ? '停止' : '取得' }}"
 

res/common/lang/po/stf.pot

@@ -12,10 +12,6 @@ msgstr ""
 msgid "-"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/version-update/version-update.html
-msgid "A new version of STF is available"
-msgstr ""
-
 #: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/info/info.html
 msgid "ABI"
@@ -121,6 +117,10 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
+msgid "Busy devices"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/info/info.html
 msgid "CPU"
 msgstr ""
@@ -258,10 +258,6 @@ msgstr ""
 msgid "Device cannot get kicked from the group"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/fatal-message/fatal-message.html
-msgid "Device was disconnected"
-msgstr ""
-
 #: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
 msgid "Devices"
 msgstr ""
@@ -388,10 +384,6 @@ msgstr ""
 msgid "Go Forward"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/fatal-message/fatal-message.html
-msgid "Go to Device List"
-msgstr ""
-
 #: /Users/a12907/STF/stf/res/build/bundle.js
 #: /Users/a12907/STF/stf/res/app/components/stf/device/device-info-filter/index.js
 msgid "Good"
@@ -603,10 +595,6 @@ msgstr ""
 msgid "No devices connected"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/lightbox-image/lightbox-image.html
-msgid "No photo available"
-msgstr ""
-
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/screenshots/screenshots.html
 msgid "No screenshots taken"
 msgstr ""
@@ -794,7 +782,6 @@ msgid "Released"
 msgstr ""
 
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/dashboard/navigation/navigation.html
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/version-update/version-update.html
 msgid "Reload"
 msgstr ""
 
@@ -974,8 +961,8 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/fatal-message/fatal-message.html
+#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
-msgid "Try to reconnect"
+msgid "Total devices"
 msgstr ""
 
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/info/info.html
@@ -1030,6 +1017,10 @@ msgstr ""
 msgid "Uploading..."
 msgstr ""
 
+#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list.html
+msgid "Usable devices"
+msgstr ""
+
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/usb/usb.html
 msgid "Usb speed"
 msgstr ""
@@ -1055,10 +1046,6 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/version-update/version-update.html
-msgid "Version Update"
-msgstr ""
-
 #: /Users/a12907/STF/stf/tmp/html/app/control-panes/info/info.html
 msgid "Voltage"
 msgstr ""
@@ -1114,7 +1101,3 @@ msgstr ""
 #: /Users/a12907/STF/stf/res/app/components/stf/device/device-info-filter/index.js
 msgid "Yes"
 msgstr ""
-
-#: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/fatal-message/fatal-message.html
-msgid "You are no longer controlling the device."
-msgstr ""