From b380d723b7e0c50559db507f0ce0a3154f3e8f5d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 7 Jul 2017 09:11:45 -0400 Subject: [PATCH] UI adjustments for premium adverts --- src/app/directives/passwordMeterDirective.js | 5 ++- src/app/global/premiumRequiredController.js | 4 +-- src/app/settings/views/settingsTwoStep.html | 7 +++-- src/app/vault/vaultAddLoginController.js | 10 +++++- src/app/vault/vaultEditLoginController.js | 10 +++++- src/app/vault/views/vaultAddLogin.html | 9 ++++-- src/app/vault/views/vaultEditLogin.html | 9 ++++-- src/images/totp-countdown.png | Bin 0 -> 1636 bytes src/less/vault.less | 31 +++++++++++++++++-- 9 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 src/images/totp-countdown.png diff --git a/src/app/directives/passwordMeterDirective.js b/src/app/directives/passwordMeterDirective.js index 9b8e79b8e91..15b6e86fcdf 100644 --- a/src/app/directives/passwordMeterDirective.js +++ b/src/app/directives/passwordMeterDirective.js @@ -3,15 +3,14 @@ angular .directive('passwordMeter', function () { return { - template: '
{{value}}%
', restrict: 'A', scope: { password: '=passwordMeter', username: '=passwordMeterUsername', - outerClass: '@?', - outerStyle: '@?' + outerClass: '@?' }, link: function (scope) { var measureStrength = function (username, password) { diff --git a/src/app/global/premiumRequiredController.js b/src/app/global/premiumRequiredController.js index 6d64ee16fc5..91502f86c2e 100644 --- a/src/app/global/premiumRequiredController.js +++ b/src/app/global/premiumRequiredController.js @@ -1,7 +1,7 @@ angular .module('bit.global') - .controller('premiumRequiredController', function ($scope, $state, $uibModalInstance, $analytics) { + .controller('premiumRequiredController', function ($scope, $state, $uibModalInstance, $analytics, $uibModalStack) { $analytics.eventTrack('premiumRequiredController', { category: 'Modal' }); $scope.go = function () { @@ -12,6 +12,6 @@ angular }; $scope.close = function () { - $uibModalInstance.dismiss('close'); + $uibModalStack.dismissAll(); }; }); diff --git a/src/app/settings/views/settingsTwoStep.html b/src/app/settings/views/settingsTwoStep.html index a26e405ee46..b1823dd4e98 100644 --- a/src/app/settings/views/settingsTwoStep.html +++ b/src/app/settings/views/settingsTwoStep.html @@ -30,8 +30,11 @@ - {{::provider.name}} - PREMIUM + + {{::provider.name}} + PREMIUM +
{{::provider.description}}
diff --git a/src/app/vault/vaultAddLoginController.js b/src/app/vault/vaultAddLoginController.js index b5b352b5aab..503bbdfc716 100644 --- a/src/app/vault/vaultAddLoginController.js +++ b/src/app/vault/vaultAddLoginController.js @@ -2,7 +2,7 @@ .module('bit.vault') .controller('vaultAddLoginController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, - passwordService, selectedFolder, $analytics, checkedFavorite, $rootScope, authService) { + passwordService, selectedFolder, $analytics, checkedFavorite, $rootScope, authService, $uibModal) { $analytics.eventTrack('vaultAddLoginController', { category: 'Modal' }); $scope.folders = $rootScope.vaultFolders; $scope.login = { @@ -61,4 +61,12 @@ $scope.close = function () { $uibModalInstance.dismiss('close'); }; + + $scope.showPremium = function () { + $uibModal.open({ + animation: true, + templateUrl: 'app/views/premiumRequired.html', + controller: 'premiumRequiredController' + }); + }; }); diff --git a/src/app/vault/vaultEditLoginController.js b/src/app/vault/vaultEditLoginController.js index f7c67647469..8017096482d 100644 --- a/src/app/vault/vaultEditLoginController.js +++ b/src/app/vault/vaultEditLoginController.js @@ -2,7 +2,7 @@ .module('bit.vault') .controller('vaultEditLoginController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, - passwordService, loginId, $analytics, $rootScope, authService) { + passwordService, loginId, $analytics, $rootScope, authService, $uibModal) { $analytics.eventTrack('vaultEditLoginController', { category: 'Modal' }); $scope.folders = $rootScope.vaultFolders; $scope.login = {}; @@ -98,4 +98,12 @@ $scope.close = function () { $uibModalInstance.dismiss('cancel'); }; + + $scope.showPremium = function () { + $uibModal.open({ + animation: true, + templateUrl: 'app/views/premiumRequired.html', + controller: 'premiumRequiredController' + }); + }; }); diff --git a/src/app/vault/views/vaultAddLogin.html b/src/app/vault/views/vaultAddLogin.html index faecfbc988f..3ac323cb681 100644 --- a/src/app/vault/views/vaultAddLogin.html +++ b/src/app/vault/views/vaultAddLogin.html @@ -76,7 +76,7 @@
+ outer-class="xs" class="password-meter">
@@ -87,9 +87,12 @@ ng-readonly="readOnly" api-field />
-
- +
+
+ + PREMIUM +
diff --git a/src/app/vault/views/vaultEditLogin.html b/src/app/vault/views/vaultEditLogin.html index 637b0fdad71..f4470bebdc8 100644 --- a/src/app/vault/views/vaultEditLogin.html +++ b/src/app/vault/views/vaultEditLogin.html @@ -88,7 +88,7 @@
+ outer-class="xs" class="password-meter">
@@ -99,9 +99,12 @@ ng-readonly="readOnly" api-field />
-
- +
+
+ + PREMIUM +
diff --git a/src/images/totp-countdown.png b/src/images/totp-countdown.png new file mode 100644 index 0000000000000000000000000000000000000000..87b9fe14abf11729213bb0fca8b4cb2922285cfd GIT binary patch literal 1636 zcmV-q2AlbbP)-YF& zD-nsThLVZs&Sq?HYmEf9Xj^fG1OTXwTlG@IhR0xFBfSwMaRVEHE0+jKt$A1Zx6Qyv zu0{5?6FWj|J+_*Ng-c(~M(1JNiU~~qx76Ntz?j8Y*tQQa)P{x)z>wWbzTS*YM$-fa z;C)t`k|^YU-3lDKV3sJ~Tc8Lw5cQdz^+{upRGK$EAg2!=`QI@F0|TEf3=+lx{6L#xm?7u? zncX!}vDDAIP77>0BKQql#Y%q=W4zwqf=XT6_Gl;dMYguRnvMT6`#dRV^fk;PL@aDWhJFtZ}c+U z9rkL9(vXTpQZCN{$)L#J^94GMv2dZ$6eWWtS2h)*fYhX94ZI;tUiS<&v-T&DC`nFZkfqMPAC{n`e};DP05 zH!Hy|)N<*h)-#w_p5P?v4q}A^jp+Tn*iep3m6oYE zvpdT^r426%G9Mfe2o;RV#1{brMC_eR|B@1_A@!_sJ^2~eG~*&MkrZc_3a3%INJAly zONx;-3vNE5IyLTdnifPV_$AfIYx1nVa!xr$Acf*JQbxw8;$i@?!}Bp*Jw2;P?{eD) zOA=8kS$hA$-*`?ez@KrcusTF4TzvC5#Wj@@OVqMll)x88n5hZ_MwN_gEXzlE0=_W9 zEJU;n)&YQFv0x^V+>##P#a|UZCNzsHAtqUO{YO7T1!1JF2D8T>N8a5Jg)0&c`2>W@ zfmzsqFh^96lyOj8G~DzNtFS0xid6pmgW{1ESV@UBaaHDWk_eafOQ$;WgIfQI8xL_C1wch- zq=7z-8&k($Z7}$($$SCQLvtr*ZPL4#g$l?&~NJw(K#Y!k|xd$)P%^X8CXVD$dl*iPmoC8vEAu{FiKbupqL;@5h(fr67rl$gCBq%%pH}VX^v@w|2DxMW$h=z5 z{~mk}u~0||_t6lt{ekyKLk2m%o_DT{$NND_Ult@ROAp_lL&4r|Cjd`)HN?~m#qPu7 z6JWTw)>+{jd|J13NLV?mUfzN((?38J1=LqTK3_T{JY$+#zpW4MAD%j0%8BG!BoYQ= iqUg^9W-P=06JP+8RD5&OBTXCt0000