diff options
Diffstat (limited to 'keepassxc-browser')
| -rw-r--r-- | keepassxc-browser/_locales/en/messages.json | 24 | ||||
| -rw-r--r-- | keepassxc-browser/content/banner.js | 4 | ||||
| -rwxr-xr-x | keepassxc-browser/content/keepassxc-browser.js | 2 | ||||
| -rw-r--r-- | keepassxc-browser/content/ui.js | 1 | ||||
| -rw-r--r-- | keepassxc-browser/content/username-field.js | 2 | ||||
| -rw-r--r-- | keepassxc-browser/options/options.html | 25 |
6 files changed, 43 insertions, 15 deletions
diff --git a/keepassxc-browser/_locales/en/messages.json b/keepassxc-browser/_locales/en/messages.json index 59e29b1..08e6b85 100644 --- a/keepassxc-browser/_locales/en/messages.json +++ b/keepassxc-browser/_locales/en/messages.json @@ -1003,6 +1003,30 @@ "message": "The value already exists in the list.", "description": "Error shown when trying to add a duplicate value to the list." }, + "optionsUserInterfaceTitle": { + "message": "User interface", + "description": "User interface title in settings page" + }, + "optionsFillingCredentialsTitle": { + "message": "Filling credentials", + "description": "Filling credentials title in settings page" + }, + "optionsSavingCredentialsTitle": { + "message": "Saving credentials", + "description": "Saving credentials title in settings page" + }, + "optionsUpdatesTitle": { + "message": "Updates", + "description": "Updates title in settings page" + }, + "optionsAdvancedSettingsTitle": { + "message": "Advanced settings", + "description": "Advanced settings title in settings page" + }, + "optionsExtensionTitle": { + "message": "Extension", + "description": "Extension title in settings page" + }, "openNewTab": { "message": "Opens a new tab", "description": "Title attribute text." diff --git a/keepassxc-browser/content/banner.js b/keepassxc-browser/content/banner.js index d4aeba5..daf33a4 100644 --- a/keepassxc-browser/content/banner.js +++ b/keepassxc-browser/content/banner.js @@ -146,8 +146,8 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) { // Only the Root group and no KeePassXC-Browser passwords -> save to default // Or when default group is not set and defaultGroupAskAlways is disabled -> save to default - if ((result.groups === undefined || (result.groups.length > 0 && result.groups[0].children.length === 0)) || - (!result.defaultGroupAlwaysAsk && (result.defaultGroup === '' || result.defaultGroup === DEFAULT_BROWSER_GROUP))) { + if ((result.groups === undefined || (result.groups.length > 0 && result.groups[0].children.length === 0)) + || (!result.defaultGroupAlwaysAsk && (result.defaultGroup === '' || result.defaultGroup === DEFAULT_BROWSER_GROUP))) { const args = [ credentials.username, credentials.password, credentials.url ]; // If root group is defined by the user, and there's no default browser group, save the credentials to the root group diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js index a4badde..28b8672 100755 --- a/keepassxc-browser/content/keepassxc-browser.js +++ b/keepassxc-browser/content/keepassxc-browser.js @@ -1028,7 +1028,7 @@ kpxc.initPasswordGenerator = function(inputs) { } }; -kpxc.initOTPFields = function(inputs, databaseClosed) { +kpxc.initOTPFields = function(inputs) { for (const i of inputs) { const id = i.getLowerCaseAttribute('id'); const name = i.getLowerCaseAttribute('name'); diff --git a/keepassxc-browser/content/ui.js b/keepassxc-browser/content/ui.js index 4a09f7a..a870972 100644 --- a/keepassxc-browser/content/ui.js +++ b/keepassxc-browser/content/ui.js @@ -104,7 +104,6 @@ kpxcUI.setIconPosition = function(icon, field) { kpxcUI.updateFromIntersectionObserver = function(iconClass, entries) { for (const entry of entries) { const rect = DOMRectToArray(entry.boundingClientRect); - const temp = entry.target.closest('.kpxc-username-icon'); if ((entry.intersectionRatio === 0 && !entry.isIntersecting) || (rect.some(x => x < -10))) { iconClass.icon.style.display = 'none'; diff --git a/keepassxc-browser/content/username-field.js b/keepassxc-browser/content/username-field.js index bb1510f..bf31c56 100644 --- a/keepassxc-browser/content/username-field.js +++ b/keepassxc-browser/content/username-field.js @@ -41,7 +41,7 @@ class UsernameFieldIcon extends Icon { } UsernameFieldIcon.prototype.initField = function(field) { - if (!field || field.getAttribute('kpxc-username-field') === 'true') { + if (!field || field.getAttribute('kpxc-username-field') === 'true' || !kpxcFields.isVisible(field)) { return; } diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html index 5e427a6..06d1590 100644 --- a/keepassxc-browser/options/options.html +++ b/keepassxc-browser/options/options.html @@ -50,7 +50,7 @@ <div class="card my-4 shadow"> <div class="card-header h6 rounded-0"> <i class="fa fa-television" aria-hidden="true"></i> - User interface + <span data-i18n="optionsUserInterfaceTitle"></span> </div> <div class="card-body"> <div class="form-group"> @@ -120,7 +120,7 @@ <div class="card my-4 shadow"> <div class="card-header h6 rounded-0"> <i class="fa fa-pencil" aria-hidden="true"></i> - Filling credentials + <span data-i18n="optionsFillingCredentialsTitle"></span> </div> <div class="card-body"> <div class="form-group"> @@ -174,7 +174,7 @@ <div class="card my-4 shadow"> <div class="card-header h6 rounded-0"> <i class="fa fa-save" aria-hidden="true"></i> - Saving credentials + <span data-i18n="optionsSavingCredentialsTitle"></span> </div> <div class="card-body"> <div class="form-group"> @@ -223,7 +223,7 @@ <div class="card my-4 shadow"> <div class="card-header h6 rounded-0"> <i class="fa fa-clock-o" aria-hidden="true"></i> - Updates + <span data-i18n="optionsUpdatesTitle"></span> </div> <div class="card-body"> <div class="help-block kphVersion"> @@ -265,7 +265,7 @@ <div class="card my-4 shadow"> <div class="card-header h6 rounded-0"> <i class="fa fa-pencil" aria-hidden="true"></i> - Advanced settings + <span data-i18n="optionsAdvancedSettingsTitle"></span> </div> <div class="card-body"> <div class="form-group"> @@ -307,12 +307,17 @@ <span class="form-text text-muted" data-i18n="optionsSaveDomainOnlyCustomLoginHelpText"></span> </div> </div> + </div> + </div> + <div class="card my-4 shadow"> + <div class="card-header h6 rounded-0"> + <i class="fa fa-exchange fa-rotate-90" aria-hidden="true"></i> + <span data-i18n="optionsImportExportSettings"></span> + </div> + + <div class="card-body"> <div class="form-group"> - <div class="help-block"> - <span data-i18n="optionsImportExportSettings"></span> - </div> - <br /> <button class="btn btn-sm btn-primary" id="importSettingsButton"><i class="fa fa-arrow-down" aria-hidden="true"></i><span data-i18n="optionsButtonImport"></span></button> <button class="btn btn-sm btn-primary" id="exportSettingsButton"><i class="fa fa-arrow-up" aria-hidden="true"></i><span data-i18n="optionsButtonExport"></span></button> </div> @@ -541,7 +546,7 @@ <div class="card my-4 shadow"> <div class="card-header h6 rounded-0"> <i class="fa fa-desktop" aria-hidden="true"></i> - Extension + <span data-i18n="optionsExtensionTitle"></span> </div> <div class="card-body"> <p> |