+ ng-class="{shown: $ctrl.leftMenuShown || $ctrl.rightMenuShown}"
+ ng-click="$ctrl.hideMenus()">
\ No newline at end of file
diff --git a/front/salix/components/app/app.js b/front/salix/components/app/app.js
index 4ed4f6948..6a8ecb247 100644
--- a/front/salix/components/app/app.js
+++ b/front/salix/components/app/app.js
@@ -12,8 +12,8 @@ export default class App {
$transitions.onStart({}, transition => {
let state = transition.targetState().name();
- this.showMenuButton = state.split('.').length >= 3;
- if (this.menuShown) this.hideMenu();
+ this.showLeftMenuButton = state.split('.').length >= 3;
+ this.hideMenus();
});
}
@@ -30,22 +30,31 @@ export default class App {
return state && state != 'login';
}
- get leftBlock() {
- return this.$element[0].querySelector('.left-block');
+ get leftMenu() {
+ return this.$element[0].querySelector('.left-menu');
}
- showMenu() {
- let leftBlock = this.leftBlock;
- if (!leftBlock) return;
- leftBlock.classList.add('shown');
- this.menuShown = true;
+ showLeftMenu() {
+ if (!this.leftMenu) return;
+ this.leftMenu.classList.add('shown');
+ this.leftMenuShown = true;
}
- hideMenu() {
- this.menuShown = false;
- let leftBlock = this.leftBlock;
- if (!leftBlock) return;
- leftBlock.classList.remove('shown');
+ showRightMenu() {
+ if (!this.rightMenu) return;
+ this.rightMenu.classList.add('shown');
+ this.rightMenuShown = true;
+ }
+
+ hideMenus() {
+ if (this.leftMenuShown) {
+ this.leftMenu.classList.remove('shown');
+ this.leftMenuShown = false;
+ }
+ if (this.rightMenuShown) {
+ this.rightMenu.classList.remove('shown');
+ this.rightMenuShown = false;
+ }
}
showMessage(message) {
diff --git a/front/salix/components/app/style.scss b/front/salix/components/app/style.scss
index ee2bca6bc..ddf4211f6 100644
--- a/front/salix/components/app/style.scss
+++ b/front/salix/components/app/style.scss
@@ -27,7 +27,7 @@ vn-app {
padding: .3em;
}
& > .logo > img {
- height: 1.6em;
+ height: 1.4em;
display: block;
}
& > .show-menu {
@@ -58,19 +58,24 @@ vn-app {
&.padding {
padding-top: $topbar-height;
}
- .index-block {
+ .content-block {
@extend .margin-medium;
+
+ form vn-horizontal {
+ & > * {
+ padding: .2em;
+ }
+ }
}
vn-main-block {
display: block;
margin: 0 auto;
padding-left: $menu-width;
-
- .left-block {
+
+ %side-menu {
+ display: block;
position: fixed;
z-index: 5;
- top: $topbar-height;
- left: 0;
bottom: 0;
width: $menu-width;
min-width: $menu-width;
@@ -78,21 +83,16 @@ vn-app {
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
overflow: auto;
}
- .content-block {
- @extend .margin-medium;
-
- form vn-horizontal {
- & > * {
- padding: .2em;
- }
- }
+ .left-menu {
+ @extend %side-menu;
+ top: $topbar-height;
+ left: 0;
}
- .right-block {
- width: $menu-width;
- min-width: $menu-width;
- padding-left: 1em;
+ .right-menu {
+ @extend %side-menu;
+ top: $topbar-height;
+ right: 0;
}
-
}
}
& > .background {
@@ -118,29 +118,32 @@ vn-app {
}
}
& > .main-view {
- .index-block {
+ .content-block {
margin-left: 0;
margin-right: 0;
+
+ form vn-horizontal {
+ flex-direction: column;
+ }
}
vn-main-block {
padding-left: 0;
- .left-block {
+ %side-menu-mobile {
top: 0;
- transform: translateZ(0) translateX(-$menu-width);
transition: transform 200ms ease-out;
-
+
&.shown {
transform: translateZ(0) translateX(0);
}
}
- .content-block {
- margin-left: 0;
- margin-right: 0;
-
- form vn-horizontal {
- flex-direction: column;
- }
+ .left-menu {
+ @extend %side-menu-mobile;
+ transform: translateZ(0) translateX(-$menu-width);
+ }
+ .right-menu {
+ @extend %side-menu-mobile;
+ transform: translateZ(0) translateX($menu-width);
}
}
}
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index 3e17d36c7..9c299c040 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -28,6 +28,8 @@ Order by: Ordenar por
Order: Orden
Ascendant: Ascendente
Descendant: Descendente
+Add: Añadir
+Remove: Quitar
# Modules
diff --git a/modules/agency/front/card/index.html b/modules/agency/front/card/index.html
index 7e2f11a72..2b981bf29 100644
--- a/modules/agency/front/card/index.html
+++ b/modules/agency/front/card/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/modules/agency/front/create/index.html b/modules/agency/front/create/index.html
index c9630b236..43575d179 100644
--- a/modules/agency/front/create/index.html
+++ b/modules/agency/front/create/index.html
@@ -5,8 +5,8 @@
form="form"
save="post">
-