diff --git a/dapp/controllers/settingsCtrl.js b/dapp/controllers/settingsCtrl.js index b50132fe..c11555a1 100644 --- a/dapp/controllers/settingsCtrl.js +++ b/dapp/controllers/settingsCtrl.js @@ -2,7 +2,7 @@ function () { angular .module("multiSigWeb") - .controller("settingsCtrl", function (Web3Service, $scope, Config, Wallet, Utils, Transaction, $window, $uibModal, $sce, $location) { + .controller("settingsCtrl", function (Web3Service, $scope, Config, Wallet, Utils, Transaction, $window, $uibModal, $sce, $location, $http) { // Don't save the following config values to localStorage var configBlacklist = [ @@ -79,10 +79,20 @@ } ); + } + function setAppVersion () { + if (isElectron) { + $scope.appVersion = require('electron').remote.app.getVersion(); + } else { + $http.get('package.json').success(function (package_json){ + $scope.appVersion = package_json.version; + }); + } } loadConfig(); + setAppVersion(); /** * Updates configuration diff --git a/dapp/css/app.css b/dapp/css/app.css index e1227243..6a19812a 100644 --- a/dapp/css/app.css +++ b/dapp/css/app.css @@ -169,5 +169,5 @@ input[name="editable-select"]:disabled { } ::selection { - background:transparent; + background: #b3c3ce; } diff --git a/dapp/partials/settings.html b/dapp/partials/settings.html index 95fb1666..ccb0ac23 100644 --- a/dapp/partials/settings.html +++ b/dapp/partials/settings.html @@ -57,3 +57,18 @@