From c9413a5c49366cf96edc281994a8d52de230e476 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 9 Nov 2016 21:45:29 -0500
Subject: [PATCH] Added view site option to current tab listing

---
 src/popup/app/config.js                       |  7 +++++--
 src/popup/app/current/currentController.js    | 10 +++++++++
 src/popup/app/current/views/current.html      |  4 ++++
 .../app/vault/vaultEditSiteController.js      |  4 +++-
 .../app/vault/vaultViewSiteController.js      | 21 +++++++++++++------
 src/popup/app/vault/views/vaultViewSite.html  |  2 +-
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index 1b4839e9..ab602e4e 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -93,7 +93,7 @@
                 templateUrl: 'app/vault/views/vaultViewSite.html',
                 controller: 'vaultViewSiteController',
                 data: { authorize: true },
-                params: { animation: null, returnScrollY: 0, returnSearchText: null }
+                params: { animation: null, returnScrollY: 0, returnSearchText: null, fromCurrent: false }
             })
             .state('addSite', {
                 url: '/add-site',
@@ -110,7 +110,10 @@
                 templateUrl: 'app/vault/views/vaultEditSite.html',
                 controller: 'vaultEditSiteController',
                 data: { authorize: true },
-                params: { animation: null, fromView: true, returnScrollY: 0, returnSearchText: null, site: null }
+                params: {
+                    animation: null, fromView: true, returnScrollY: 0,
+                    returnSearchText: null, site: null, fromCurrent: false
+                }
             })
 
             .state('passwordGenerator', {
diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index 27874384..865a3bc3 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -92,6 +92,16 @@ angular
             }
         };
 
+        $scope.viewSite = function (site, e) {
+            e.stopPropagation();
+
+            $state.go('viewSite', {
+                siteId: site.id,
+                animation: 'in-slide-up',
+                fromCurrent: true
+            });
+        };
+
         $scope.$on('syncCompleted', function (event, successfully) {
             if ($scope.loaded) {
                 setTimeout(loadVault, 500);
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index e24ad207..b5f35101 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -22,6 +22,10 @@
                           data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
                         <i class="fa fa-lg fa-user"></i>
                     </span>
+                    <span class="btn-list" href="" ng-click="viewSite(site, $event) && $event.stopPropagation()"
+                          title="{{i18n.edit}} {{site.name}}">
+                        <i class="fa fa-lg fa-pencil"></i>
+                    </span>
                     <span class="text">{{site.name}}</span>
                     <span class="detail">{{site.username}}</span>
                 </a>
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js
index 98830992..e56800ae 100644
--- a/src/popup/app/vault/vaultEditSiteController.js
+++ b/src/popup/app/vault/vaultEditSiteController.js
@@ -8,6 +8,7 @@ angular
         var returnSearchText = $stateParams.returnSearchText;
         var siteId = $stateParams.siteId;
         var fromView = $stateParams.fromView;
+        var fromCurrent = $stateParams.fromCurrent;
 
         $scope.site = {
             folderId: null
@@ -73,7 +74,8 @@ angular
                     siteId: siteId,
                     animation: 'out-slide-down',
                     returnScrollY: returnScrollY || 0,
-                    returnSearchText: returnSearchText
+                    returnSearchText: returnSearchText,
+                    fromCurrent: fromCurrent
                 });
             }
             else {
diff --git a/src/popup/app/vault/vaultViewSiteController.js b/src/popup/app/vault/vaultViewSiteController.js
index 4cf48a40..472f5910 100644
--- a/src/popup/app/vault/vaultViewSiteController.js
+++ b/src/popup/app/vault/vaultViewSiteController.js
@@ -6,6 +6,7 @@ angular
         $scope.i18n = i18nService;
         var returnScrollY = $stateParams.returnScrollY;
         var returnSearchText = $stateParams.returnSearchText;
+        var fromCurrent = $stateParams.fromCurrent;
 
         $scope.site = null;
         siteService.get($stateParams.siteId, function (site) {
@@ -47,16 +48,24 @@ angular
                 siteId: site.id,
                 fromView: true,
                 returnScrollY: returnScrollY || 0,
-                returnSearchText: returnSearchText
+                returnSearchText: returnSearchText,
+                fromCurrent: fromCurrent
             });
         };
 
         $scope.close = function () {
-            $state.go('tabs.vault', {
-                animation: 'out-slide-down',
-                scrollY: returnScrollY || 0,
-                searchText: returnSearchText
-            });
+            if (fromCurrent) {
+                $state.go('tabs.current', {
+                    animation: 'out-slide-down'
+                });
+            }
+            else {
+                $state.go('tabs.vault', {
+                    animation: 'out-slide-down',
+                    scrollY: returnScrollY || 0,
+                    searchText: returnSearchText
+                });
+            }
         };
 
         $scope.launchWebsite = function (site) {
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html
index 4bbc8892..e586ca82 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewSite.html
@@ -32,7 +32,7 @@
                         <i class="fa fa-lg fa-clipboard"></i>
                     </a>
                     <span class="item-label">{{i18n.username}}</span>
-                    <span id="username" class="monospaced">{{site.username}}</span>
+                    <span id="username">{{site.username}}</span>
                 </div>
                 <div class="list-section-item" ng-if="site.password">
                     <a class="btn-list" href="" title="{{i18n.copyPassword}}" ngclipboard ngclipboard-error="clipboardError(e)"