diff --git a/e2e/helpers/extensions.js b/e2e/helpers/extensions.js
index 6b902e03a..dce0b54cf 100644
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@@ -73,17 +73,17 @@ let actions = {
},
changeLanguageToEnglish: function(done) {
- this.wait('#lang')
- .evaluate(selector => {
- return document.querySelector(selector).title;
- }, '#lang')
- .then(title => {
- if (title === 'Change language') {
+ let langSelector = 'vn-user-configuration-popover vn-autocomplete[field="$ctrl.lang"]';
+
+ this.waitToClick('#user')
+ .wait(langSelector)
+ .waitToGetProperty(`${langSelector} input`, 'value')
+ .then(lang => {
+ if (lang === 'English1') {
this.then(done)
.catch(done);
} else {
- this.click('#lang')
- .click('vn-main-menu [vn-id="langs-menu"] ul > li[name="en"]')
+ this.autocompleteSearch(langSelector, 'English')
.then(done)
.catch(done);
}
diff --git a/front/core/components/searchbar/style.scss b/front/core/components/searchbar/style.scss
index c6b3bbb62..965df5f26 100644
--- a/front/core/components/searchbar/style.scss
+++ b/front/core/components/searchbar/style.scss
@@ -1,3 +1,5 @@
+@import "padding";
+
vn-searchbar {
padding-top: 6px;
display: block;
@@ -5,4 +7,9 @@ vn-searchbar {
& > form > vn-horizontal > vn-icon-button {
color: black;
}
+}
+
+.search-panel {
+ @extend .pad-large;
+ max-height: 44em;
}
\ No newline at end of file
diff --git a/front/salix/components/main-menu/main-menu.html b/front/salix/components/main-menu/main-menu.html
index 326d5e18b..b607450b8 100644
--- a/front/salix/components/main-menu/main-menu.html
+++ b/front/salix/components/main-menu/main-menu.html
@@ -5,22 +5,6 @@
class="unselectable">
{{currentUserName}}
-
-
-
-
-
* {
cursor: pointer;
- padding-left: .1em;
+ padding-left: .3em;
&:hover {
color: $main-01;
@@ -21,7 +21,7 @@ vn-main-menu {
& > #user {
vertical-align: middle;
font-weight: bold;
- padding-right: .6em;
+ padding-right: .4em;
}
& > vn-icon,
& > a > vn-icon {
@@ -41,6 +41,7 @@ vn-main-menu {
padding: .8em;
border-radius: .1em;
min-width: 8em;
+ white-space: nowrap;
&:last-child {
margin-bottom: 0;
diff --git a/front/salix/components/user-configuration-popover/index.html b/front/salix/components/user-configuration-popover/index.html
index b43ecdf62..3fe9a40a5 100644
--- a/front/salix/components/user-configuration-popover/index.html
+++ b/front/salix/components/user-configuration-popover/index.html
@@ -16,72 +16,67 @@
data="companiesData"
order="code">
-
-
+
+
+
+ {{id}}: {{bank}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/front/salix/components/user-configuration-popover/index.js b/front/salix/components/user-configuration-popover/index.js
index 1f70b9641..18a8aae7e 100644
--- a/front/salix/components/user-configuration-popover/index.js
+++ b/front/salix/components/user-configuration-popover/index.js
@@ -1,6 +1,16 @@
import ngModule from '../../module';
import './style.scss';
+let languages = {
+ es: 'Español',
+ en: 'English',
+ ca: 'Català',
+ pt: 'Português',
+ fr: 'Français',
+ nl: 'Nederlands',
+ mn: 'Монгол хэл'
+};
+
class Controller {
constructor($scope, $http, $state, vnApp, $translate) {
this.$scope = $scope;
@@ -9,6 +19,25 @@ class Controller {
this.vnApp = vnApp;
this.$translate = $translate;
this.getUserConfig();
+
+ this.lang = $translate.use();
+ this.langs = [];
+
+ for (let code of $translate.getAvailableLanguageKeys()) {
+ this.langs.push({
+ code: code,
+ name: languages[code] ? languages[code] : code
+ });
+ }
+ }
+
+ set lang(value) {
+ this._lang = value;
+ this.$translate.use(value);
+ }
+
+ get lang() {
+ return this._lang;
}
set localBankFk(value) {
diff --git a/modules/agency/front/location-search-panel/index.html b/modules/agency/front/location-search-panel/index.html
index 01bdc7eba..9621f8b56 100644
--- a/modules/agency/front/location-search-panel/index.html
+++ b/modules/agency/front/location-search-panel/index.html
@@ -1,4 +1,4 @@
-