verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge

This commit is contained in:
Juan Ferrer Toribio 2017-02-21 11:41:30 +01:00
parent c694f00644 1f5fe03b81
commit 139cc770a5
11 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ node_modules
spliting.js
build
npm-debug.log
debug.log

2
.vscode/settings.json vendored
View File

@ -2,5 +2,5 @@
{
// Carácter predeterminado de final de línea.
"files.eol": "\n",
"vsicons.presets.angular": true
"vsicons.presets.angular": false
}

2
client/core/src/icon-button/icon-button.mdl.html
View File

@ -1,3 +1,3 @@
<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored *[className]*" *[enabled]*>
<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-square *[className]*" *[enabled]*>
<vn-icon icon="*[icon]*"></vn-icon>*[label]*
</button>

2
client/core/src/label/label.mdl.js
View File

@ -14,7 +14,7 @@ export function factory() {
default: {
text: DEFAULT_TEXT
}
}
};
}
_module.factory(NAME, factory);

2
client/core/src/mdl-override.css
View File

@ -1,12 +1,10 @@
.mdl-textfield {
width: 100%;
}
/* TODO: No utilizar !important */
.mdl-button {
font-weight: bolder;
color: #ffa410;
}
.mdl-button--colored {
color: white !important;

11
client/core/src/textfield/style.css Normal file
View File

@ -0,0 +1,11 @@
.mdl-chip__action{
position: absolute;
top: 0px;
right: -6px;
margin: 22px 0px;
visibility: hidden;
}
.material-icons{
font-size: 18px;
}

35
client/core/src/textfield/textfield.js
View File

@ -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";
}
}
};
}

8
client/core/src/textfield/textfield.mdl.html
View File

@ -5,6 +5,12 @@
name="*[name]*"
ng-model="*[model]*"
vn-validation="*[rule]*"
*[enabled]*/>
*[enabled]*
ng-focus="onFocusInput(*[model]*, $event)"
ng-blur="onBlurInput($event)"
/>
<button type="button" class="mdl-chip__action" ng-click="clickClear('*[model]*')">
<i class="material-icons">cancel</i>
</button>
<label class="mdl-textfield__label" translate>*[label]*</label>
</div>

13
client/salix/src/components/main-menu/main-menu.html
View File

@ -9,7 +9,16 @@
<a ui-sref="clients"><vn-icon icon=""></vn-icon></a>
</vn-popover>
-->
<ul class="mdl-menu mdl-js-menu mdl-menu--bottom-right user-menu" pad-medium for="apps">
<a ui-sref="clients"><vn-icon icon="person"></vn-icon></a>
<ul class="mdl-menu mdl-js-menu mdl-menu--bottom-right" pad-medium for="apps">
<vn-horizontal>
<vn-vertical>
<a ui-sref="clients">
<button vn-one class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored popover-button">
<vn-icon vn-one icon="person" style="font-size:40px"></vn-icon>
</button>
</a>
<vn-label class="popover-label" text="Clientes"></vn-label>
</vn-vertical>
</vn-horizontal>
</ul>
</div>

19
client/salix/src/styles/display.css
View File

@ -13,3 +13,22 @@
.form-group {
margin-bottom: 15px;
}
/* Label del popover */
.popover-button{
padding: 3px 3px 3px 0px;
height: auto;
min-width: auto;
}
.popover-label{
font-weight: bold;
color: black;
padding-top:5px;
}
/* Icon cuadrado */
.icon-square{
min-width: 0px;
height: 46px;
line-height: 0px;
}

67
services/nginx/logs/error.log
View File

