From 8e437f983754e92484afb2f3112bedf2c9234932 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 9 Feb 2017 08:18:50 +0100 Subject: [PATCH 1/7] iconbutton cuadrado --- client/core/src/mdl-override.css | 3 ++- services/nginx/logs/error.log | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/core/src/mdl-override.css b/client/core/src/mdl-override.css index 63b8ab01e1..64a9a54c4f 100644 --- a/client/core/src/mdl-override.css +++ b/client/core/src/mdl-override.css @@ -6,7 +6,8 @@ .mdl-button { font-weight: bolder; color: #ffa410; - + height: auto; + min-width: auto; } .mdl-button--colored { color: white !important; diff --git a/services/nginx/logs/error.log b/services/nginx/logs/error.log index 2df222ca96..ef61857f83 100644 --- a/services/nginx/logs/error.log +++ b/services/nginx/logs/error.log @@ -65,3 +65,6 @@ 2017/02/07 07:05:55 [error] 3804#4508: OpenEvent("Global\ngx_stop_6996") failed (2: FormatMessage() error:(15100)) 2017/02/07 12:56:15 [notice] 9668#8064: signal process started 2017/02/08 12:53:38 [emerg] 9856#11204: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) +2017/02/09 07:03:43 [emerg] 8040#7512: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) +2017/02/09 07:08:15 [emerg] 7312#12216: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) +2017/02/09 08:11:07 [emerg] 5132#5820: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) From c7150c2e7dcc1e0ca7b44bdd3db4c4b8e795bc65 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 9 Feb 2017 08:20:59 +0100 Subject: [PATCH 2/7] icon button cuadrado --- client/core/src/mdl-override.css | 1 - 1 file changed, 1 deletion(-) diff --git a/client/core/src/mdl-override.css b/client/core/src/mdl-override.css index 64a9a54c4f..e79254a603 100644 --- a/client/core/src/mdl-override.css +++ b/client/core/src/mdl-override.css @@ -1,7 +1,6 @@ .mdl-textfield { width: 100%; } - /* TODO: No utilizar !important */ .mdl-button { font-weight: bolder; From 72652454cf81573a4f36439217d0b08660466d6d Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 9 Feb 2017 13:59:29 +0100 Subject: [PATCH 3/7] popover menu clientes --- client/core/src/label/label.mdl.js | 2 +- .../salix/src/components/main-menu/main-menu.html | 15 ++++++++++++--- client/salix/src/styles/display.css | 11 +++++++++++ debug.log | 2 ++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 debug.log diff --git a/client/core/src/label/label.mdl.js b/client/core/src/label/label.mdl.js index 8b656127c4..0f66320d73 100644 --- a/client/core/src/label/label.mdl.js +++ b/client/core/src/label/label.mdl.js @@ -14,7 +14,7 @@ export function factory() { default: { text: DEFAULT_TEXT } - } + }; } _module.factory(NAME, factory); diff --git a/client/salix/src/components/main-menu/main-menu.html b/client/salix/src/components/main-menu/main-menu.html index dff65a946a..d1f3184c8d 100644 --- a/client/salix/src/components/main-menu/main-menu.html +++ b/client/salix/src/components/main-menu/main-menu.html @@ -9,7 +9,16 @@ --> -
    - + - \ No newline at end of file + diff --git a/client/salix/src/styles/display.css b/client/salix/src/styles/display.css index 442c0e6db9..36b516ebcf 100644 --- a/client/salix/src/styles/display.css +++ b/client/salix/src/styles/display.css @@ -50,3 +50,14 @@ } ul.pagination li a:hover:not(.active) {background-color: #ddd;} /* fin angular-paging*/ + +/* label del popover */ +.popover-button{ + padding: 3px 3px 3px 0px; +} +.popover-label{ + font-weight: bold; + color: black; + padding-top:5px; +} +/* label del popover */ diff --git a/debug.log b/debug.log new file mode 100644 index 0000000000..a12fff211b --- /dev/null +++ b/debug.log @@ -0,0 +1,2 @@ +[0209/112844:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004 +[0209/112844:ERROR:node_debugger.cc(86)] Cannot start debugger server From 5cb312949519d5a3da7d95cce897398f649e5323 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 9 Feb 2017 14:20:46 +0100 Subject: [PATCH 4/7] Errores --- client/core/src/mdl-override.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/core/src/mdl-override.css b/client/core/src/mdl-override.css index e79254a603..b29cc68d95 100644 --- a/client/core/src/mdl-override.css +++ b/client/core/src/mdl-override.css @@ -5,8 +5,6 @@ .mdl-button { font-weight: bolder; color: #ffa410; - height: auto; - min-width: auto; } .mdl-button--colored { color: white !important; From 7313bda159e0ed2c241e6ec8fda3eae7dce91ae2 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 9 Feb 2017 14:44:04 +0100 Subject: [PATCH 5/7] Cambios css --- client/salix/src/styles/display.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/salix/src/styles/display.css b/client/salix/src/styles/display.css index 36b516ebcf..4a4dba1e1b 100644 --- a/client/salix/src/styles/display.css +++ b/client/salix/src/styles/display.css @@ -54,6 +54,8 @@ ul.pagination li a:hover:not(.active) {background-color: #ddd;} /* label del popover */ .popover-button{ padding: 3px 3px 3px 0px; + height: auto; + min-width: auto; } .popover-label{ font-weight: bold; From 6302ad53b2ea3bc1447737c801d7a45206ffb4e3 Mon Sep 17 00:00:00 2001 From: nelo Date: Wed, 15 Feb 2017 14:56:44 +0100 Subject: [PATCH 6/7] aspa en inputs --- client/core/src/textfield/style.css | 11 ++++++ client/core/src/textfield/textfield.js | 35 ++++++++++++++++++-- client/core/src/textfield/textfield.mdl.html | 8 ++++- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 client/core/src/textfield/style.css diff --git a/client/core/src/textfield/style.css b/client/core/src/textfield/style.css new file mode 100644 index 0000000000..78137af7ce --- /dev/null +++ b/client/core/src/textfield/style.css @@ -0,0 +1,11 @@ +.mdl-chip__action{ + position: absolute; + top: 0px; + right: -6px; + margin: 22px 0px; + visibility: hidden; +} + +.material-icons{ + font-size: 18px; +} \ No newline at end of file diff --git a/client/core/src/textfield/textfield.js b/client/core/src/textfield/textfield.js index c08d4cb2b1..09a61ead97 100644 --- a/client/core/src/textfield/textfield.js +++ b/client/core/src/textfield/textfield.js @@ -2,12 +2,13 @@ import {module as _module} from '../module'; import * as resolveFactory from '../lib/resolveDefaultComponents'; import * as normalizerFactory from '../lib/inputAttrsNormalizer'; import * as util from '../lib/util'; +require('./style.css'); const _NAME = 'textfield'; export const NAME = util.getName(_NAME); -directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; -export function directive(resolve, normalizer) { +directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME, '$parse']; +export function directive(resolve, normalizer, $parse) { return { restrict: 'E', template: function(_, attrs) { @@ -21,6 +22,36 @@ export function directive(resolve, normalizer) { mdlField.updateClasses_(); }); componentHandler.upgradeElement(element[0].firstChild); + + scope.clickClear = function(model) { + setTimeout(() => { + scope.$apply(function() { + $parse(model).assign(scope, ""); + }); + }); + }; + scope.onFocusInput = function(model, event) { + var buttonClear = event.target.parentNode.querySelector("button"); + checkModelValue(buttonClear, model); + }; + scope.onBlurInput = function(event) { + var buttonClear = event.target.parentNode.querySelector("button"); + setTimeout(() => { + buttonClear.style.visibility = "hidden"; + }, 80); + }; + element.on('input', function() { + var buttonClear = this.querySelector("button"); + var model = this.querySelector("input").value; + checkModelValue(buttonClear, model); + }); + + function checkModelValue(buttonClear, model) { + if (model !== undefined && model !== "") + buttonClear.style.visibility = "visible"; + else + buttonClear.style.visibility = "hidden"; + } } }; } diff --git a/client/core/src/textfield/textfield.mdl.html b/client/core/src/textfield/textfield.mdl.html index 1367b95575..f88b599493 100644 --- a/client/core/src/textfield/textfield.mdl.html +++ b/client/core/src/textfield/textfield.mdl.html @@ -5,6 +5,12 @@ name="*[name]*" ng-model="*[model]*" vn-validation="*[rule]*" - *[enabled]*/> + *[enabled]* + ng-focus="onFocusInput(*[model]*, $event)" + ng-blur="onBlurInput($event)" + /> + From 1f5fe03b8100d47d7a2b2797f1d0b0b99aade6d7 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Thu, 16 Feb 2017 08:16:59 +0100 Subject: [PATCH 7/7] icon cuadrado --- .vscode/settings.json | 2 +- client/core/src/icon-button/icon-button.mdl.html | 2 +- client/salix/src/styles/display.css | 7 ++++++- services/nginx/logs/error.log | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7197067d15..b88a6ec8c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,5 @@ { // Carácter predeterminado de final de línea. "files.eol": "\n", - "vsicons.presets.angular": true + "vsicons.presets.angular": false } \ No newline at end of file diff --git a/client/core/src/icon-button/icon-button.mdl.html b/client/core/src/icon-button/icon-button.mdl.html index bee2a4aafd..3b8763a59e 100644 --- a/client/core/src/icon-button/icon-button.mdl.html +++ b/client/core/src/icon-button/icon-button.mdl.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/client/salix/src/styles/display.css b/client/salix/src/styles/display.css index 4a4dba1e1b..6a9a845ea4 100644 --- a/client/salix/src/styles/display.css +++ b/client/salix/src/styles/display.css @@ -62,4 +62,9 @@ ul.pagination li a:hover:not(.active) {background-color: #ddd;} color: black; padding-top:5px; } -/* label del popover */ +/*icon cuadrado */ +.icon-square{ + min-width: 0px; + height: 46px; + line-height: 0px; +} diff --git a/services/nginx/logs/error.log b/services/nginx/logs/error.log index ef61857f83..3b1f945dd9 100644 --- a/services/nginx/logs/error.log +++ b/services/nginx/logs/error.log @@ -68,3 +68,5 @@ 2017/02/09 07:03:43 [emerg] 8040#7512: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) 2017/02/09 07:08:15 [emerg] 7312#12216: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) 2017/02/09 08:11:07 [emerg] 5132#5820: CreateFile() "C:\Users\vfalco\Documents\vscode\salix\services\nginx/temp/error.log" failed (5: FormatMessage() error:(15100)) +2017/02/16 07:47:56 [notice] 2136#2844: signal process started +2017/02/16 07:47:56 [error] 2136#2844: OpenEvent("Global\ngx_stop_10744") failed (2: FormatMessage() error:(15100))