diff --git a/src/app/config.js b/src/app/config.js index 020d45e4da0..89e3335e3bf 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -99,29 +99,17 @@ angular controller: 'toolsController', data: { pageTitle: 'Tools' } }) - .state('backend.sharedLogins', { - url: '^/shared/logins', - templateUrl: 'app/shared/views/sharedLogins.html', - controller: 'sharedLoginsController', - data: { pageTitle: 'Shared Logins' } + .state('backend.shared', { + url: '^/shared', + templateUrl: 'app/shared/views/shared.html', + controller: 'sharedController', + data: { pageTitle: 'Shared' } }) - .state('backend.sharedLoginsMe', { - url: '^/shared/logins/me', - templateUrl: 'app/shared/views/sharedLoginsMe.html', - controller: 'sharedLoginsMeController', - data: { pageTitle: 'Logins Shared with Me' } - }) - .state('backend.sharedFolders', { - url: '^/shared/folders', - templateUrl: 'app/shared/views/sharedFolders.html', - controller: 'sharedFoldersController', - data: { pageTitle: 'Shared Folders' } - }) - .state('backend.sharedFoldersMe', { - url: '^/shared/folders/me', - templateUrl: 'app/shared/views/sharedFoldersMe.html', - controller: 'sharedFoldersMeController', - data: { pageTitle: 'Folders Shared with Me' } + .state('backend.sharedMe', { + url: '^/shared/me', + templateUrl: 'app/shared/views/sharedMe.html', + controller: 'sharedMeController', + data: { pageTitle: 'Shared with Me' } }) // Frontend diff --git a/src/app/global/mainController.js b/src/app/global/mainController.js index 3acae7b1d85..33932b6b64c 100644 --- a/src/app/global/mainController.js +++ b/src/app/global/mainController.js @@ -20,6 +20,8 @@ angular if ($.AdminLTE.pushMenu) { $.AdminLTE.pushMenu.expandOnHover(); } + + $(document).off('click', '.sidebar li a'); } }); diff --git a/src/app/settings/views/settingsDomains.html b/src/app/settings/views/settingsDomains.html index 8feddec45da..a139eba4a92 100644 --- a/src/app/settings/views/settingsDomains.html +++ b/src/app/settings/views/settingsDomains.html @@ -12,7 +12,10 @@

Custom Equivalent Domains

+
@@ -52,6 +55,11 @@

Global Equivalent Domains

+
+ +
diff --git a/src/app/shared/sharedController.js b/src/app/shared/sharedController.js new file mode 100644 index 00000000000..7fd51f33706 --- /dev/null +++ b/src/app/shared/sharedController.js @@ -0,0 +1,6 @@ +angular + .module('bit.shared') + + .controller('sharedController', function ($scope, apiService, cryptoService, cipherService, $analytics) { + + }); diff --git a/src/app/shared/sharedFoldersController.js b/src/app/shared/sharedFoldersController.js deleted file mode 100644 index e8e4cf93159..00000000000 --- a/src/app/shared/sharedFoldersController.js +++ /dev/null @@ -1,6 +0,0 @@ -angular - .module('bit.shared') - - .controller('sharedFoldersController', function ($scope, apiService, cryptoService, cipherService, $analytics) { - - }); diff --git a/src/app/shared/sharedFoldersMeController.js b/src/app/shared/sharedFoldersMeController.js deleted file mode 100644 index 1f59d62612a..00000000000 --- a/src/app/shared/sharedFoldersMeController.js +++ /dev/null @@ -1,6 +0,0 @@ -angular - .module('bit.shared') - - .controller('sharedFoldersMeController', function ($scope, apiService, cryptoService, cipherService, $analytics) { - - }); diff --git a/src/app/shared/sharedLoginsController.js b/src/app/shared/sharedLoginsController.js deleted file mode 100644 index c5afd3fb4ee..00000000000 --- a/src/app/shared/sharedLoginsController.js +++ /dev/null @@ -1,6 +0,0 @@ -angular - .module('bit.shared') - - .controller('sharedLoginsController', function ($scope, apiService, cryptoService, cipherService, $analytics) { - - }); diff --git a/src/app/shared/sharedLoginsMeController.js b/src/app/shared/sharedLoginsMeController.js deleted file mode 100644 index ada21c48b42..00000000000 --- a/src/app/shared/sharedLoginsMeController.js +++ /dev/null @@ -1,6 +0,0 @@ -angular - .module('bit.shared') - - .controller('sharedLoginsMeController', function ($scope, apiService, cryptoService, cipherService, $analytics) { - - }); diff --git a/src/app/shared/sharedMeController.js b/src/app/shared/sharedMeController.js new file mode 100644 index 00000000000..c11ea2a6896 --- /dev/null +++ b/src/app/shared/sharedMeController.js @@ -0,0 +1,6 @@ +angular + .module('bit.shared') + + .controller('sharedMeController', function ($scope, apiService, cryptoService, cipherService, $analytics) { + + }); diff --git a/src/app/shared/views/shared.html b/src/app/shared/views/shared.html new file mode 100644 index 00000000000..bdbfed4c06a --- /dev/null +++ b/src/app/shared/views/shared.html @@ -0,0 +1,102 @@ +
+

+ Sharing Center + items I'm sharing +

+
+
+
+
+

Folders

+
+ + +
+
+
+
+ Loading... +
+
+ No shared folders. +
+
+ + + + + + + + + + + + + +
Name
+ + + {{folder.name}}
+
+
+
+
+
+

Logins

+
+ + +
+
+
+
+ Loading... +
+
+ No shared logins. +
+
+ + + + + + + + + + + + + + + +
NameUsername
+ + + {{login.name}}{{login.username}}
+
+
+
+
diff --git a/src/app/shared/views/sharedFolders.html b/src/app/shared/views/sharedFolders.html deleted file mode 100644 index bdfd5d93a35..00000000000 --- a/src/app/shared/views/sharedFolders.html +++ /dev/null @@ -1,47 +0,0 @@ -
-

- Sharing Center - folders -

-
-
-
- -
-
- Loading... -
-
- No shared folders. -
-
- - - - - - - - - - - - - -
Name
- - - {{folder.name}}
-
-
-
-
diff --git a/src/app/shared/views/sharedFoldersMe.html b/src/app/shared/views/sharedFoldersMe.html deleted file mode 100644 index 06410575bab..00000000000 --- a/src/app/shared/views/sharedFoldersMe.html +++ /dev/null @@ -1,47 +0,0 @@ -
-

- Sharing Center - folders -

-
-
-
- -
-
- Loading... -
-
- No shared folders. -
-
- - - - - - - - - - - - - -
Name
- - - {{folder.name}}
-
-
-
-
diff --git a/src/app/shared/views/sharedLogins.html b/src/app/shared/views/sharedLogins.html deleted file mode 100644 index 9e7e5799699..00000000000 --- a/src/app/shared/views/sharedLogins.html +++ /dev/null @@ -1,49 +0,0 @@ -
-

- Sharing Center - logins -

-
-
-
- -
-
- Loading... -
-
- No shared logins. -
-
- - - - - - - - - - - - - - - -
NameUsername
- - - {{login.name}}{{login.username}}
-
-
-
-
diff --git a/src/app/shared/views/sharedLoginsMe.html b/src/app/shared/views/sharedLoginsMe.html deleted file mode 100644 index 0f999ff221a..00000000000 --- a/src/app/shared/views/sharedLoginsMe.html +++ /dev/null @@ -1,49 +0,0 @@ -
-

- Sharing Center - logins -

-
-
-
- -
-
- Loading... -
-
- No shared logins. -
-
- - - - - - - - - - - - - - - -
NameUsername
- - - {{login.name}}{{login.username}}
-
-
-
-
diff --git a/src/app/shared/views/sharedMe.html b/src/app/shared/views/sharedMe.html new file mode 100644 index 00000000000..ff827569aab --- /dev/null +++ b/src/app/shared/views/sharedMe.html @@ -0,0 +1,96 @@ +
+

+ Sharing Center + shared with me +

+
+
+
+
+

Folders

+
+ +
+
+
+
+ Loading... +
+
+ No folders shared with me. +
+
+ + + + + + + + + + + + + +
Name
+ + + {{folder.name}}
+
+
+
+
+
+

Logins

+
+ +
+
+
+
+ Loading... +
+
+ No logins shared with me. +
+
+ + + + + + + + + + + + + + + +
NameUsername
+ + + {{login.name}}{{login.username}}
+
+
+
+
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html index 2206808953f..2327fd1eebe 100644 --- a/src/app/vault/views/vault.html +++ b/src/app/vault/views/vault.html @@ -11,16 +11,18 @@

{{folder.name}} {{folderLogins.length}} logins

-
- - - + diff --git a/src/app/views/backendLayout.html b/src/app/views/backendLayout.html index b1be93360cb..7c2b0b2419f 100644 --- a/src/app/views/backendLayout.html +++ b/src/app/views/backendLayout.html @@ -42,55 +42,56 @@