@ -1,67 +0,0 @@
2016/12/28 09:50:24 [notice] 5196#5988: signal process started
2016/12/28 10:09:41 [notice] 11168#10432: signal process started
2016/12/28 14:03:31 [notice] 10312#9012: signal process started
2016/12/28 14:04:01 [notice] 9996#32: signal process started
2016/12/28 14:08:07 [notice] 7984#8980: signal process started
2016/12/28 14:13:33 [notice] 10144#6644: signal process started
2016/12/28 14:44:57 [notice] 3248#9176: signal process started
2017/01/02 09:41:56 [notice] 9224#8900: signal process started
2017/01/02 10:05:09 [notice] 2788#8880: signal process started
2017/01/02 11:46:35 [notice] 8308#7808: signal process started
2017/01/02 12:45:38 [notice] 8064#2328: signal process started
2017/01/02 12:58:52 [notice] 6156#4768: signal process started
2017/01/02 12:59:47 [notice] 9624#10876: signal process started
2017/01/02 13:00:51 [notice] 12020#492: signal process started
2017/01/02 13:01:46 [notice] 9952#2156: signal process started
2017/01/02 13:02:34 [notice] 7640#11040: signal process started
2017/01/02 13:50:13 [notice] 9664#12012: signal process started
2017/01/02 13:52:56 [notice] 9852#896: signal process started
2017/01/02 13:55:03 [notice] 9276#9396: signal process started
2017/01/02 14:59:17 [notice] 5308#5320: signal process started
2017/01/03 09:01:30 [notice] 11600#11856: signal process started
2017/01/03 09:03:51 [notice] 12180#7128: signal process started
2017/01/03 09:10:23 [notice] 10312#10316: signal process started
2017/01/03 09:10:23 [error] 10312#10316: OpenEvent("Global\ngx_stop_7928") failed (2: FormatMessage() error:(15100))
2017/01/04 10:26:40 [notice] 4504#9428: signal process started
2017/01/04 14:07:17 [notice] 11868#5492: signal process started
2017/01/09 11:53:09 [notice] 11240#10704: signal process started
2017/01/09 12:44:02 [notice] 11056#1952: signal process started
2017/01/10 07:17:14 [notice] 8528#7668: signal process started
2017/01/10 07:37:36 [notice] 10004#6120: signal process started
2017/01/10 07:40:59 [notice] 9720#5092: signal process started
2017/01/10 07:54:19 [notice] 8504#5184: signal process started
2017/01/10 08:07:03 [notice] 10248#584: signal process started
2017/01/10 08:11:07 [notice] 12044#12168: signal process started
2017/01/10 08:14:43 [notice] 5184#10924: signal process started
2017/01/10 08:24:48 [notice] 8584#2932: signal process started
2017/01/10 09:05:08 [notice] 7700#11068: signal process started
2017/01/10 09:16:23 [notice] 5476#9244: signal process started
2017/01/10 09:29:47 [notice] 5512#1644: signal process started
2017/01/10 09:34:14 [notice] 8724#8608: signal process started
2017/01/10 10:51:29 [notice] 7236#9764: signal process started
2017/01/10 10:54:19 [notice] 11368#8376: signal process started
2017/01/10 12:26:32 [notice] 6916#8152: signal process started
2017/01/11 14:07:56 [notice] 9308#5756: signal process started
2017/01/11 14:08:53 [notice] 8600#6600: signal process started
2017/01/13 13:15:39 [notice] 9764#10160: signal process started
2017/01/13 13:15:39 [error] 9764#10160: OpenEvent("Global\ngx_stop_5224") failed (2: FormatMessage() error:(15100))
2017/01/13 15:01:49 [notice] 4688#4208: signal process started
2017/01/13 15:25:59 [notice] 10896#6992: signal process started
2017/01/13 15:29:26 [notice] 2412#10456: signal process started
2017/01/13 15:37:25 [notice] 5088#9876: signal process started
2017/01/16 07:49:58 [notice] 9028#8132: signal process started
2017/01/16 08:26:22 [notice] 1256#3772: signal process started
2017/01/17 13:27:35 [notice] 7104#204: signal process started
2017/01/17 13:38:00 [notice] 1592#8484: signal process started
2017/02/03 11:15:49 [notice] 4528#1708: signal process started
2017/02/03 11:26:13 [notice] 11816#3532: signal process started
2017/02/03 11:29:20 [notice] 10596#10772: signal process started
2017/02/03 11:48:22 [notice] 11236#6496: signal process started
2017/02/06 12:27:21 [notice] 8676#5728: signal process started
2017/02/06 12:27:21 [error] 8676#5728: OpenEvent("Global\ngx_stop_6316") failed (2: FormatMessage() error:(15100))
2017/02/06 12:28:24 [notice] 9840#6896: signal process started
2017/02/06 14:34:18 [notice] 6568#9564: signal process started
2017/02/07 07:05:55 [notice] 3804#4508: signal process started
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))