diff --git a/Configuracion.php b/Configuracion.php index ef0a02d..1fe4585 100644 --- a/Configuracion.php +++ b/Configuracion.php @@ -106,17 +106,21 @@ } break; case 'COLORLAT': - $this->colorLateral=$valor; + $valor = trim($valor); + $this->colorLateral = $valor; if ($grabar) { $linea=str_replace($valor,$_POST['colorLat'],$linea); $this->colorLateral=$_POST['colorLat']; } + break; case 'COLORFON': - $this->colorFondo=$valor; + $valor = trim($valor); + $this->colorFondo = $valor; if ($grabar) { $linea=str_replace($valor,$_POST['colorFon'],$linea); $this->colorFondo=$_POST['colorFon']; } + break; } } if ($grabar) { @@ -132,59 +136,56 @@ unlink($this->confAnterior); rename($this->configuracion,$this->confAnterior); rename($this->confNueva,$this->configuracion); + // Actualiza la plantilla bootstrap con los cambios de color + $plantilla = file_get_contents("css/dashboard.css"); + } return $salida; } private function formulario() { + $coloresLateral = array( "Original" => "#C4FAEC", "Verde" => "#7bd148", "Azul marino" => "#5484ed", "Azul" => "#a4bdfc", "Turquesa" => "#46d6db", + "Verde claro" => "#7ae7bf", "Verde oscuro" => "#51b749", "Amarillo" => "#fbd75b", "Naranja" => "#ffb878", "Morado" => "#6633FF", + "Rojo oscuro" => "#dc2127", "Púrpura" => "#dbadff", "Gris" => "#e1e1e1"); + $coloresFondo = array( "Verde" => "#7bd148", "Azul marino" => "#5484ed", "Azul" => "#a4bdfc", "Turquesa" => "#46d6db", + "Verde claro" => "#7ae7bf", "Verde oscuro" => "#51b749", "Amarillo" => "#fbd75b", "Naranja" => "#ffb878", "Rojo" => "#ff887c", + "Rojo oscuro" => "#dc2127", "Púrpura" => "#dbadff", "Gris" => "#e1e1e1", "Original" => '#F3FEC8'); $personal=$this->estilo=="personal"?'selected':' '; $bluecurve=$this->estilo=="bluecurve"?'selected':' '; $cristal=$this->estilo=="cristal"?'selected':' '; $normal=$this->plantilla=="normal"? 'selected':' '; $bootstrap=$this->plantilla=="bootstrap" ? 'selected':' '; - $salida='
'; + $salida='
'; //$salida.='

'; $salida.='

'; $salida.=''; $salida.=''; $salida.=''; - $salida.=''; - $salida.=''; - $salida.=''; - $salida.=''; + $salida.=''; + $salida.=''; $salida.=''; $salida.=''; $salida.=''; @@ -194,26 +195,18 @@ $salida.=''; $salida.=""; - $salida .= '"; + //$salida.="
fondo=[$this->colorFondo] lateral=[$this->colorLateral]
"; return $salida; } } diff --git a/InformePDF.php b/InformePDF.php index 722c059..59b081a 100644 --- a/InformePDF.php +++ b/InformePDF.php @@ -55,7 +55,8 @@ class InformePDF { //echo $def->Titulo.$def->Cabecera; $this->pdf->Open(); $this->pdf->setAuthor(utf8_decode(AUTOR)); - $this->pdf->setCreator(html_entity_decode(APLICACION)); + $creador = CENTRO . " " . APLICACION; + $this->pdf->setCreator(utf8_decode(html_entity_decode($creador))); $this->pdf->setSubject(utf8_decode($this->def->Titulo)); $this->pdf->setAutoPageBreak(true, 10); } diff --git a/Pdf_mysql_table.php b/Pdf_mysql_table.php index 01fac68..b358b4d 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(APLICACION),0,1,'L'); + $this->Cell(0,4,html_entity_decode(CENTRO . " " . APLICACION),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/css/dashboard.php b/css/dashboard.php new file mode 100644 index 0000000..3560eeb --- /dev/null +++ b/css/dashboard.php @@ -0,0 +1,102 @@ + +/* + * Base structure + */ + +/* Move down content because we have a fixed navbar that is 50px tall */ +body { + padding-top: 50px; + background-color: ; /*Fondo*/ +} + + +/* + * Global add-ons + */ + +.sub-header { + padding-bottom: 10px; + border-bottom: 1px solid #eee; +} + + +/* + * Sidebar + */ + +/* Hide for mobile, show later */ +.sidebar { + display: none; +} +@media (min-width: 768px) { + .sidebar { + position: fixed; + top: 51px; + bottom: 0; + left: 0; + z-index: 1000; + display: block; + padding: 5px; + overflow-x: hidden; + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ + background-color: ;/*Lateral*/ + border-right: 1px solid #eee; + + } +} + +/* Sidebar navigation */ +.nav-sidebar { + margin-right: -6px; /* 20px padding + 1px border */ + margin-bottom: 1px; + margin-left: -1px; +} +.nav-sidebar > li > a { + padding-right: 5px; + padding-left: 5px; +} +.nav-sidebar > .active > a { + color: #fff; + background-color: #428bca; +} + + +/* + * Main content + */ + +.main { + padding: 10px; +} +@media (min-width: 768px) { + .main { + padding-right: 20px; + padding-left: 20px; + } +} +.main .page-header { + margin-top: 0; +} + + +/* + * Placeholder dashboard ideas + */ + +.placeholders { + margin-bottom: 5px; + text-align: center; +} +.placeholders h4 { + margin-bottom: 0; +} +.placeholder { + margin-bottom: 5px; +} +.placeholder img { + display: inline-block; + border-radius: 25%; +} diff --git a/css/dashboard.css b/css/dashboard_1.css similarity index 100% rename from css/dashboard.css rename to css/dashboard_1.css diff --git a/fpdf.css b/fpdf.css deleted file mode 100755 index dd2c540..0000000 --- a/fpdf.css +++ /dev/null @@ -1,21 +0,0 @@ -body {font-family:"Times New Roman",serif} -h1 {font:bold 135% Arial,sans-serif; color:#4000A0; margin-bottom:0.9em} -h2 {font:bold 95% Arial,sans-serif; color:#900000; margin-top:1.5em; margin-bottom:1em} -dl.param dt {text-decoration:underline} -dl.param dd {margin-top:1em; margin-bottom:1em} -dl.param ul {margin-top:1em; margin-bottom:1em} -tt, code, kbd {font-family:"Courier New",Courier,monospace; font-size:82%} -div.source {margin-top:1.4em; margin-bottom:1.3em} -div.source pre {display:table; border:1px solid #24246A; width:100%; margin:0em; font-family:inherit; font-size:100%} -div.source code {display:block; border:1px solid #C5C5EC; background-color:#F0F5FF; padding:6px; color:#000000} -div.doc-source {margin-top:1.4em; margin-bottom:1.3em} -div.doc-source pre {display:table; width:100%; margin:0em; font-family:inherit; font-size:100%} -div.doc-source code {display:block; background-color:#E0E0E0; padding:4px} -.kw {color:#000080; font-weight:bold} -.str {color:#CC0000} -.cmt {color:#008000} -p.demo {text-align:center; margin-top:-0.9em} -a.demo {text-decoration:none; font-weight:bold; color:#0000CC} -a.demo:link {text-decoration:none; font-weight:bold; color:#0000CC} -a.demo:hover {text-decoration:none; font-weight:bold; color:#0000FF} -a.demo:active {text-decoration:none; font-weight:bold; color:#0000FF} diff --git a/inc/configuracion.ant b/inc/configuracion.ant index b8f6606..1aba9b7 100644 --- a/inc/configuracion.ant +++ b/inc/configuracion.ant @@ -33,6 +33,6 @@ define('NUMFILAS',17); // Número de registros a mostrar en las pantallas de con define('PAUSA',2);//Nº segundos de pausa para mostrar mensaje id insertado define('ESTILO','personal'); //Estilo de los iconos de edición (personal, personal, personal) define('PLANTILLA','bootstrap'); //Estilo de la plantilla y recursos a utilizar -define('COLORLAT', '#C4FAEC'); //Color de la barra de menú lateral +define('COLORLAT', '#a4bdfc'); //Color de la barra de menú lateral define('COLORFON', '#F3FEC8'); //Color del fondo de la pantalla ?> diff --git a/inc/configuracion.inc b/inc/configuracion.inc index b8f6606..1aba9b7 100644 --- a/inc/configuracion.inc +++ b/inc/configuracion.inc @@ -33,6 +33,6 @@ define('NUMFILAS',17); // Número de registros a mostrar en las pantallas de con define('PAUSA',2);//Nº segundos de pausa para mostrar mensaje id insertado define('ESTILO','personal'); //Estilo de los iconos de edición (personal, personal, personal) define('PLANTILLA','bootstrap'); //Estilo de la plantilla y recursos a utilizar -define('COLORLAT', '#C4FAEC'); //Color de la barra de menú lateral +define('COLORLAT', '#a4bdfc'); //Color de la barra de menú lateral define('COLORFON', '#F3FEC8'); //Color del fondo de la pantalla ?> diff --git a/plant/bootstrap.html b/plant/bootstrap.html index 767658a..20c3aea 100644 --- a/plant/bootstrap.html +++ b/plant/bootstrap.html @@ -13,29 +13,15 @@ - + - + - +
Preferencias
Nombre del Centro
Número de filas
Plantilla
Plantilla
Estilo
Estilo
Color Lateral
Color Fondo
Color Lateral (bootstrap)
Color Fondo (bootstrap)
Base de datos
Servidor
Base de datos