diff --git a/debian/changelog b/debian/changelog index 754a470c..dc565a78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.212-deb8) stable; urgency=low +hedera-web (1.213-deb8) stable; urgency=low * Initial Release. diff --git a/web/forms/agencies/packages/style.css b/web/forms/agencies/packages/style.css index 7dd6f067..42b69f97 100755 --- a/web/forms/agencies/packages/style.css +++ b/web/forms/agencies/packages/style.css @@ -4,6 +4,6 @@ } .packages .box { - max-width: 50em; + max-width: 40em; margin: 0 auto; } diff --git a/web/forms/agencies/provinces/style.css b/web/forms/agencies/provinces/style.css index ef880af2..cbf4d53f 100755 --- a/web/forms/agencies/provinces/style.css +++ b/web/forms/agencies/provinces/style.css @@ -4,6 +4,6 @@ } .provinces .box { - max-width: 50em; + max-width: 40em; margin: 0 auto; } diff --git a/web/js/htk/column/image.js b/web/js/htk/column/image.js index 9aeee6c9..25a95d29 100755 --- a/web/js/htk/column/image.js +++ b/web/js/htk/column/image.js @@ -83,9 +83,10 @@ Htk.ColumnImage = new Class ,value: this.value ,tr: tr ,error: false + ,stamp: null }; - this.setSrc (cell, true); + this.setSrc (cell); if (this.showFull) { @@ -102,7 +103,7 @@ Htk.ColumnImage = new Class return td; } - ,setSrc: function (cell, useCache) + ,setSrc: function (cell) { if (cell.value) { @@ -113,8 +114,8 @@ Htk.ColumnImage = new Class url += cell.value; - if (!useCache) - url += '?'+ new Date ().getTime (); + if (cell.stamp) + url += '?'+ cell.stamp; cell.img.src = url; } @@ -133,10 +134,14 @@ Htk.ColumnImage = new Class ,onMouseOver: function (cell) { - var fullDir = this._fullDir ? this._fullDir : 'full'; + var src = this._fullDir ? this._fullDir : 'full'; + src += '/'+ cell.value; + + if (cell.stamp) + src += '?'+ cell.stamp; if (!cell.error) - this.fullImage.show (this.basedir +'/'+ fullDir, cell.value); + this.fullImage.show (this.basedir +'/'+ src); } ,onMouseOut: function () @@ -166,13 +171,14 @@ Htk.ColumnImage = new Class ,onNameChange: function (cell, editor, value) { cell.value = value; - this.setSrc (cell, true); + this.setSrc (cell); this.changed (cell.tr, value); } ,onFileUpload: function (cell, editor) { - this.setSrc (cell, false); + cell.stamp = new Date ().getTime (); + this.setSrc (cell); this.popup.hide (); } diff --git a/web/js/htk/full-image.js b/web/js/htk/full-image.js index c4873596..ca30b63f 100755 --- a/web/js/htk/full-image.js +++ b/web/js/htk/full-image.js @@ -42,10 +42,8 @@ Htk.FullImage = new Class return parseInt (Vn.Browser.getPageYOffset () + (Vn.Browser.getInnerHeight () - height) / 2) +'px'; } - ,show: function (basedir, file) - { - var src = basedir +'/'+ file; - + ,show: function (src) + { if (this.closed && this.src == src) return;