rmontanana/inventario2
1
0
Fork 0
mirror of https://github.com/rmontanana/inventario2.git synced 2025-08-15 23:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Versión 1.04

Browse Source 
- Separado el fichero de configuración del de versión
- Arreglado que el menú de la aplicación colapse en resoluciones pequeñas
- Añadidos los ficheros de fuentes que se habían cambiado
This commit is contained in:
Ricardo Montañana Gómez
2014-03-19 03:22:53 +01:00
parent f6a480f828
commit a0dd082434
22 changed files with 4079 additions and 4039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Mantenimiento.php
View File

@@ -276,7 +276,7 @@ class Mantenimiento {
private function enlaceBusqueda($pagina) private function enlaceBusqueda($pagina)
{ {
$valor = isset($this->cadenaBusqueda) ? 'value="' . $this->cadenaBusqueda . '"' : ''; $valor = isset($this->cadenaBusqueda) ? 'value="' . $this->cadenaBusqueda . '"' : '';
$salida = '<form name="busqueda" method="POST"><div class="col-sm-4 col-lg-6"><div class="input-group"> $salida = '<form name="busqueda" method="POST"><div class="col-xs-6 col-sm-4 col-md-6 col-lg-6"><div class="input-group">
<input type="text" name="buscar" placeholder="Descripci&oacute;n" class="form-control" ' . $valor . '> <input type="text" name="buscar" placeholder="Descripci&oacute;n" class="form-control" ' . $valor . '>
<span class="input-group-btn"><button class="btn btn-primary" type="button">Buscar</button> <span class="input-group-btn"><button class="btn btn-primary" type="button">Buscar</button>
</span></div></div></form>'; </span></div></div></form>';

106
css/dashboard.php
View File

@@ -3,100 +3,112 @@ include('../inc/configuracion.inc');
header("Content-type: text/css"); header("Content-type: text/css");
?> ?>
/* /*
* Base structure * Base structure
*/ */
/* Move down content because we have a fixed navbar that is 50px tall */ /* Move down content because we have a fixed navbar that is 50px tall */
body { body {
padding-top: 50px; padding-top: 50px;
background-color: <?php echo COLORFON; ?>; /*Fondo*/ background-color: <?php echo COLORFON; ?>; /*Fondo*/
} }
/* /*
* Global add-ons * Global add-ons
*/ */
.sub-header { .sub-header {
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
/* /*
* Sidebar * Sidebar
*/ */
/* Hide for mobile, show later */ /* Hide for mobile, show later */
.sidebar { .sidebar {
display: none; display: none;
}
@media (max-width: 767px) {
.sidebar {
top: 50px;
bottom: 150px;
background-color: <?php echo COLORLAT; ?>
}
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.sidebar { .sidebar {
position: fixed; position: fixed;
top: 51px; top: 51px;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
display: block; display: block;
padding: 5px; padding: 5px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
background-color: <?php echo COLORLAT; ?>;/*Lateral*/ background-color: <?php echo COLORLAT; ?>;/*Lateral*/
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
} }
/* Sidebar navigation */ /* Sidebar navigation */
.nav-sidebar { .nav-sidebar {
margin-right: -6px; /* 20px padding + 1px border */ margin-right: -6px; /* 20px padding + 1px border */
margin-bottom: 1px; margin-bottom: 1px;
margin-left: -1px; margin-left: -1px;
} }
.nav-sidebar > li > a { .nav-sidebar > li > a {
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
} }
.nav-sidebar > .active > a { .nav-sidebar > .active > a {
color: #fff; color: #fff;
background-color: #428bca; background-color: #428bca;
} }
/* /*
* Main content * Main content
*/ */
.main { .main {
padding: 10px; padding: 10px;
}
@media (max-width: 767px) {
.main{
margin-top: 50px;
}
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.main { .main {
padding-right: 20px; padding-right: 20px;
padding-left: 20px; padding-left: 20px;
} }
} }
.main .page-header { .main .page-header {
margin-top: 0; margin-top: 0;
} }
/* /*
* Placeholder dashboard ideas * Placeholder dashboard ideas
*/ */
.placeholders { .placeholders {
margin-bottom: 5px; margin-bottom: 5px;
text-align: center; text-align: center;
} }
.placeholders h4 { .placeholders h4 {
margin-bottom: 0; margin-bottom: 0;
} }
.placeholder { .placeholder {
margin-bottom: 5px; margin-bottom: 5px;
} }
.placeholder img { .placeholder img {
display: inline-block; display: inline-block;
border-radius: 25%; border-radius: 25%;
} }

71
inc/configuracion.inc
View File

@@ -1,39 +1,40 @@
<?php <?php
/**
* Fichero de configuración donde se introducirán los valores para /**
* la conexión con el servidor MySQL y otros para personalizar la aplicación. * Fichero de configuración donde se introducirán los valores para
* @package Inventario * la conexión con el servidor MySQL y otros para personalizar la aplicación.
* @copyright Copyright (c) 2008, Ricardo Montañana Gómez * @package Inventario
* @license http://www.gnu.org/licenses/gpl-3.0.txt * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
* This file is part of Inventario. * @license http://www.gnu.org/licenses/gpl-3.0.txt
* Inventario is free software: you can redistribute it and/or modify * This file is part of Inventario.
* it under the terms of the GNU General Public License as published by * Inventario is free software: you can redistribute it and/or modify
* the Free Software Foundation, either version 3 of the License, or * it under the terms of the GNU General Public License as published by
* (at your option) any later version. * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* Inventario is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * Inventario is distributed in the hope that it will be useful,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License *
* along with Inventario. If not, see <http://www.gnu.org/licenses/>. * You should have received a copy of the GNU General Public License
* * along with Inventario. If not, see <http://www.gnu.org/licenses/>.
*/ *
define('AUTOR','Ricardo Montañana Gómez'); */
define('SERVIDOR','localhost'); //Ubicación del servidor MySQL require_once 'version.inc';
define('BASEDATOS','Inventario2'); //Nombre de la base de datos.
define('USUARIO','test'); //Usuario con permisos de lectura/escritura en la base de datos define('SERVIDOR', 'localhost'); //Ubicación del servidor MySQL
define('CLAVE','tset'); //contraseña del usuario. define('BASEDATOS', 'Inventario2'); //Nombre de la base de datos.
define('VERSION','1.03'); define('BASEDATOSTEST', 'Inventario_test'); //Base de datos para los tests.
define('PROGRAMA','Gesti&oacute;n de Inventario.'); define('USUARIO', 'test'); //Usuario con permisos de lectura/escritura en la base de datos
define('CENTRO','I.E.S.O. Pascual Serrano'); define('CLAVE', 'tset'); //contraseña del usuario.
define('APLICACION',PROGRAMA.VERSION); define('PROGRAMA', 'Gesti&oacute;n de Inventario.');
define('NUMFILAS',17); // Número de registros a mostrar en las pantallas de consulta iniciales define('CENTRO', 'I.E.S.O. Pascual Serrano');
define('PAUSA',2);//Nº segundos de pausa para mostrar mensaje id insertado define('NUMFILAS', '17'); // Número de registros a mostrar en las pantallas de consulta iniciales
define('ESTILO','personal'); //Estilo de los iconos de edición (personal, personal, personal) define('PAUSA', '2'); //Nº segundos de pausa para mostrar mensaje id insertado
define('PLANTILLA','bootstrap'); //Estilo de la plantilla y recursos a utilizar define('ESTILO', 'personal'); //Estilo de los iconos de edición (personal, personal, personal)
define('COLORLAT', '#7ae7bf'); //Color de la barra de menú lateral define('PLANTILLA', 'bootstrap'); //Estilo de la plantilla y recursos a utilizar
define('COLORLAT', '#46d6db'); //Color de la barra de menú lateral
define('COLORFON', '#a4bdfc'); //Color del fondo de la pantalla define('COLORFON', '#a4bdfc'); //Color del fondo de la pantalla
define('MYSQLDUMP', '/usr/local/bin/mysqldump'); //camino a mysqldump define('MYSQLDUMP', '/usr/local/bin/mysqldump'); //camino a mysqldump
define('GZIP', '/usr/bin/gzip'); //Camino a gzip define('GZIP', '/usr/bin/gzip'); //Camino a gzip

27
inc/version.inc Normal file
View File

@@ -0,0 +1,27 @@
<?php
/**
* Fichero de configuración donde se introducirán los valores
* de autor y de la versión
* @package Inventario
* @copyright Copyright (c) 2008, Ricardo Montañana Gómez
* @license http://www.gnu.org/licenses/gpl-3.0.txt
* This file is part of Inventario.
* Inventario is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Inventario is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Inventario. If not, see <http://www.gnu.org/licenses/>.
*
*/
define('AUTOR', 'Ricardo Montañana Gómez');
define('VERSION', '1.04');
?>

4
plant/bootstrap.html
View File

@@ -24,7 +24,7 @@
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
@@ -38,7 +38,7 @@
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="#">{usuario}</a></li> <!--<li><a href="#">{usuario}</a></li>-->
<li><a href="#">{fecha}</a></li> <li><a href="#">{fecha}</a></li>
<li>{control}</li> <li>{control}</li>
</ul> </ul>