diff --git a/client/client/src/basic-data/basic-data.html b/client/client/src/basic-data/basic-data.html index 2ba2c294a..e82ade4f6 100644 --- a/client/client/src/basic-data/basic-data.html +++ b/client/client/src/basic-data/basic-data.html @@ -20,7 +20,7 @@ - + Billing information - - + + - - - + + + - - + + @@ -35,14 +36,14 @@ Documentación - - - + + + - + - + diff --git a/client/client/src/create/locale/es.json b/client/client/src/create/locale/es.json index 456e382cc..aefe3ac37 100644 --- a/client/client/src/create/locale/es.json +++ b/client/client/src/create/locale/es.json @@ -5,5 +5,6 @@ "User name": "Nombre de usuario", "Email": "Correo electrónico", "Create and edit": "Crear y editar", - "Create": "Crear" + "Create": "Crear", + "You can save multiple emails by chaining them using comma without spaces, example: user@domain.com,user2@domain.com the first email will be considered as the main": "Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios, ejemplo: user@dominio.com,user2@dominio.com siendo el primer correo electrónico el principal" } \ No newline at end of file diff --git a/client/core/src/directives/acl.js b/client/core/src/directives/acl.js index bb7657a08..713c61e27 100644 --- a/client/core/src/directives/acl.js +++ b/client/core/src/directives/acl.js @@ -1,8 +1,9 @@ import {module} from '../module'; -function vnAcl(aclService, $compile) { +function vnAcl(aclService, $timeout) { return { restrict: 'A', + priority: -1, link: function($scope, $element, $attrs) { let acls = $attrs.vnAcl.split(','); let action = $attrs.vnAclAction || 'disabled'; @@ -15,8 +16,12 @@ function vnAcl(aclService, $compile) { input = input.querySelector(selector); if (input) { - input.setAttribute("ng-disabled", "true"); - $compile(input)($scope); + $timeout(() => { + input.setAttribute("disabled", "true"); + }); + $element[0].querySelectorAll('i, vn-drop-down').forEach(i => { + i.parentNode.removeChild(i); + }); } } else { $element.remove(); @@ -25,6 +30,6 @@ function vnAcl(aclService, $compile) { } }; } -vnAcl.$inject = ['aclService', '$compile']; +vnAcl.$inject = ['aclService', '$timeout']; module.directive('vnAcl', vnAcl); diff --git a/client/core/src/tooltip/style.css b/client/core/src/tooltip/style.css index 9d27976c0..82c1bd43f 100644 --- a/client/core/src/tooltip/style.css +++ b/client/core/src/tooltip/style.css @@ -5,7 +5,7 @@ display: none; position: fixed; background-color: #fff; - padding: 15px; + padding: 20px; color: #424242; z-index: 999; border: 1px solid #A7A7A7; @@ -23,7 +23,7 @@ } .tooltip-text{ - max-width: 250px; + max-width: 320px; } .tooltip-down .tooltip-arrow { @@ -60,4 +60,4 @@ border-top: 10px solid transparent; border-bottom: 10px solid transparent; border-left: 15px solid #A7A7A7; -} \ No newline at end of file +}