diff --git a/forms/admin/access-log/ui.xml b/forms/admin/access-log/ui.xml index 1fabbeaa..39e6524b 100755 --- a/forms/admin/access-log/ui.xml +++ b/forms/admin/access-log/ui.xml @@ -1,6 +1,6 @@ - + SELECT Id_Cliente, Cliente, Telefono, movil FROM vn2008.Clientes WHERE Id_Cliente = #user @@ -13,21 +13,21 @@

- + {{client.Id_Cliente}}

- + {{client.Cliente}}

- + {{client.Telefono}}

- + {{client.movil}}

- + SELECT u.stamp, a.platform, a.browser, a.version, a.javascript, a.cookies FROM visitUser u @@ -43,9 +43,7 @@

- - - - + {{platform}} - {{browser}} {{version}}

diff --git a/forms/admin/photos/photos.js b/forms/admin/photos/photos.js index 3504c7eb..eca5a280 100644 --- a/forms/admin/photos/photos.js +++ b/forms/admin/photos/photos.js @@ -176,7 +176,7 @@ Hedera.Photos = new Class ,onClearClick: function () { this.filesData = []; - Vn.Node.removeChilds (this.$.file-list); + Vn.Node.removeChilds (this.$.fileList); } ,onDropzoneClick: function () diff --git a/forms/admin/users/users.js b/forms/admin/users/users.js index acb8f491..a60c8f01 100644 --- a/forms/admin/users/users.js +++ b/forms/admin/users/users.js @@ -3,9 +3,9 @@ Hedera.Users = new Class ({ Extends: Hedera.Form - ,onChangeUserClick: function (button, form) + ,onChangeUserClick: function (button) { - this.gui.supplantUser (form.$.name, + this.gui.supplantUser (button.value, this.onUserSupplant.bind (this)); } diff --git a/forms/admin/visits/ui.xml b/forms/admin/visits/ui.xml index ebbfc644..eb89ef15 100755 --- a/forms/admin/visits/ui.xml +++ b/forms/admin/visits/ui.xml @@ -1,4 +1,8 @@ + + + +

_Visits

@@ -16,11 +20,11 @@
- +
- +
@@ -31,19 +35,19 @@ model="visits" column-name="visits"/> - _visits, + _visits, - _news + _news

- + SELECT browser ,MIN(CAST(version AS DECIMAL(4,1))) minVersion ,MAX(CAST(version AS DECIMAL(4,1))) maxVersion @@ -64,10 +68,7 @@ {{browser}} {{minVersion}} - {{maxVersion}}

- - _visits, - - _news + {{visits}} _visits, {{newVisits}} _news

diff --git a/forms/cms/home/ui.xml b/forms/cms/home/ui.xml index 6c4f245c..b1724c30 100755 --- a/forms/cms/home/ui.xml +++ b/forms/cms/home/ui.xml @@ -11,7 +11,7 @@

- + SELECT title, text, image, id FROM news WHERE tag != 'course' @@ -21,15 +21,15 @@
-

{{new.title}}

+

{{title}}

- +
diff --git a/forms/cms/training/ui.xml b/forms/cms/training/ui.xml index 1ec985b7..1536f436 100755 --- a/forms/cms/training/ui.xml +++ b/forms/cms/training/ui.xml @@ -14,19 +14,18 @@
-

+

{{title}}

- +
diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index 4ef9d95e..1e06b6d8 100755 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -170,7 +170,7 @@
_Make a transfer to one account. - + SELECT description, iban, entity_id, office, dc, number FROM vn2008.account_customer c @@ -178,14 +178,12 @@ diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml index c3d0f9b9..d46a8a5e 100755 --- a/forms/ecomerce/ticket/ui.xml +++ b/forms/ecomerce/ticket/ui.xml @@ -27,7 +27,7 @@

- Delivery {{ticket.Agencia}} + _Delivery {{ticket.Agencia}}

{{ticket.consignee}} diff --git a/forms/news/news/news.js b/forms/news/news/news.js index d2525976..c5cf6d17 100644 --- a/forms/news/news/news.js +++ b/forms/news/news/news.js @@ -3,17 +3,17 @@ Hedera.News = new Class ({ Extends: Hedera.Form - ,onDeleteClick: function (button, form, event) + ,onDeleteClick: function (button) { if (confirm (_('ReallyDelete'))) - form.deleteRow (); + button.lot.deleteRow (); } - ,repeaterFunc: function (res, form) + ,repeaterFunc: function (res, lot) { res.$.link.href = this.hash.make ({ form: 'news/new', - new: form.$.id + new: lot.$.id }); } diff --git a/forms/news/news/ui.xml b/forms/news/news/ui.xml index 1178e256..09391e99 100755 --- a/forms/news/news/ui.xml +++ b/forms/news/news/ui.xml @@ -22,7 +22,6 @@

@@ -43,8 +42,7 @@ {{Cliente}}

- _Priority - + _Priority {{priority}}

diff --git a/js/db/model.js b/js/db/model.js index 3a531f47..1c43b28a 100644 --- a/js/db/model.js +++ b/js/db/model.js @@ -294,9 +294,10 @@ Klass.implement if (this._filter && (!params || params.filter === undefined)) myParams.filter = this._filter; + this._lastLotParams = lotParams; + if (this._isReady (myParams)) { - this._lastLotParams = lotParams; this._setStatus (Status.LOADING); this._conn.execStmt (this._stmt, this._selectDone.bind (this), myParams); } diff --git a/js/hedera/gui.css b/js/hedera/gui.css index 2aeeb477..488b1824 100644 --- a/js/hedera/gui.css +++ b/js/hedera/gui.css @@ -284,20 +284,6 @@ height: inherit; border: 1px solid transparent; box-sizing: border-box; - - opacity: 0; - transform: translateZ(0) translateX(-2em); - -webkit-transform: translateZ(0) translateX(-2em); - - transition-property: opacity, transform; - transition-timing-function: ease-out; - transition-duration: 200ms; -} -.vn-gui .form-holder > .slide -{ - opacity: 1; - transform: translateZ(0) translateX(0em); - -webkit-transform: translateZ(0) translateX(0em); } } /*+++++++++ Screen end */ diff --git a/js/hedera/gui.js b/js/hedera/gui.js index 4df02091..0b87644e 100644 --- a/js/hedera/gui.js +++ b/js/hedera/gui.js @@ -2,6 +2,7 @@ var Tpl = require ('./gui.xml'); var Module = require ('./module'); var Form = require ('./form'); +var transitions = require ('vn/transitions'); require ('./gui.css'); @@ -442,15 +443,10 @@ module.exports = new Class div.appendChild (form); this.$.formHolder.appendChild (div); - setTimeout (this._onSetFormTimeout.bind (this), 10); + transitions.move (div); } } - ,_onSetFormTimeout: function () - { - Vn.Node.addClass (this.$.formHolder.firstChild, 'slide'); - } - ,setTitle: function (title) { Vn.Node.setChild (this.$.title, title); diff --git a/js/hedera/social-bar.js b/js/hedera/social-bar.js index 116ba66f..44af585a 100644 --- a/js/hedera/social-bar.js +++ b/js/hedera/social-bar.js @@ -72,4 +72,3 @@ module.exports = new Class }, this); } }); - diff --git a/js/htk/field/calendar.js b/js/htk/field/calendar.js index 5702a9b3..594ce774 100644 --- a/js/htk/field/calendar.js +++ b/js/htk/field/calendar.js @@ -1,5 +1,5 @@ -var slide = require ('vn/transitions').slide; +var transitions = require ('vn/transitions'); module.exports = new Class ({ @@ -282,6 +282,6 @@ module.exports = new Class ,refreshSlide: function (way) { var cb = this.refresh.bind (this); - slide (this.table, way, cb); + transitions.slide (this.table, way, cb); } }); diff --git a/js/htk/field/image.js b/js/htk/field/image.js index cb291031..5b72c71b 100644 --- a/js/htk/field/image.js +++ b/js/htk/field/image.js @@ -156,11 +156,11 @@ module.exports = new Class this._error = false; this.img.src = this._makeSrc (this._subdir); } - else - delete this.img.src; + else if (this.img.src != '') + this.img.src = ''; } - ,putValue: function (value) + ,putValue: function () { this._refreshSrc (); } diff --git a/js/htk/style.css b/js/htk/style.css index f7b50dc4..58ea0a71 100644 --- a/js/htk/style.css +++ b/js/htk/style.css @@ -646,25 +646,6 @@ td.cell-image .htk-image border-left-color: white; } -/* Transitions */ - -.slide -{ - transition: transform 100ms; -} -.slide-right -{ - transform: translate3d(20em, 0, 0); -} -.slide-left -{ - transform: translate3d(-20em, 0, 0); -} -.slide-return -{ - transform: translate3d(0, 0, 0); -} - } /*+++++++++ Screen end */ @keyframes spinner diff --git a/js/vn/transitions.css b/js/vn/transitions.css new file mode 100644 index 00000000..9141fdce --- /dev/null +++ b/js/vn/transitions.css @@ -0,0 +1,39 @@ + +.slide +{ + transition: transform 100ms; +} +.slide-right +{ + transform: translate3d(20em, 0, 0); + -webkit-transform: translate3d(20em, 0, 0); +} +.slide-left +{ + transform: translate3d(-20em, 0, 0); + -webkit-transform: translate3d(-20em, 0, 0); +} +.slide-return +{ + transform: translate3d(0, 0, 0); + -webkit-transform: translate3d(0, 0, 0); +} + +.move +{ + transition-property: opacity, transform; + transition-timing-function: ease-out; + transition-duration: 200ms; +} +.move-start +{ + opacity: 0; + transform: translate3d(-2em, 0, 0); + -webkit-transform: translate3d(-2em, 0, 0); +} +.move-end +{ + opacity: 1; + transform: translate3d(0, 0, 0); + -webkit-transform: translate3d(0, 0, 0); +} diff --git a/js/vn/transitions.js b/js/vn/transitions.js index 35d80fc9..29bef020 100644 --- a/js/vn/transitions.js +++ b/js/vn/transitions.js @@ -1,11 +1,13 @@ +require ('./transitions.css'); var VnNode = require ('./node'); var transition = checkTransitions (); module.exports = { transition: transition, - slide: slide + slide: slide, + move: move }; /** @@ -73,3 +75,30 @@ function slide (node, way, cb) VnNode.removeClass (node, 'slide'); } } + +/** + * Moves an element. + * + * @param {Node} node The element to move + */ +function move (node) +{ + if (transition === null) + return; + + Vn.Node.addClass (node, 'move-start'); + setTimeout (slideTimeout, 20); + + function slideTimeout () + { + Vn.Node.removeClass (node, 'move-start'); + Vn.Node.addClass (node, 'move-end move'); + node.addEventListener ('transitionend', onTransitionEnd); + } + + function onTransitionEnd () + { + Vn.Node.removeClass (node, 'move-end'); + Vn.Node.removeClass (node, 'move'); + } +}