From 77f766366de2e67dade10893c4f331ba7cb907b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= <rmontanana@gmail.com>
Date: Sun, 1 Jun 2014 23:55:13 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20la=20v=20para=20indicar=20la=20v?=
 =?UTF-8?q?ersi=C3=B3n=20en=20la=20cabecera=20de=20los=20informes=20Acorta?=
 =?UTF-8?q?do=20el=20nombre=20de=20la=20aplicaci=C3=B3n=20en=20la=20p?=
 =?UTF-8?q?=C3=A1gina=20principal=20para=20que=20en=20dispositivos=20peque?=
 =?UTF-8?q?=C3=B1os=20se=20visualice=20bien=20con=20el=20icono=20nuevo=20d?=
 =?UTF-8?q?el=20manual?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AportaContenido.php | 5 ++++-
 InformePDF.php      | 2 +-
 Pdf_mysql_table.php | 2 +-
 inc/version.inc     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/AportaContenido.php b/AportaContenido.php
index fe23ede..685bc40 100644
--- a/AportaContenido.php
+++ b/AportaContenido.php
@@ -194,7 +194,10 @@ class AportaContenido {
                 $campo = '<input type="hidden" name="fechaCabecera" id="fechaCabecera" value="' . $this->fechaActual("%d/%m/%Y") . '">';
                 $etiqueta = '<label for="fechaCabecera" onClick="$(' . "'#fechaCabecera'" . ").data('DateTimePicker').show();" . '">' . $this->fechaActual() . '</label>';
                 return $etiqueta . $campo . $script;
-            case 'aplicacion': return PROGRAMA . " v" . VERSION;
+            case 'aplicacion': 
+                $nombre = explode(" ", PROGRAMA);
+                $nombre = $nombre[2];
+                return $nombre . " v" . VERSION;
             case 'menu': // el menú
                 if ($this->registrado) {
                     return $this->miMenu->insertaMenu();
diff --git a/InformePDF.php b/InformePDF.php
index ae76cd8..d56feaf 100644
--- a/InformePDF.php
+++ b/InformePDF.php
@@ -54,7 +54,7 @@ class InformePDF {
         //echo $def->Titulo.$def->Cabecera;
         $this->pdf->Open();
         $this->pdf->setAuthor(AUTOR,true);
-        $creador = CENTRO . " " . PROGRAMA.VERSION;
+        $creador = CENTRO . " " . PROGRAMA . " v" . VERSION;
         $this->pdf->setCreator(html_entity_decode($creador),true);
         $this->pdf->setSubject($this->def->Titulo,true);
         $this->pdf->setAutoPageBreak(true, 10);
diff --git a/Pdf_mysql_table.php b/Pdf_mysql_table.php
index a523be5..a2f23ea 100644
--- a/Pdf_mysql_table.php
+++ b/Pdf_mysql_table.php
@@ -61,7 +61,7 @@ class Pdf_mysql_table extends FPDF
         //Titulo
         $fecha=strftime("%d-%b-%Y %H:%M");
         $this->SetFont('Arial','',8);
-        $this->Cell(0,4,html_entity_decode(CENTRO . " " . PROGRAMA . VERSION,ENT_COMPAT | ENT_HTML401,'ISO-8859-1'),0,1,'L');
+        $this->Cell(0,4,html_entity_decode(CENTRO . " " . PROGRAMA . " v" . VERSION,ENT_COMPAT | ENT_HTML401,'ISO-8859-1'),0,1,'L');
         $this->SetFont('Arial','',18);
         $this->Cell(0,6,utf8_decode($this->titulo),0,1,'C');
         $this->SetFont('Arial','',8);
diff --git a/inc/version.inc b/inc/version.inc
index db92f75..bdf28d8 100644
--- a/inc/version.inc
+++ b/inc/version.inc
@@ -23,5 +23,5 @@
  */
 
 define('AUTOR', 'Ricardo Montañana Gómez');
-define('VERSION', '1.14');
+define('VERSION', '1.14.1');
 ?>