verdnatura/hedera-web
verdnatura
/
hedera-web
0
1
Fork 2
Code Issues Pull Requests 3 Releases Wiki Activity

Errores solucionados

This commit is contained in:
Juan Ferrer Toribio 2016-04-26 16:20:28 +02:00
parent 2ccfde72d7
commit 680eb9264a
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,8 +1,4 @@
<<<<<<< HEAD hedera-web (1.326-deb8) stable; urgency=low
hedera-web (1.245-deb8) stable; urgency=low
=======
hedera-web (1.324-deb8) stable; urgency=low
>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
* Initial Release. * Initial Release.

2
lib/vn/tpv/tpv.php
View File

@ -19,7 +19,7 @@ class Tpv
{ {
global $conf; global $conf;
require (Hedera\_CONFIG_DIR .'/config.my.php'); $conf = require (Hedera\_CONFIG_DIR .'/config.my.php');
openlog ('hedera-web', LOG_ODELAY, LOG_LOCAL0); openlog ('hedera-web', LOG_ODELAY, LOG_LOCAL0);

6
web/forms/ecomerce/catalog/style.css
View File

@ -212,6 +212,7 @@
.catalog .item-info > h2 .catalog .item-info > h2
{ {
font-weight: normal; font-weight: normal;
font-size: 1.1em;
} }
.catalog .item-info > p .catalog .item-info > p
{ {
@ -223,9 +224,11 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
.grid-view .item-info > .producer .catalog .item-info > .producer
{ {
text-transform: uppercase; text-transform: uppercase;
font-weight: bold;
padding: .15em 0;
} }
.catalog .item-info > .htk-button .catalog .item-info > .htk-button
{ {
@ -358,7 +361,6 @@
} }
.grid-view .item-info > h2 .grid-view .item-info > h2
{ {
font-weight: normal;
padding-top: 0; padding-top: 0;
} }
.grid-view .item-info > .aval-price .grid-view .item-info > .aval-price

10
web/js/htk/field/image.js
View File

@ -56,8 +56,7 @@ Htk.Image = new Class
fullImage = new Htk.FullImage (); fullImage = new Htk.FullImage ();
this._fullImage = fullImage; this._fullImage = fullImage;
this.node.addEventListener ('mouseover', this._onMouseOver.bind (this)); this.node.addEventListener ('click', this._onMouseClick.bind (this));
this.node.addEventListener ('mouseout', this._onMouseOut.bind (this));
} }
this._showFull = x; this._showFull = x;
@ -156,7 +155,7 @@ Htk.Image = new Class
this._setSrc (); this._setSrc ();
} }
,_onMouseOver: function () ,_onMouseClick: function ()
{ {
if (!this._showFull || !this._value || this._error) if (!this._showFull || !this._value || this._error)
return; return;
@ -169,11 +168,6 @@ Htk.Image = new Class
this._fullImage.show (this._basedir +'/'+ src); this._fullImage.show (this._basedir +'/'+ src);
} }
,_onMouseOut: function ()
{
this._fullImage.hide ();
}
,_onImageError: function () ,_onImageError: function ()
{ {