Errores solucionados

debian/changelog

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

lib/vn/tpv/tpv.php

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

web/forms/ecomerce/catalog/style.css

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

web/js/htk/field/image.js

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