Skip to content

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
demiurgosoft committed Feb 17, 2016
2 parents 90c0872 + 0b546dd commit 6d2c838
Show file tree
Hide file tree
Showing 142 changed files with 8 additions and 1,927 deletions.
7 changes: 4 additions & 3 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ var http = require('http');
var logger = require('morgan');
var path = require('path');


var routes=require('./app/routes.js');


Expand All @@ -41,6 +40,7 @@ var cargar = require('./lib/cargar');
//var escribir = require(__dirname+'/lib/putJSON');
//escribir();


// Crea aplicación web con Express
var app = express();

Expand All @@ -50,6 +50,7 @@ config = cargar('./config/config.json');
module.exports.config = config;

// Archivos de configuración de cada unas de las páginas

module.exports.personal = cargar('./config/personal.json');
module.exports.infoEconomica = cargar('./config/infoEconomica.json');
module.exports.ofertaDemanda = cargar('./config/ofertaDemanda.json');
Expand All @@ -61,7 +62,7 @@ module.exports.normativaLegal = cargar('./config/normativaLegal.json');
module.exports.prueba = cargar('./config/prueba.json');

//will set all roots
//TODO:maybe
//TODO:maybe use a middleware
routes(app);

// Variables de entorno (puerto de escucha y dirección IP)
Expand All @@ -83,7 +84,7 @@ app.use(bodyParser.urlencoded({
}));
app.use(cookieParser());
//Manejador de enrutado
app.use(express.static('public'));
// app.use(express.static('public'));
// Manejador de errores:
app.use(function(req, res, next) {
res.status(404).render('error_404', {
Expand Down
421 changes: 0 additions & 421 deletions config/prueba.json

This file was deleted.

Binary file removed public/imagenes/close.png
Binary file not shown.
Binary file removed public/imagenes/datos.jpg
Binary file not shown.
Binary file removed public/imagenes/flecha.png
Binary file not shown.
Binary file removed public/imagenes/grafico.png
Binary file not shown.
Binary file removed public/imagenes/link.png
Binary file not shown.
Binary file removed public/imagenes/link2.png
Binary file not shown.
Binary file removed public/imagenes/logo-ugr2.jpg
Binary file not shown.
Binary file removed public/imagenes/logo-ugr2.png
Binary file not shown.
Binary file removed public/imagenes/mapa.jpeg
Binary file not shown.
Binary file removed public/imagenes/osl.jpg
Binary file not shown.
Binary file removed public/imagenes/pdf.png
Binary file not shown.
Binary file removed public/imagenes/save.png
Binary file not shown.
Binary file removed public/imagenes/ugr.png
Binary file not shown.
Binary file removed public/imagenes/view.png
Binary file not shown.
Binary file removed public/imagenes/wcag2aa.gif
Binary file not shown.
Binary file removed public/img/banners/resaltado-01_off.png
Binary file not shown.
Binary file removed public/img/banners/resaltado-01_on.png
Binary file not shown.
Binary file removed public/img/banners/resaltado-02_off.png
Binary file not shown.
Binary file removed public/img/banners/resaltado-02_on.png
Binary file not shown.
Binary file removed public/img/general/accesibilidad-head-off.png
Binary file not shown.
Binary file removed public/img/general/accesibilidad-head-on.png
Binary file not shown.
Binary file removed public/img/general/banner-lupa.jpg
Binary file not shown.
Binary file removed public/img/general/cabecera-biotic_off.png
Binary file not shown.
Binary file removed public/img/general/cabecera-biotic_on.png
Binary file not shown.
Binary file removed public/img/general/cabecera-buscar_submit_off.png
Binary file not shown.
Binary file removed public/img/general/cabecera-buscar_submit_on.png
Diff not rendered.
Binary file removed public/img/general/cabecera-completa.png
Diff not rendered.
Binary file removed public/img/general/cabecera-completa_noimg.png
Diff not rendered.
Binary file removed public/img/general/cabecera-completa_noimg2.png
Diff not rendered.
Binary file removed public/img/general/cabecera-departamento.png
Diff not rendered.
Binary file removed public/img/general/cabecera-departamento.tif
Binary file not shown.
Binary file removed public/img/general/cabecera-departamento_OLD.png
Diff not rendered.
Diff not rendered.
Binary file removed public/img/general/cabecera-eadministracion.png
Diff not rendered.
Binary file removed public/img/general/cabecera-elvira_off.png
Diff not rendered.
Binary file removed public/img/general/cabecera-elvira_on.png
Diff not rendered.
Binary file removed public/img/general/cabecera-flecha-superior.png
Diff not rendered.
Binary file removed public/img/general/cabecera-flecha_buscar_off.png
Diff not rendered.
Binary file removed public/img/general/cabecera-flecha_buscar_on.png
Diff not rendered.
Binary file removed public/img/general/cabecera-flecha_off.png
Diff not rendered.
Binary file removed public/img/general/cabecera-flecha_on.png
Diff not rendered.
Binary file removed public/img/general/cabecera-foto.jpg
Diff not rendered.
Binary file removed public/img/general/cabecera-item-menu_servicios.png
Diff not rendered.
Binary file removed public/img/general/cabecera-menu_servicios-acceso.png
Diff not rendered.
Diff not rendered.
Binary file removed public/img/general/cabecera-menu_servicios-correo.png
Diff not rendered.
Binary file removed public/img/general/cabecera.png
Diff not rendered.
Binary file removed public/img/general/contactos_flecha_off.png
Diff not rendered.
Binary file removed public/img/general/contactos_flecha_on.png
Diff not rendered.
Binary file removed public/img/general/facebook_head-off.png
Diff not rendered.
Binary file removed public/img/general/facebook_head-on.png
Diff not rendered.
Binary file removed public/img/general/favicon.ico
Binary file not shown.
Binary file removed public/img/general/foto-banner.jpg
Diff not rendered.
Binary file removed public/img/general/login-fondo.png
Diff not rendered.
Binary file removed public/img/general/logo-ugr.png
Diff not rendered.
Binary file removed public/img/general/menu-item_actual_off.png
Diff not rendered.
Binary file removed public/img/general/menu-item_buscador_off.png
Diff not rendered.
Binary file removed public/img/general/menu-item_buscador_on.png
Diff not rendered.
Binary file removed public/img/general/menu-item_off.png
Diff not rendered.
Binary file removed public/img/general/menu-item_on.png
Diff not rendered.
Binary file removed public/img/general/menu-otros_on.png
Diff not rendered.
Binary file removed public/img/general/menu-separador_otros.png
Diff not rendered.
Binary file removed public/img/general/menu-subitem_off.png
Diff not rendered.
Binary file removed public/img/general/menu-subitem_on.png
Diff not rendered.
Binary file removed public/img/general/pie-fondo.png
Diff not rendered.
Binary file removed public/img/general/pie-fondo.tif
Binary file not shown.
Binary file removed public/img/general/pie-fondo_OLD.png
Diff not rendered.
Binary file removed public/img/general/rastro-enlace-sig.png
Diff not rendered.
Binary file removed public/img/general/rastro-enlace.png
Diff not rendered.
Binary file removed public/img/general/sombra.png
Diff not rendered.
Binary file removed public/img/general/sombra_dcha.png
Diff not rendered.
Binary file removed public/img/general/sombra_izq.png
Diff not rendered.
Binary file removed public/img/general/twitter_head-off.png
Diff not rendered.
Binary file removed public/img/general/twitter_head-on.png
Diff not rendered.
Binary file removed public/img/inicio/claustro.png
Diff not rendered.
Binary file removed public/img/inicio/estudiantes.png
Diff not rendered.
Binary file removed public/img/inicio/gobierno.png
Diff not rendered.
Binary file removed public/img/inicio/infoEconomica.png
Diff not rendered.
Binary file removed public/img/inicio/infoInstitucional.png
Diff not rendered.
Binary file removed public/img/inicio/normativaLegal.png
Diff not rendered.
Binary file removed public/img/inicio/ofertaDemanda.png
Diff not rendered.
Binary file removed public/img/inicio/personal.png
Diff not rendered.
Binary file removed public/img/inicio/rendimiento.png
Diff not rendered.
Binary file removed public/img/inicio/sinUso1.png
Diff not rendered.
Binary file removed public/img/inicio/sinUso2.png
Diff not rendered.
Binary file removed public/img/inicio/sinUso3.png
Diff not rendered.
Binary file removed public/img/inicio/sinUso4.png
Diff not rendered.
Binary file removed public/img/interior/cabecera-nivel1_bullet.png
Diff not rendered.
Binary file removed public/img/interior/cabecera-nivel1_fondo.png
Diff not rendered.
Binary file removed public/img/interior/cabecera-nivel2.png
Diff not rendered.
Binary file removed public/img/interior/calendario-fondo.png
Diff not rendered.
Diff not rendered.
Binary file removed public/img/interior/contacto/localizacion.jpeg
Diff not rendered.
Binary file removed public/img/interior/contenido-fondo.png
Diff not rendered.
Binary file removed public/img/interior/enlace_doble-fondo_off.png
Diff not rendered.
Binary file removed public/img/interior/enlace_doble-fondo_on.png
Diff not rendered.
Diff not rendered.
Binary file removed public/img/interior/imagen-fondo_off.png
Diff not rendered.
Binary file removed public/img/interior/imagen-fondo_on.png
Diff not rendered.
Binary file removed public/img/interior/lista-flecha-nivel1.png
Diff not rendered.
Binary file removed public/img/interior/lista-nivel1.png
Diff not rendered.
Binary file removed public/img/interior/lista-nivel2.png
Diff not rendered.
Binary file removed public/img/interior/lista-nivel3.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel1-flecha_off.gif
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel1-flecha_off.png
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel1-flecha_on.png
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel1_off.png
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel1_on.png
Diff not rendered.
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel2_off.gif
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel2_off.png
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel2_on.png
Diff not rendered.
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel3_off.png
Diff not rendered.
Binary file removed public/img/interior/lista_enlaces-nivel3_on.png
Diff not rendered.
Binary file removed public/img/interior/login-enviar_off.png
Diff not rendered.
Binary file removed public/img/interior/login-enviar_on.png
Diff not rendered.
Binary file removed public/img/interior/pagina-fondo.png
Diff not rendered.
Binary file removed public/img/interior/pagina-titulo_principal-h1.png
Diff not rendered.
Binary file removed public/img/interior/pagina-titulo_principal.png
Diff not rendered.
Binary file removed public/img/interior/parrafo-fondo.png
Diff not rendered.
Binary file removed public/img/interior/sombra-inferior-cabecera-nivel1.png
Diff not rendered.
Binary file removed public/img/interior/tabla-cabecera.png
Diff not rendered.
Binary file removed public/img/interior/toc-flecha.png
Diff not rendered.
Binary file removed public/img/interior/toc-fondo.png
Diff not rendered.
Binary file removed public/img/interior/toc-fondo_gris.png
Diff not rendered.
Binary file removed public/img/interior/toc-lista.gif
Diff not rendered.
Binary file removed public/img/interior/toc-pie.png
Diff not rendered.
Binary file removed public/img/transp.gif
Diff not rendered.
25 changes: 0 additions & 25 deletions public/prueba/generar_tabla.js

This file was deleted.

138 changes: 0 additions & 138 deletions public/prueba/generar_tabla_.js

This file was deleted.

Loading

0 comments on commit 6d2c838

Please sign in to comment.