diff --git a/@salix/app/src/components/main-menu/main-menu.html b/@salix/app/src/components/main-menu/main-menu.html index cc39d6c75..981e64bc1 100644 --- a/@salix/app/src/components/main-menu/main-menu.html +++ b/@salix/app/src/components/main-menu/main-menu.html @@ -1,9 +1,14 @@
- exit_to_app - apps - notifications - account_circle -
\ No newline at end of file diff --git a/@salix/app/src/components/main-menu/main-menu.js b/@salix/app/src/components/main-menu/main-menu.js index aa20ba198..e9c1e4626 100644 --- a/@salix/app/src/components/main-menu/main-menu.js +++ b/@salix/app/src/components/main-menu/main-menu.js @@ -6,8 +6,7 @@ export const NAME = 'vnMainMenu'; export const COMPONENT = { template: template, controllerAs: "mainMenu", - controller: function () - { + controller: function() { this.onLogoutClick = function () { let appName = 'salix'; diff --git a/@salix/app/src/components/main-menu/style.css b/@salix/app/src/components/main-menu/style.css index 73fc9ec51..16424cb10 100644 --- a/@salix/app/src/components/main-menu/style.css +++ b/@salix/app/src/components/main-menu/style.css @@ -1,9 +1,10 @@ -vn-main-menu i { +vn-main-menu vn-icon { padding: .1em; border-radius: .1em; vertical-align: middle; + font-size: 24px; } -vn-main-menu i:hover { +vn-main-menu vn-icon:hover { cursor: pointer; opacity: .85; } \ No newline at end of file diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js index 52c973f65..ee4349ac3 100644 --- a/@salix/core/src/core.js +++ b/@salix/core/src/core.js @@ -43,3 +43,9 @@ export {NAME as DATE_PICKER_MDL, factory as datePickerMdl} from './date-picker/d export {NAME as TITLE, COMPONENT as TITLE_COMPONENT} from './title/title' export {NAME as SUBTITLE, COMPONENT as SUBTITLE_COMPONENT} from './subtitle/subtitle' + +export {directive as Popover} from './popover/popover'; +export {factory as PopoverMdl} from './popover/popover.mdl'; + +export {directive as Icon} from './icon/icon'; +export {factory as IconMdl} from './icon/icon.mdl'; diff --git a/@salix/core/src/focus.js b/@salix/core/src/focus.js index 196c904f3..72c4cb664 100644 --- a/@salix/core/src/focus.js +++ b/@salix/core/src/focus.js @@ -4,12 +4,10 @@ export const NAME = 'vnFocus'; export function directive() { return { restrict: 'A', - link: function (scope, elements, attrs){ + link: function(scope, elements, attrs){ let element = elements[0]; element.focus(); - let len = element.value ? element.value.length : 0; - element.setSelectionRange(0, len); - //element.select(); + element.select(); } }; } diff --git a/@salix/core/src/icon/icon.js b/@salix/core/src/icon/icon.js new file mode 100644 index 000000000..185b79a5f --- /dev/null +++ b/@salix/core/src/icon/icon.js @@ -0,0 +1,17 @@ +import {module} from '../module'; +import * as resolveFactory from '../resolveDefaultComponents'; + +const _NAME = 'icon'; +export const NAME = 'vnIcon'; + +export function directive(resolver) { + return { + restrict: 'E', + template: function(_, attrs) { + return resolver.getTemplate(_NAME, attrs); + } + } +} +directive.$inject = [resolveFactory.NAME]; + +module.directive(NAME, directive); diff --git a/@salix/core/src/icon/icon.mdl.html b/@salix/core/src/icon/icon.mdl.html new file mode 100644 index 000000000..42a9d6328 --- /dev/null +++ b/@salix/core/src/icon/icon.mdl.html @@ -0,0 +1 @@ +*[icon]* diff --git a/@salix/core/src/icon/icon.mdl.js b/@salix/core/src/icon/icon.mdl.js new file mode 100644 index 000000000..f5eba7800 --- /dev/null +++ b/@salix/core/src/icon/icon.mdl.js @@ -0,0 +1,12 @@ +import {module} from '../module'; +import template from './icon.mdl.html'; + +export const NAME = 'vnIconMdlFactory'; +export function factory() { + return { + template: template, + default: {} + } +} + +module.factory(NAME, factory); diff --git a/@salix/core/src/popover/popover.js b/@salix/core/src/popover/popover.js new file mode 100644 index 000000000..21d212315 --- /dev/null +++ b/@salix/core/src/popover/popover.js @@ -0,0 +1,23 @@ +import {module} from '../module'; +import * as resolveFactory from '../resolveDefaultComponents'; + +const _NAME = 'popover'; +export const NAME = 'vnPopover'; + +export function directive(resolver) { + return { + restrict: 'E', + transclude: true, + template: function(_, attrs) { + return resolver.getTemplate(_NAME, attrs); + }, + controller: function () { + this.onClick = function (event) { + event.stopPropagation(); + } + } + } +} +directive.$inject = [resolveFactory.NAME]; + +module.directive(NAME, directive); diff --git a/@salix/core/src/popover/popover.mdl.html b/@salix/core/src/popover/popover.mdl.html new file mode 100644 index 000000000..01cd51cc0 --- /dev/null +++ b/@salix/core/src/popover/popover.mdl.html @@ -0,0 +1,7 @@ +
+
\ No newline at end of file diff --git a/@salix/core/src/popover/popover.mdl.js b/@salix/core/src/popover/popover.mdl.js new file mode 100644 index 000000000..4ad5b71cf --- /dev/null +++ b/@salix/core/src/popover/popover.mdl.js @@ -0,0 +1,12 @@ +import {module} from '../module'; +import template from './popover.mdl.html'; + +export const NAME = 'vnPopoverMdlFactory'; +export function factory() { + return { + template: template, + default: {} + } +} + +module.factory(NAME, factory); diff --git a/@salix/core/src/util.js b/@salix/core/src/util.js index 5206d3768..0c00b60de 100644 --- a/@salix/core/src/util.js +++ b/@salix/core/src/util.js @@ -2,7 +2,6 @@ import * as constant from './constants'; const FACTORY = 'Factory'; const SERVICE = 'Service'; -const DEFAULT = 'default'; export function getName(name) { return constant.PREFIX + toUpperCamelCase(name) diff --git a/@salix/crud/src/client/fiscal-data/index.html b/@salix/crud/src/client/fiscal-data/index.html index bd5f1fc6d..f0ebbe96e 100644 --- a/@salix/crud/src/client/fiscal-data/index.html +++ b/@salix/crud/src/client/fiscal-data/index.html @@ -23,8 +23,7 @@ -
-
Información de facturación
+ Información de facturación @@ -36,8 +35,7 @@ -
-
Documentación
+ Documentación