From 43f40d04a14743dc1ec5b1e2c3ba0b06c0925f1a Mon Sep 17 00:00:00 2001
From: Sander <sbrand@exed.nl>
Date: Mon, 12 Sep 2016 13:21:41 +0200
Subject: [PATCH] Detailed password info

---
 .../ng-password-meter/ng-password-meter.css   | 13 +++-
 js/templates.js                               |  2 +-
 .../ng-password-meter/ng-password-meter.js    |  2 +-
 templates/views/partials/password-meter.html  | 66 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/css/vendor/ng-password-meter/ng-password-meter.css b/css/vendor/ng-password-meter/ng-password-meter.css
index 01308db9..fa2112be 100644
--- a/css/vendor/ng-password-meter/ng-password-meter.css
+++ b/css/vendor/ng-password-meter/ng-password-meter.css
@@ -1,12 +1,15 @@
 .pass-meter {
 	width:100%;
 	padding-top:3px;
-	padding-bottom:4px;
+	padding-bottom: 20px;
 }
 
 .pass-meter.hidden {
 	display: none;
 }
+.pass-meter .details, .pass-meter .pass-meter-message{
+	margin-top: 3px;
+}
 
 .pass-meter-col {
 	float:left;
@@ -59,4 +62,12 @@
 
 .pass-meter .details:hover{
 	color: rgb(0, 102, 255) !important;
+}
+.detail_box .row {
+	clear: both;
+}
+
+.detail_box .row .col{
+	float: left;
+	width: 49%;
 }
\ No newline at end of file
diff --git a/js/templates.js b/js/templates.js
index c2d6eb6c..42918218 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -3,7 +3,7 @@ angular.module('templates-main', ['views/partials/password-meter.html', 'views/s
 angular.module('views/partials/password-meter.html', []).run(['$templateCache', function($templateCache) {
   'use strict';
   $templateCache.put('views/partials/password-meter.html',
-    '<div class="pass-meter {{masterClass}}"><div class="{{colClass}} pass-meter-col {{first}}"><div class="indicator"></div></div><div class="{{colClass}} pass-meter-col {{second}}"><div class="indicator"></div></div><div class="{{colClass}} pass-meter-col {{third}}"><div class="indicator"></div></div><div class="{{colClass}} pass-meter-col {{fourth}}"><div class="indicator"></div></div><div class="details" ng-click="toggleScore()">Details</div><div class="pass-meter-message">{{message}}</div><div class="detail_box" ng-show="scoreShown">{{score}}</div></div>');
+    '<div class="pass-meter {{masterClass}}"><div class="{{colClass}} pass-meter-col {{first}}"><div class="indicator"></div></div><div class="{{colClass}} pass-meter-col {{second}}"><div class="indicator"></div></div><div class="{{colClass}} pass-meter-col {{third}}"><div class="indicator"></div></div><div class="{{colClass}} pass-meter-col {{fourth}}"><div class="indicator"></div></div><div class="details" ng-click="toggleScore()"><span ng-show="!scoreShown">Details</span> <span ng-show="scoreShown">Hide details</span></div><div class="pass-meter-message">{{message}}</div><div class="detail_box" ng-show="scoreShown"><div class="row"><div class="col">Score:</div><div class="col">{{score.score}}</div></div><div class="row"><div class="col">100 / hour<br><small>Throttled online attack</small></div><div class="col">{{score.crack_times_display.online_throttling_100_per_hour}}</div></div><div class="row"><div class="col">10 / second<br><small>Unthrottled online attack</small></div><div class="col">{{score.crack_times_display.online_no_throttling_10_per_second}}</div></div><div class="row"><div class="col">10k / second<br><small>Offline attack, slow hash, many cores</small></div><div class="col">{{score.crack_times_display.offline_slow_hashing_1e4_per_second}}</div></div><div class="row"><div class="col">10B / second<br><small>offline attack, fast hash, many cores</small></div><div class="col">{{score.crack_times_display.offline_fast_hashing_1e10_per_second}}</div></div><div class="row"><div class="col">Match sequence:</div><div class="col"><div class="sequence" ng-repeat="sequence in score.sequence"><div>Pattern: {{sequence.pattern}}</div><div>Matched word: {{sequence.matched_word}}</div><div>Dictionary name: {{sequence.dictionary_name}}</div><div>Guesses: {{sequence.guesses}}</div></div></div></div></div></div>');
 }]);
 
 angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) {
diff --git a/js/vendor/ng-password-meter/ng-password-meter.js b/js/vendor/ng-password-meter/ng-password-meter.js
index 634f9db8..004dc220 100644
--- a/js/vendor/ng-password-meter/ng-password-meter.js
+++ b/js/vendor/ng-password-meter/ng-password-meter.js
@@ -56,7 +56,7 @@
 
 						if (scope.strength == 0) {
 							scope.first = 'poor';
-							scope.message	= 'Poor';
+							scope.message	= 'poor';
 						} else if (scope.strength == 1) {
 							scope.first = 'poor';
 							scope.second = 'poor';
diff --git a/templates/views/partials/password-meter.html b/templates/views/partials/password-meter.html
index 9f680bce..a48bdb9d 100644
--- a/templates/views/partials/password-meter.html
+++ b/templates/views/partials/password-meter.html
@@ -11,7 +11,69 @@
 	<div class="{{colClass}} pass-meter-col {{fourth}}">
 		<div class="indicator"></div>
 	</div>
-	<div class="details" ng-click="toggleScore()">Details</div>
+	<div class="details" ng-click="toggleScore()">
+		<span ng-show="!scoreShown">Details</span>
+		<span ng-show="scoreShown">Hide details</span>
+	</div>
 	<div class="pass-meter-message">{{message}}</div>
-	<div class="detail_box" ng-show="scoreShown">{{score}}</div>
+	<div class="detail_box" ng-show="scoreShown">
+		<div class="row">
+			<div class="col">
+				Score:
+			</div>
+			<div class="col">
+				{{score.score}}
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				100 / hour<br/>
+				<small> Throttled online attack</small>
+			</div>
+			<div class="col">
+				{{score.crack_times_display.online_throttling_100_per_hour}}
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				10 / second<br/>
+				<small>Unthrottled online attack</small>
+			</div>
+			<div class="col">
+				{{score.crack_times_display.online_no_throttling_10_per_second}}
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				10k / second<br/>
+				<small>Offline attack, slow hash, many cores</small>
+			</div>
+			<div class="col">
+				{{score.crack_times_display.offline_slow_hashing_1e4_per_second}}
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				10B / second<br/>
+				<small>offline attack, fast hash, many cores</small>
+			</div>
+			<div class="col">
+				{{score.crack_times_display.offline_fast_hashing_1e10_per_second}}
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				Match sequence:
+			</div>
+			<div class="col">
+				<!-- {{score.sequence}} -->
+				<div class="sequence" ng-repeat="sequence in score.sequence">
+					<div>Pattern: {{sequence.pattern}}</div>
+					<div>Matched word: {{sequence.matched_word}}</div>
+					<div>Dictionary name: {{sequence.dictionary_name}}</div>
+					<div>Guesses: {{sequence.guesses}}</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
\ No newline at end of file