From 8510711e5db318da3847aaaa1be9ca98e7651f19 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 19 May 2017 16:03:39 -0400
Subject: [PATCH] organize import dropdown. added opera and vivaldi

---
 src/app/services/importService.js      |  2 ++
 src/app/tools/toolsImportController.js | 30 ++++++++++++++++++++++++++
 src/app/tools/views/toolsImport.html   |  6 +++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/app/services/importService.js b/src/app/services/importService.js
index 55a35b38f7..3a0a0ea5e1 100644
--- a/src/app/services/importService.js
+++ b/src/app/services/importService.js
@@ -36,6 +36,8 @@
                     import1Password6WinCsv(file, success, error);
                     break;
                 case 'chromecsv':
+                case 'vivaldicsv':
+                case 'operacsv':
                     importChromeCsv(file, success, error);
                     break;
                 case 'firefoxpasswordexportercsvxml':
diff --git a/src/app/tools/toolsImportController.js b/src/app/tools/toolsImportController.js
index 0e7ac276c9..9944d899b4 100644
--- a/src/app/tools/toolsImportController.js
+++ b/src/app/tools/toolsImportController.js
@@ -11,12 +11,16 @@
             {
                 id: 'bitwardencsv',
                 name: 'bitwarden (csv)',
+                featured: true,
+                sort: 1,
                 instructions: $sce.trustAsHtml('Export using the web vault (vault.bitwarden.com). ' +
                     'Log into the web vault and navigate to "Tools" > "Export".')
             },
             {
                 id: 'lastpass',
                 name: 'LastPass (csv)',
+                featured: true,
+                sort: 2,
                 instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' +
                     '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-lastpass/">' +
                     'https://help.bitwarden.com/getting-started/import-from-lastpass/</a>')
@@ -24,6 +28,8 @@
             {
                 id: 'chromecsv',
                 name: 'Chrome (csv)',
+                featured: true,
+                sort: 3,
                 instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' +
                     '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-chrome/">' +
                     'https://help.bitwarden.com/getting-started/import-from-chrome/</a>')
@@ -31,6 +37,8 @@
             {
                 id: 'firefoxpasswordexportercsvxml',
                 name: 'Firefox Password Exporter (xml)',
+                featured: true,
+                sort: 4,
                 instructions: $sce.trustAsHtml('Use the ' +
                     '<a target="_blank" href="https://addons.mozilla.org/en-US/firefox/addon/password-exporter/">' +
                     'Password Exporter</a> addon for FireFox to export your passwords to a XML file. After installing ' +
@@ -41,6 +49,8 @@
             {
                 id: 'keepass2xml',
                 name: 'KeePass 2 (xml)',
+                featured: true,
+                sort: 5,
                 instructions: $sce.trustAsHtml('Using the KeePass 2 desktop application, navigate to "File" > "Export" and ' +
                     'select the KeePass XML (2.x) option.')
             },
@@ -53,12 +63,16 @@
             {
                 id: 'dashlanecsv',
                 name: 'Dashlane (csv)',
+                featured: true,
+                sort: 7,
                 instructions: $sce.trustAsHtml('Using the Dashlane desktop application, navigate to "File" > "Export" > ' +
                     '"Unsecured archive (readable) in CSV format" and save the CSV file.')
             },
             {
                 id: '1password1pif',
                 name: '1Password (1pif)',
+                featured: true,
+                sort: 6,
                 instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' +
                     '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-1password/">' +
                     'https://help.bitwarden.com/getting-started/import-from-1password/</a>')
@@ -202,6 +216,22 @@
                 name: 'PassKeep (csv)',
                 instructions: $sce.trustAsHtml('Using the PassKeep mobile app, navigate to "Backup/Restore". ' +
                     'Locate the "CSV Backup/Restore" section and click "Backup to CSV" to save the CSV file.')
+            },
+            {
+                id: 'operacsv',
+                name: 'Opera (csv)',
+                instructions: $sce.trustAsHtml('The process for importing from Opera is exactly the same as ' +
+                    'importing from Google Chrome. See detailed instructions on our help site at ' +
+                    '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-chrome/">' +
+                    'https://help.bitwarden.com/getting-started/import-from-chrome/</a>')
+            },
+            {
+                id: 'vivaldicsv',
+                name: 'Vivaldi (csv)',
+                instructions: $sce.trustAsHtml('The process for importing from Vivaldi is exactly the same as ' +
+                    'importing from Google Chrome. See detailed instructions on our help site at ' +
+                    '<a target="_blank" href="https://help.bitwarden.com/getting-started/import-from-chrome/">' +
+                    'https://help.bitwarden.com/getting-started/import-from-chrome/</a>')
             }
         ];
 
diff --git a/src/app/tools/views/toolsImport.html b/src/app/tools/views/toolsImport.html
index c4b43d0ca4..07213649f6 100644
--- a/src/app/tools/views/toolsImport.html
+++ b/src/app/tools/views/toolsImport.html
@@ -14,7 +14,11 @@
             <label for="source">1. Select the format of the import file</label>
             <select id="source" name="source" class="form-control" ng-model="model.source" ng-change="setSource()" required>
                 <option value="">-- Select --</option>
-                <option ng-repeat="option in options" value="{{option.id}}">{{option.name}}</option>
+                <option ng-repeat="option in options | filter: { featured: true } | orderBy: ['sort', 'name']"
+                        value="{{option.id}}">{{option.name}}</option>
+                <option value="-" disabled></option>
+                <option ng-repeat="option in options | filter: { featured: '!true' } | orderBy: ['sort', 'name']" 
+                        value="{{option.id}}">{{option.name}}</option>
             </select>
         </div>
         <div class="callout callout-default" ng-show="model.source">