Replaced old jade with new pug.

Using temporarily npm-shrinkwrap since `template-html-loader` uses an old `consolidate.js` version which doesn't support `pug`.
Follow here: https://github.com/jtangelder/template-html-loader/issues/8

gulpfile.js

@@ -9,7 +9,7 @@ var webpack = require('webpack')
 var webpackConfig = require('./webpack.config').webpack
 var webpackStatusConfig = require('./res/common/status/webpack.config')
 var gettext = require('gulp-angular-gettext')
-var jade = require('gulp-jade')
+var pug = require('gulp-pug')
 var del = require('del')
 // var protractor = require('gulp-protractor')
 var protractor = require('./res/test/e2e/helpers/gulp-protractor-adv')
@@ -204,14 +204,14 @@ gulp.task('translate', [
 , 'translate:compile'
 ])
 
-gulp.task('jade', function() {
+gulp.task('pug', function() {
   return gulp.src([
-      './res/**/*.jade'
+    , './res/**/*.pug'
     , '!./res/bower_components/**'
     ])
-    .pipe(jade({
+    .pipe(pug({
       locals: {
-        // So res/views/docs.jade doesn't complain
+        // So res/views/docs.pug doesn't complain
         markdownFile: {
           parseContent: function() {
           }
@@ -221,7 +221,7 @@ gulp.task('jade', function() {
     .pipe(gulp.dest('./tmp/html/'))
 })
 
-gulp.task('translate:extract', ['jade'], function() {
+gulp.task('translate:extract', ['pug'], function() {
   return gulp.src([
       './tmp/html/**/*.html'
     , './res/**/*.js'

lib/units/app/index.js

@@ -31,7 +31,7 @@ module.exports = function(options) {
   , view: 'docs'
   }))
 
-  app.set('view engine', 'jade')
+  app.set('view engine', 'pug')
   app.set('views', pathutil.resource('app/views'))
   app.set('strict routing', true)
   app.set('case sensitive routing', true)

lib/units/auth/ldap.js

@@ -29,7 +29,7 @@ module.exports = function(options) {
       })
   })
 
-  app.set('view engine', 'jade')
+  app.set('view engine', 'pug')
   app.set('views', pathutil.resource('auth/ldap/views'))
   app.set('strict routing', true)
   app.set('case sensitive routing', true)

lib/units/auth/mock.js

@@ -51,7 +51,7 @@ module.exports = function(options) {
     }
   }
 
-  app.set('view engine', 'jade')
+  app.set('view engine', 'pug')
   app.set('views', pathutil.resource('auth/mock/views'))
   app.set('strict routing', true)
   app.set('case sensitive routing', true)

npm-shrinkwrap.json

@@ -0,0 +1,18 @@
+{
+  "name": "stf",
+  "version": "2.0.1",
+  "dependencies": {
+    "template-html-loader": {
+      "version": "0.0.3",
+      "from": "template-html-loader@>=0.0.3 <0.0.4",
+      "resolved": "http://registry.npmjs.org/template-html-loader/-/template-html-loader-0.0.3.tgz",
+      "dependencies": {
+        "consolidate": {
+          "version": "0.14.1",
+          "from": "consolidate@>=0.14.0 <0.14.1",
+          "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.1.tgz"
+        }
+      }
+    }
+  }
+}

package.json

@@ -33,7 +33,7 @@
     "adbkit": "^2.4.1",
     "adbkit-apkreader": "^1.0.0",
     "adbkit-monkey": "^1.0.1",
-    "aws-sdk": "^2.4.12",
+    "aws-sdk": "^2.4.13",
     "basic-auth": "^1.0.3",
     "bluebird": "^2.10.1",
     "body-parser": "^1.13.3",
@@ -45,14 +45,13 @@
     "csurf": "^1.7.0",
     "debug": "^2.2.0",
     "eventemitter3": "^1.2.0",
-    "express": "^4.13.3",
+    "express": "^4.14.0",
-    "express-validator": "^2.18.0",
+    "express-validator": "^2.20.8",
     "formidable": "^1.0.17",
-    "gm": "^1.21.1",
+    "gm": "^1.23.0",
     "hipchatter": "^0.3.1",
     "http-proxy": "^1.11.2",
     "in-publish": "^2.0.0",
-    "jade": "^1.9.2",
     "jpeg-turbo": "^0.4.0",
     "jws": "^3.1.0",
     "ldapjs": "^1.0.0",
@@ -62,12 +61,13 @@
     "minimatch": "^3.0.0",
     "my-local-ip": "^1.0.0",
     "node-uuid": "^1.4.3",
-    "passport": "^0.3.2",
     "openid": "^2.0.1",
+    "passport": "^0.3.2",
     "passport-oauth2": "^1.1.2",
     "passport-saml": "^0.15.0",
     "protobufjs": "^3.8.2",
     "proxy-addr": "^1.0.10",
+    "pug": "^2.0.0-beta4",
     "request": "^2.67.0",
     "request-progress": "^2.0.1",
     "rethinkdb": "^2.0.2",
@@ -85,9 +85,9 @@
     "swagger-express-mw": "^0.6.0",
     "temp": "^0.8.1",
     "transliteration": "^1.1.6",
+    "url-join": "1.1.0",
     "utf-8-validate": "^1.2.1",
     "ws": "^1.0.1",
-    "url-join": "1.1.0",
     "zmq": "^2.14.0"
   },
   "devDependencies": {
@@ -104,9 +104,9 @@
     "gulp": "^3.8.11",
     "gulp-angular-gettext": "^2.1.0",
     "gulp-eslint": "^3.0.1",
-    "gulp-jade": "^1.0.0",
     "gulp-jsonlint": "^1.0.2",
     "gulp-protractor": "^3.0.0",
+    "gulp-pug": "^3.0.4",
     "gulp-run": "^1.6.12",
     "gulp-util": "^3.0.7",
     "html-loader": "^0.4.0",
@@ -129,7 +129,7 @@
     "memory-fs": "^0.3.0",
     "node-libs-browser": "^1.0.0",
     "node-sass": "^3.4.2",
-    "phantomjs-prebuilt": "^2.1.3",
+    "phantomjs-prebuilt": "^2.1.10",
     "protractor": "^4.0.2",
     "protractor-html-screenshot-reporter": "0.0.21",
     "raw-loader": "^0.5.1",

res/app/components/stf/common-ui/badge-icon/badge-icon-directive.js

@@ -4,7 +4,7 @@ module.exports = function badgeIconDirective() {
     replace: true,
     scope: {
     },
-    template: require('./badge-icon.jade'),
+    template: require('./badge-icon.pug'),
     link: function() {
     }
   }

res/app/components/stf/common-ui/clear-button/clear-button-directive.js

@@ -3,6 +3,6 @@ module.exports = function clearButtonDirective() {
     restrict: 'EA',
     replace: true,
     scope: {},
-    template: require('./clear-button.jade')
+    template: require('./clear-button.pug')
   }
 }

res/app/components/stf/common-ui/error-message/error-message-directive.js

@@ -5,7 +5,7 @@ module.exports = function errorMessageDirective() {
     scope: {
       message: '@'
     },
-    template: require('./error-message.jade'),
+    template: require('./error-message.pug'),
     link: function(scope) {
       scope.closeMessage = function() {
         scope.message = ''

res/app/components/stf/common-ui/filter-button/filter-button-directive.js

@@ -4,6 +4,6 @@ module.exports = function filterButtonDirective() {
     restrict: 'EA',
     replace: true,
     scope: {},
-    template: require('./filter-button.jade')
+    template: require('./filter-button.pug')
   }
 }

res/app/components/stf/common-ui/help-icon/help-icon-directive.js

@@ -6,6 +6,6 @@ module.exports = function clearButtonDirective() {
       topic: '@',
       tooltip: '@'
     },
-    template: require('./help-icon.jade')
+    template: require('./help-icon.pug')
   }
 }

res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal-service.js

@@ -25,7 +25,7 @@ module.exports =
 
     service.open = function(data) {
       var modalInstance = $uibModal.open({
-        template: require('./add-adb-key-modal.jade'),
+        template: require('./add-adb-key-modal.pug'),
         controller: ModalInstanceCtrl,
         resolve: {
           data: function() {

res/app/components/stf/common-ui/modals/external-url-modal/external-url-modal-service.js

@@ -17,7 +17,7 @@ module.exports = function ServiceFactory($uibModal, $sce) {
 
   service.open = function(url, title, icon) {
     var modalInstance = $uibModal.open({
-      template: require('./external-url-modal.jade'),
+      template: require('./external-url-modal.pug'),
       controller: ModalInstanceCtrl,
       windowClass: 'modal-size-80p',
       resolve: {

res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js

@@ -57,7 +57,7 @@ module.exports =
 
     FatalMessageService.open = function(device, tryToReconnect) {
       var modalInstance = $uibModal.open({
-        template: require('./fatal-message.jade'),
+        template: require('./fatal-message.pug'),
         controller: ModalInstanceCtrl,
         resolve: {
           device: function() {

res/app/components/stf/common-ui/modals/lightbox-image/lightbox-image-service.js

@@ -16,7 +16,7 @@ module.exports = function ServiceFactory($uibModal) {
 
   service.open = function(title, imageUrl) {
     var modalInstance = $uibModal.open({
-      template: require('./lightbox-image.jade'),
+      template: require('./lightbox-image.pug'),
       controller: ModalInstanceCtrl,
       windowClass: 'modal-size-xl',
       resolve: {

res/app/components/stf/common-ui/modals/socket-disconnected/socket-disconnected-service.js

@@ -18,7 +18,7 @@ module.exports =
 
     service.open = function(message) {
       var modalInstance = $uibModal.open({
-        template: require('./socket-disconnected.jade'),
+        template: require('./socket-disconnected.pug'),
         controller: ModalInstanceCtrl,
         resolve: {
           message: function() {

res/app/components/stf/common-ui/modals/version-update/version-update-service.js

@@ -14,7 +14,7 @@ module.exports = function ServiceFactory($uibModal, $location) {
 
   service.open = function() {
     var modalInstance = $uibModal.open({
-      template: require('./version-update.jade'),
+      template: require('./version-update.pug'),
       controller: ModalInstanceCtrl
     })
 

res/app/components/stf/common-ui/nice-tabs/nice-tab-directive.js

@@ -5,7 +5,7 @@ module.exports = function niceTabDirective() {
     replace: true,
     scope: {
     },
-    template: require('./nice-tab.jade'),
+    template: require('./nice-tab.pug'),
     link: function() {
     }
   }

res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js

@@ -2,7 +2,7 @@ module.exports = function niceTabsDirective() {
   return {
     restrict: 'EA',
     replace: true,
-    template: require('./nice-tabs.jade'),
+    template: require('./nice-tabs.pug'),
     link: function(scope, element, attrs) {
       // TODO: add support for 'key' for saving in Settings
       // TODO: add support for 'direction=below' for below tabs

res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js

@@ -4,7 +4,7 @@ module.exports = function refreshPageDirective($window) {
     replace: true,
     scope: {
     },
-    template: require('./refresh-page.jade'),
+    template: require('./refresh-page.pug'),
     link: function(scope) {
       scope.reloadWindow = function() {
         $window.location.reload()

res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js

@@ -8,6 +8,6 @@ module.exports = function clearButtonDirective() {
       icon: '@',
       color: '@'
     },
-    template: require('./stacked-icon.jade')
+    template: require('./stacked-icon.pug')
   }
 }

res/app/components/stf/device-context-menu/device-context-menu-directive.js

@@ -7,7 +7,7 @@ module.exports = function deviceContextMenuDirective($window) {
     //  device: '&'
     //},
     transclude: true,
-    template: require('./device-context-menu.jade'),
+    template: require('./device-context-menu.pug'),
     link: function(scope) {
       //var device = scope.device()
       //var control = scope.control()

res/app/components/stf/keys/add-adb-key/add-adb-key-directive.js

@@ -6,7 +6,7 @@ module.exports = function addAdbKeyDirective(AdbKeysService) {
       showAdd: '=',
       showClipboard: '='
     },
-    template: require('./add-adb-key.jade'),
+    template: require('./add-adb-key.pug'),
     controller: function($scope, UserService) {
       $scope.addForm = {
         title: ''

res/app/components/stf/language/language-service.js

@@ -1,4 +1,5 @@
 var supportedLanguages = require('./../../../../common/lang/langs.json')
+var _ = require('lodash')
 
 module.exports =
   function LanguageServiceFactory(SettingsService, gettextCatalog) {
@@ -7,8 +8,13 @@ module.exports =
     var LanguageService = {}
 
     function detectLanguage() {
-      return (navigator.language || navigator.userLanguage || 'en-US')
+      return navigator.language || navigator.userLanguage
-        .substring(0, 2)
+    }
+
+    function browserToSupportedLang(lang) {
+      //supportedLanguages.
+
+      //return lang.replace(/([A-Za-z]{2})(-|_)?([A-Za-z]{0,4})/gm, '$1')
     }
 
     function isSupported(lang) {

res/app/components/stf/logcat-table/logcat-table-directive.js

@@ -5,7 +5,7 @@ module.exports =
     return {
       restrict: 'E',
       replace: true,
-      template: require('./logcat-table.jade'),
+      template: require('./logcat-table.pug'),
       link: function(scope, element) {
         var autoScroll = true
         var autoScrollDependingOnScrollPosition = true

res/app/components/stf/screen/screen-directive.js

@@ -12,7 +12,7 @@ module.exports = function DeviceScreenDirective(
 ) {
   return {
     restrict: 'E'
-  , template: require('./screen.jade')
+  , template: require('./screen.pug')
   , scope: {
       control: '&'
     , device: '&'

res/app/components/stf/screen/screen-keyboard/screen-keyboard-directive.js

@@ -1,7 +1,7 @@
 module.exports = function screenKeyboardDirective() {
   return {
     restrict: 'E',
-    template: require('./screen-keyboard.jade'),
+    template: require('./screen-keyboard.pug'),
     link: function(scope, element) {
       element.find('input')
 

res/app/components/stf/socket/socket-state/socket-state-directive.js

@@ -8,7 +8,7 @@ module.exports = function SocketStateDirectiveFactory(
 ) {
   return {
     restrict: 'EA',
-    template: require('./socket-state.jade'),
+    template: require('./socket-state.pug'),
     link: function(scope) {
       var hasFailedOnce = false
 

res/app/components/stf/standalone/index.js

@@ -8,8 +8,8 @@ module.exports = angular.module('device-control.standalone', [
   require('stf/screen/scaling').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/device-control/standalone/standalone.jade',
+    $templateCache.put('control-panes/device-control/standalone/standalone.pug',
-      require('./standalone.jade')
+      require('./standalone.pug')
     )
   }])
   .controller('StandaloneCtrl', require('./standalone-controller'))

res/app/components/stf/timelines/timelines-directive.js

@@ -3,7 +3,7 @@ module.exports = function timelinesDirective(Timelines) {
     restrict: 'AE',
     replace: false,
     scope: {},
-    template: require('./timelines.jade'),
+    template: require('./timelines.pug'),
     link: function(scope) {
       scope.cssPrefix = Timelines.options.cssPrefix
       scope.notifications = Timelines.notifications

res/app/components/stf/tokens/generate-access-token/generate-access-token-directive.js

@@ -5,7 +5,7 @@ module.exports = function generateAccessTokenDirective() {
     scope: {
       showGenerate: '='
     },
-    template: require('./generate-access-token.jade'),
+    template: require('./generate-access-token.pug'),
     controller: function($scope, AccessTokenService) {
       $scope.generateForm = {
         title: ''

res/app/control-panes/activity/index.js

@@ -6,8 +6,8 @@ module.exports = angular.module('stf.activity', [
   require('stf/timeline').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/activity/activity.jade',
+    $templateCache.put('control-panes/activity/activity.pug',
-      require('./activity.jade')
+      require('./activity.pug')
     )
   }])
   .controller('ActivityCtrl', require('./activity-controller'))

res/app/control-panes/advanced/advanced.jade

@@ -1,13 +0,0 @@
-.row
-  //.col-md-12
-    div(ng-include='"control-panes/advanced/run-js/run-js.jade"')
-  .col-md-6
-    div(ng-include='"control-panes/advanced/input/input.jade"')
-  .col-md-6
-    div(ng-include='"control-panes/advanced/port-forwarding/port-forwarding.jade"')
-.row
-  //.col-md-6
-  //  div(ng-include='"control-panes/advanced/vnc/vnc.jade"')
-
-  .col-md-6
-    div(ng-include='"control-panes/advanced/maintenance/maintenance.jade"')

res/app/control-panes/advanced/advanced.pug

@@ -0,0 +1,13 @@
+.row
+  //.col-md-12
+    div(ng-include='"control-panes/advanced/run-js/run-js.pug"')
+  .col-md-6
+    div(ng-include='"control-panes/advanced/input/input.pug"')
+  .col-md-6
+    div(ng-include='"control-panes/advanced/port-forwarding/port-forwarding.pug"')
+.row
+  //.col-md-6
+  //  div(ng-include='"control-panes/advanced/vnc/vnc.pug"')
+
+  .col-md-6
+    div(ng-include='"control-panes/advanced/maintenance/maintenance.pug"')

res/app/control-panes/advanced/index.js

@@ -9,8 +9,8 @@ module.exports = angular.module('stf.advanced', [
   require('./maintenance').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/advanced.jade',
+    $templateCache.put('control-panes/advanced/advanced.pug',
-      require('./advanced.jade')
+      require('./advanced.pug')
     )
   }])
   .controller('AdvancedCtrl', require('./advanced-controller'))

res/app/control-panes/advanced/input/index.js

@@ -3,8 +3,8 @@ require('./input.css')
 module.exports = angular.module('stf.advanced.input', [
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/input/input.jade',
+    $templateCache.put('control-panes/advanced/input/input.pug',
-      require('./input.jade')
+      require('./input.pug')
     )
   }])
   .controller('InputAdvancedCtrl', require('./input-controller'))

res/app/control-panes/advanced/maintenance/index.js

@@ -2,8 +2,8 @@ module.exports = angular.module('stf.advanced.maintenance', [
   require('gettext').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/maintenance/maintenance.jade',
+    $templateCache.put('control-panes/advanced/maintenance/maintenance.pug',
-      require('./maintenance.jade')
+      require('./maintenance.pug')
     )
   }])
   .controller('MaintenanceCtrl', require('./maintenance-controller'))

res/app/control-panes/advanced/port-forwarding/index.js

@@ -7,8 +7,8 @@ module.exports = angular.module('stf.port-forwarding', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/advanced/port-forwarding/port-forwarding.jade',
+      'control-panes/advanced/port-forwarding/port-forwarding.pug',
-      require('./port-forwarding.jade')
+      require('./port-forwarding.pug')
     )
   }])
   .controller('PortForwardingCtrl', require('./port-forwarding-controller'))

res/app/control-panes/advanced/run-js/index.js

@@ -4,8 +4,8 @@ module.exports = angular.module('stf.run-js', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/run-js/run-js.jade',
+    $templateCache.put('control-panes/advanced/run-js/run-js.pug',
-      require('./run-js.jade')
+      require('./run-js.pug')
     )
   }])
   .controller('RunJsCtrl', require('./run-js-controller'))

res/app/control-panes/advanced/usb/index.js

@@ -4,8 +4,8 @@ module.exports = angular.module('stf.usb', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/advanced/usb/usb.jade',
+    $templateCache.put('control-panes/advanced/usb/usb.pug',
-      require('./usb.jade')
+      require('./usb.pug')
     )
   }])
   .controller('UsbCtrl', require('./usb-controller'))

res/app/control-panes/advanced/vnc/index.js

@@ -5,8 +5,8 @@ module.exports = angular.module('stf.vnc', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/advanced/vnc/vnc.jade',
+      'control-panes/advanced/vnc/vnc.pug',
-      require('./vnc.jade')
+      require('./vnc.pug')
     )
   }])
   .controller('VNCCtrl', require('./vnc-controller'))

res/app/control-panes/automation/automation.pug

@@ -1,5 +1,5 @@
 .row
   .col-md-6
-    div(ng-include='"control-panes/automation/store-account/store-account.jade"')
+    div(ng-include='"control-panes/automation/store-account/store-account.pug"')
   .col-md-6
-    div(ng-include='"control-panes/automation/device-settings/device-settings.jade"')
+    div(ng-include='"control-panes/automation/device-settings/device-settings.pug"')

res/app/control-panes/automation/device-settings/index.js

@@ -4,8 +4,8 @@ module.exports = angular.module('stf.device-settings', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/automation/device-settings/device-settings.jade',
+    $templateCache.put('control-panes/automation/device-settings/device-settings.pug',
-      require('./device-settings.jade')
+      require('./device-settings.pug')
     )
   }])
   .controller('DeviceSettingsCtrl', require('./device-settings-controller'))

res/app/control-panes/automation/index.js

@@ -4,7 +4,7 @@ module.exports = angular.module('stf.automation', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/automation/automation.jade'
+      'control-panes/automation/automation.pug'
-      , require('./automation.jade')
+      , require('./automation.pug')
     )
   }])

res/app/control-panes/automation/store-account/index.js

@@ -6,8 +6,8 @@ module.exports = angular.module('stf.store-account', [
   require('stf/common-ui/table').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/automation/store-account/store-account.jade',
+    $templateCache.put('control-panes/automation/store-account/store-account.pug',
-      require('./store-account.jade')
+      require('./store-account.pug')
     )
   }])
   .controller('StoreAccountCtrl', require('./store-account-controller'))

res/app/control-panes/control-panes-controller.js

@@ -7,31 +7,31 @@ module.exports =
       {
         title: gettext('Screenshots'),
         icon: 'fa-camera color-skyblue',
-        templateUrl: 'control-panes/screenshots/screenshots.jade',
+        templateUrl: 'control-panes/screenshots/screenshots.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('Automation'),
         icon: 'fa-road color-lila',
-        templateUrl: 'control-panes/automation/automation.jade',
+        templateUrl: 'control-panes/automation/automation.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('Advanced'),
         icon: 'fa-bolt color-brown',
-        templateUrl: 'control-panes/advanced/advanced.jade',
+        templateUrl: 'control-panes/advanced/advanced.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('File Explorer'),
         icon: 'fa-folder-open color-blue',
-        templateUrl: 'control-panes/explorer/explorer.jade',
+        templateUrl: 'control-panes/explorer/explorer.pug',
         filters: ['native', 'web']
       },
       {
         title: gettext('Info'),
         icon: 'fa-info color-orange',
-        templateUrl: 'control-panes/info/info.jade',
+        templateUrl: 'control-panes/info/info.pug',
         filters: ['native', 'web']
       }
     ]
@@ -40,7 +40,7 @@ module.exports =
       {
         title: gettext('Dashboard'),
         icon: 'fa-dashboard fa-fw color-pink',
-        templateUrl: 'control-panes/dashboard/dashboard.jade',
+        templateUrl: 'control-panes/dashboard/dashboard.pug',
         filters: ['native', 'web']
       }
     ].concat(angular.copy(sharedTabs))
@@ -49,7 +49,7 @@ module.exports =
       {
         title: gettext('Logs'),
         icon: 'fa-list-alt color-red',
-        templateUrl: 'control-panes/logs/logs.jade',
+        templateUrl: 'control-panes/logs/logs.pug',
         filters: ['native', 'web']
       }
     ].concat(angular.copy(sharedTabs))

res/app/control-panes/control-panes.pug

@@ -2,13 +2,13 @@ div(ng-controller='ControlPanesHotKeysCtrl').fill-height
   div(ng-if='$root.basicMode || $root.standalone').fill-height
     div.fill-height.basic-remote-control
       .remote-control
-        div(ng-include='"control-panes/device-control/device-control-standalone.jade"').fill-height
+        div(ng-include='"control-panes/device-control/device-control-standalone.pug"').fill-height
 
   div(ng-if='!$root.basicMode && !$root.standalone')
     div(fa-pane, pane-id='control-device', pane-anchor='west', pane-size='{{remotePaneSize}}', pane-min='200px', pane-max='100% + 2px', pane-handle='4', pane-no-toggle='false')
 
       .remote-control
-        div(ng-include='"control-panes/device-control/device-control.jade"').fill-height
+        div(ng-include='"control-panes/device-control/device-control.pug"').fill-height
 
     div(fa-pane, pane-id='control-bottom-tabs', pane-anchor='south', pane-size='30% + 2px', pane-handle='4').pane-bottom-p
       .widget-container.fluid-height

res/app/control-panes/cpu/index.js

@@ -4,8 +4,8 @@ module.exports = angular.module('stf.cpu', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/cpu/cpu.jade',
+    $templateCache.put('control-panes/cpu/cpu.pug',
-      require('./cpu.jade')
+      require('./cpu.pug')
     )
   }])
   .controller('CpuCtrl', require('./cpu-controller'))

res/app/control-panes/dashboard/apps/index.js

@@ -4,8 +4,8 @@ module.exports = angular.module('stf.apps', [
   require('stf/common-ui').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/apps/apps.jade',
+    $templateCache.put('control-panes/dashboard/apps/apps.pug',
-      require('./apps.jade')
+      require('./apps.pug')
     )
   }])
   .controller('AppsCtrl', require('./apps-controller'))

res/app/control-panes/dashboard/clipboard/index.js

@@ -7,8 +7,8 @@ module.exports = angular.module('stf.clipboard', [
   require('gettext').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/clipboard/clipboard.jade',
+    $templateCache.put('control-panes/dashboard/clipboard/clipboard.pug',
-      require('./clipboard.jade')
+      require('./clipboard.pug')
     )
   }])
   .controller('ClipboardCtrl', require('./clipboard-controller'))

res/app/control-panes/dashboard/dashboard.pug

@@ -1,16 +1,16 @@
 .row
   .col-md-6
-    div(ng-include='"control-panes/dashboard/navigation/navigation.jade"')
+    div(ng-include='"control-panes/dashboard/navigation/navigation.pug"')
   .col-md-6
-    div(ng-include='"control-panes/dashboard/clipboard/clipboard.jade"')
+    div(ng-include='"control-panes/dashboard/clipboard/clipboard.pug"')
 
 .row
   .col-md-6
-    div(ng-include='"control-panes/dashboard/install/install.jade"')
+    div(ng-include='"control-panes/dashboard/install/install.pug"')
   .col-md-6(ng-if='$root.platform == "native"')
-    div(ng-include='"control-panes/dashboard/shell/shell.jade"')
+    div(ng-include='"control-panes/dashboard/shell/shell.pug"')
 .row
   .col-md-6
-    div(ng-include='"control-panes/dashboard/apps/apps.jade"')
+    div(ng-include='"control-panes/dashboard/apps/apps.pug"')
   .col-md-6
-    div(ng-include='"control-panes/advanced/remote-debug/remote-debug.jade"')
+    div(ng-include='"control-panes/advanced/remote-debug/remote-debug.pug"')

res/app/control-panes/dashboard/index.js

@@ -8,8 +8,8 @@ module.exports = angular.module('stf.dashboard', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/dashboard/dashboard.jade'
+      'control-panes/dashboard/dashboard.pug'
-      , require('./dashboard.jade')
+      , require('./dashboard.pug')
     )
   }])
   .controller('DashboardCtrl', require('./dashboard-controller'))

res/app/control-panes/dashboard/install/activities/index.js

@@ -5,8 +5,8 @@ module.exports = angular.module('stf.activities', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/dashboard/install/activities/activities.jade',
+      'control-panes/dashboard/install/activities/activities.pug',
-      require('./activities.jade')
+      require('./activities.pug')
     )
   }])
   .controller('ActivitiesCtrl', require('./activities-controller'))

res/app/control-panes/dashboard/install/index.js

@@ -11,8 +11,8 @@ module.exports = angular.module('stf.install', [
   require('stf/upload').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/install/install.jade',
+    $templateCache.put('control-panes/dashboard/install/install.pug',
-      require('./install.jade')
+      require('./install.pug')
     )
   }])
   .controller('InstallCtrl', require('./install-controller'))

res/app/control-panes/dashboard/install/install.pug

@@ -51,7 +51,7 @@
                   ng-click='uninstall(installation.manifest.package)', ng-show='installation.success')
                     i.fa.fa-trash-o
                     span(translate) Uninstall
-                div(ng-include='"control-panes/dashboard/install/activities/activities.jade"')
+                div(ng-include='"control-panes/dashboard/install/activities/activities.pug"')
                 button.btn.btn-sm.btn-primary-outline(uib-btn-checkbox, ng-model='showManifest')
                   i.fa.fa-list
                   span(ng-if='showManifest') Hide Manifest

res/app/control-panes/dashboard/navigation/index.js

@@ -4,8 +4,8 @@ module.exports = angular.module('stf.navigation', [
 
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/navigation/navigation.jade',
+    $templateCache.put('control-panes/dashboard/navigation/navigation.pug',
-      require('./navigation.jade')
+      require('./navigation.pug')
     )
   }])
   .controller('NavigationCtrl', require('./navigation-controller'))

res/app/control-panes/dashboard/remote-debug/index.js

@@ -5,8 +5,8 @@ module.exports = angular.module('stf.remote-debug', [
 ])
   .run(['$templateCache', function($templateCache) {
     $templateCache.put(
-      'control-panes/advanced/remote-debug/remote-debug.jade',
+      'control-panes/advanced/remote-debug/remote-debug.pug',
-      require('./remote-debug.jade')
+      require('./remote-debug.pug')
     )
   }])
   .controller('RemoteDebugCtrl', require('./remote-debug-controller'))

res/app/control-panes/dashboard/shell/index.js

@@ -5,8 +5,8 @@ module.exports = angular.module('stf.shell', [
   require('gettext').name
 ])
   .run(['$templateCache', function($templateCache) {
-    $templateCache.put('control-panes/dashboard/shell/shell.jade',
+    $templateCache.put('control-panes/dashboard/shell/shell.pug',
-      require('./shell.jade')
+      require('./shell.pug')
     )
   }])
   .controller('ShellCtrl', require('./shell-controller'))