diff --git a/index.php b/index.php index f458767..6989e16 100644 --- a/index.php +++ b/index.php @@ -93,11 +93,15 @@ else {} if(isset($_REQUEST['variable'])){ $variable= $_REQUEST['variable']; } +$v = decodifica_parametro($variable); if(isset($_REQUEST['plantilla'])){ $plantilla= $_REQUEST['plantilla']; }else {$plantilla= "landingpage";} - + if($_REQUEST['tema'] !="") { $tema= "$_REQUEST[tema]";} + else { + if($v[0] =='a') { $tema='aplicacion'; }else{$tema="moon";} + } $presentacion_cabeza = " @@ -150,7 +154,7 @@ $presentacion_pie=" "; if ($variable !=''){ - $v = decodifica_parametro($variable); + if($v[0] =='e') { /// e = EMPRESA $id_empresa = $v[1]; @@ -361,10 +365,50 @@ if ($variable !=''){ $id_empresa = $empresa[0]; $titulo = remplacetas('form_id','id',$form,'nombre',"") ; $descripcion = remplacetas('form_id','id',$form,'descripcion',"") ; - //$registros = consultar_contenido_formulario("$form",'5','','embebido','',"$plantilla"); - //$registros = aplicacion_carrusel("embebido","$form","$plantilla","","","5"); + $no_mostrar ="display:none; "; + $aplicacion_pie=" + + + + + + + "; + $librerias_galeria =" + + + + "; + $librerias_cabeza ="$presentacion_cabeza $librerias_galeria"; + $librerias_pie =$aplicacion_pie; + $registros = aplicacion_carrusel("$form",'10','','embebido','',"carousel"); - $registros="
$registros
"; + //$registros="
$registros
"; // $formulario = formulario_embebido($form,$opciones); $titulo = remplacetas('form_id','id',$form,'nombre',"") ; $razon_social = remplacetas('empresa','id',"$id_empresa",'razon_social','') ; @@ -414,13 +458,28 @@ $mapa

Galería

-$registros + +
+
+

2

+

3

+

4

+

5

+
+
+
+

2

+

3

+

4

+

5

+

Estadísticas

$estadisticas
+ Powered by MILFS @@ -433,8 +492,42 @@ $estadisticas "; - $aplicacion=""; - $onload = "$footer $aplicacion "; + $onload=" + +
+
+
+
+ $registros +
+
+
+ + $estadisticas + +
+
+ $mapa +
+
+
$footer"; + //$onload = "$footer $aplicacion "; } elseif($v[0] =='g') { diff --git a/librerias/reveal/css/reveal.css b/librerias/reveal/css/reveal.css index b203074..bca08c1 100644 --- a/librerias/reveal/css/reveal.css +++ b/librerias/reveal/css/reveal.css @@ -202,7 +202,7 @@ html:-moz-full-screen-ancestor { height: 110px; z-index: 30; right: 10px; - bottom: 10px; + bottom: 200px; -webkit-user-select: none; } .reveal .controls button { diff --git a/librerias/reveal/css/theme/aplicacion.css b/librerias/reveal/css/theme/aplicacion.css new file mode 100644 index 0000000..09ba76d --- /dev/null +++ b/librerias/reveal/css/theme/aplicacion.css @@ -0,0 +1,306 @@ +/** + * White theme for reveal.js. This is the opposite of the 'black' theme. + * + * By Hakim El Hattab, http://hakim.se + */ +@import url(../../lib/font/source-sans-pro/source-sans-pro.css); + +.reveal .slides { + position: absolute; + width: 100%; + height: 100%; + top: 0; + right: 0; + bottom: 0; + left: 0; + margin: auto; + overflow: visible; + z-index: 1; + text-align: center; + -webkit-perspective: 600px; + perspective: 600px; + -webkit-perspective-origin: 50% 40%; + perspective-origin: 50% 40%; } + +section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 { + color: #fff; } + +/********************************************* + * GLOBAL STYLES + *********************************************/ +body { + background: #fff; + background-color: #fff; } +/* +.reveal { + font-family: "Source Sans Pro", Helvetica, sans-serif; + font-size: 38px; + font-weight: normal; + color: #222; } +*/ +::selection { + color: #fff; + background: #98bdef; + text-shadow: none; } + +.reveal .slides > section, +.reveal .slides > section > section { + line-height: 1.3; + font-weight: inherit; } + +/********************************************* + * HEADERS + *********************************************/ + /* +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + margin: 0 0 20px 0; + color: #222; + font-family: "Source Sans Pro", Helvetica, sans-serif; + font-weight: 600; + line-height: 1.2; + letter-spacing: normal; + text-transform: uppercase; + text-shadow: none; + word-wrap: break-word; } + +.reveal h1 { + font-size: 2.5em; } + +.reveal h2 { + font-size: 1.6em; } + +.reveal h3 { + font-size: 1.3em; } + +.reveal h4 { + font-size: 1em; } + +.reveal h1 { + text-shadow: none; } +*/ +/********************************************* + * OTHER + *********************************************/ +/*.reveal p { + margin: 20px 0; + line-height: 1.3; } +*/ +/* Ensure certain elements are never larger than the slide itself */ +.reveal img, +.reveal video, +.reveal iframe { + max-width: 95%; + max-height: 95%; } + +.reveal strong, +.reveal b { + font-weight: bold; } + +.reveal em { + font-style: italic; } + +.reveal ol, +.reveal dl, +.reveal ul { + display: inline-block; + text-align: left; + margin: 0 0 0 1em; } + +.reveal ol { + list-style-type: decimal; } + +.reveal ul { + list-style-type: disc; } + +.reveal ul ul { + list-style-type: square; } + +.reveal ul ul ul { + list-style-type: circle; } + +.reveal ul ul, +.reveal ul ol, +.reveal ol ol, +.reveal ol ul { + display: block; + margin-left: 40px; } + +.reveal dt { + font-weight: bold; } + +.reveal dd { + margin-left: 40px; } + +.reveal q, +.reveal blockquote { + quotes: none; } + +.reveal blockquote { + display: block; + position: relative; + width: 70%; + margin: 20px auto; + padding: 5px; + font-style: italic; + background: rgba(255, 255, 255, 0.05); + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2); } + +.reveal blockquote p:first-child, +.reveal blockquote p:last-child { + display: inline-block; } + +.reveal q { + font-style: italic; } + +.reveal pre { + display: block; + position: relative; + width: 90%; + margin: 20px auto; + text-align: left; + font-size: 0.55em; + font-family: monospace; + line-height: 1.2em; + word-wrap: break-word; + box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.3); } + +.reveal code { + font-family: monospace; } + +.reveal pre code { + display: block; + padding: 5px; + overflow: auto; + max-height: 400px; + word-wrap: normal; } + +.reveal table { + margin: auto; + border-collapse: collapse; + border-spacing: 0; } + +.reveal table th { + font-weight: bold; } + +.reveal table th, +.reveal table td { + text-align: left; + padding: 0.2em 0.5em 0.2em 0.5em; + border-bottom: 1px solid; } + +.reveal table th[align="center"], +.reveal table td[align="center"] { + text-align: center; } + +.reveal table th[align="right"], +.reveal table td[align="right"] { + text-align: right; } + +.reveal table tbody tr:last-child th, +.reveal table tbody tr:last-child td { + border-bottom: none; } + +.reveal sup { + vertical-align: super; } + +.reveal sub { + vertical-align: sub; } + +.reveal small { + display: inline-block; + font-size: 0.6em; + line-height: 1.2em; + vertical-align: top; } + +.reveal small * { + vertical-align: top; } + +/********************************************* + * LINKS + *********************************************/ +/*.reveal a { + color: #2a76dd; + text-decoration: none; + -webkit-transition: color .15s ease; + -moz-transition: color .15s ease; + transition: color .15s ease; } + +.reveal a:hover { + color: #6ca0e8; + text-shadow: none; + border: none; } + +.reveal .roll span:after { + color: #fff; + background: #1a53a1; } +*/ +/********************************************* + * IMAGES + *********************************************/ +.reveal section img { + margin: 15px 0px; + background: rgba(255, 255, 255, 0.12); + /* border: 4px solid #222;*/ + box-shadow: 0 0 10px rgba(0, 0, 0, 0.15); } + +.reveal section img.plain { + border: 0; + box-shadow: none; } + +.reveal a img { + -webkit-transition: all .15s linear; + -moz-transition: all .15s linear; + transition: all .15s linear; } + +.reveal a:hover img { + background: rgba(255, 255, 255, 0.2); + border-color: #2a76dd; + box-shadow: 0 0 20px rgba(0, 0, 0, 0.55); } + +/********************************************* + * NAVIGATION CONTROLS + *********************************************/ +.reveal .controls .navigate-left, +.reveal .controls .navigate-left.enabled { + border-right-color: #2a76dd; } + +.reveal .controls .navigate-right, +.reveal .controls .navigate-right.enabled { + border-left-color: #2a76dd; } + +.reveal .controls .navigate-up, +.reveal .controls .navigate-up.enabled { + border-bottom-color: #2a76dd; } + +.reveal .controls .navigate-down, +.reveal .controls .navigate-down.enabled { + border-top-color: #2a76dd; } + +.reveal .controls .navigate-left.enabled:hover { + border-right-color: #6ca0e8; } + +.reveal .controls .navigate-right.enabled:hover { + border-left-color: #6ca0e8; } + +.reveal .controls .navigate-up.enabled:hover { + border-bottom-color: #6ca0e8; } + +.reveal .controls .navigate-down.enabled:hover { + border-top-color: #6ca0e8; } + +/********************************************* + * PROGRESS BAR + *********************************************/ +.reveal .progress { + background: rgba(0, 0, 0, 0.2); } + +.reveal .progress span { + background: #2a76dd; + -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); + -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); + transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } diff --git a/librerias/reveal/css/theme/presentacion.css b/librerias/reveal/css/theme/presentacion.css new file mode 100644 index 0000000..b10dd0e --- /dev/null +++ b/librerias/reveal/css/theme/presentacion.css @@ -0,0 +1,287 @@ +/** + * White theme for reveal.js. This is the opposite of the 'black' theme. + * + * By Hakim El Hattab, http://hakim.se + */ +@import url(../../lib/font/source-sans-pro/source-sans-pro.css); +section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 { + color: #fff; } + +/********************************************* + * GLOBAL STYLES + *********************************************/ +body { + background: #fff; + background-color: #fff; } + +.reveal { + font-family: "Source Sans Pro", Helvetica, sans-serif; + font-size: 38px; + font-weight: normal; + color: #222; } + +::selection { + color: #fff; + background: #98bdef; + text-shadow: none; } + +.reveal .slides > section, +.reveal .slides > section > section { + line-height: 1.3; + font-weight: inherit; } + +/********************************************* + * HEADERS + *********************************************/ +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + margin: 0 0 20px 0; + color: #222; + font-family: "Source Sans Pro", Helvetica, sans-serif; + font-weight: 600; + line-height: 1.2; + letter-spacing: normal; + text-transform: uppercase; + text-shadow: none; + word-wrap: break-word; } + +.reveal h1 { + font-size: 2.5em; } + +.reveal h2 { + font-size: 1.6em; } + +.reveal h3 { + font-size: 1.3em; } + +.reveal h4 { + font-size: 1em; } + +.reveal h1 { + text-shadow: none; } + +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin: 20px 0; + line-height: 1.3; } + +/* Ensure certain elements are never larger than the slide itself */ +.reveal img, +.reveal video, +.reveal iframe { + max-width: 95%; + max-height: 95%; } + +.reveal strong, +.reveal b { + font-weight: bold; } + +.reveal em { + font-style: italic; } + +.reveal ol, +.reveal dl, +.reveal ul { + display: inline-block; + text-align: left; + margin: 0 0 0 1em; } + +.reveal ol { + list-style-type: decimal; } + +.reveal ul { + list-style-type: disc; } + +.reveal ul ul { + list-style-type: square; } + +.reveal ul ul ul { + list-style-type: circle; } + +.reveal ul ul, +.reveal ul ol, +.reveal ol ol, +.reveal ol ul { + display: block; + margin-left: 40px; } + +.reveal dt { + font-weight: bold; } + +.reveal dd { + margin-left: 40px; } + +.reveal q, +.reveal blockquote { + quotes: none; } + +.reveal blockquote { + display: block; + position: relative; + width: 70%; + margin: 20px auto; + padding: 5px; + font-style: italic; + background: rgba(255, 255, 255, 0.05); + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2); } + +.reveal blockquote p:first-child, +.reveal blockquote p:last-child { + display: inline-block; } + +.reveal q { + font-style: italic; } + +.reveal pre { + display: block; + position: relative; + width: 90%; + margin: 20px auto; + text-align: left; + font-size: 0.55em; + font-family: monospace; + line-height: 1.2em; + word-wrap: break-word; + box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.3); } + +.reveal code { + font-family: monospace; } + +.reveal pre code { + display: block; + padding: 5px; + overflow: auto; + max-height: 400px; + word-wrap: normal; } + +.reveal table { + margin: auto; + border-collapse: collapse; + border-spacing: 0; } + +.reveal table th { + font-weight: bold; } + +.reveal table th, +.reveal table td { + text-align: left; + padding: 0.2em 0.5em 0.2em 0.5em; + border-bottom: 1px solid; } + +.reveal table th[align="center"], +.reveal table td[align="center"] { + text-align: center; } + +.reveal table th[align="right"], +.reveal table td[align="right"] { + text-align: right; } + +.reveal table tbody tr:last-child th, +.reveal table tbody tr:last-child td { + border-bottom: none; } + +.reveal sup { + vertical-align: super; } + +.reveal sub { + vertical-align: sub; } + +.reveal small { + display: inline-block; + font-size: 0.6em; + line-height: 1.2em; + vertical-align: top; } + +.reveal small * { + vertical-align: top; } + +/********************************************* + * LINKS + *********************************************/ +.reveal a { + color: #2a76dd; + text-decoration: none; + -webkit-transition: color .15s ease; + -moz-transition: color .15s ease; + transition: color .15s ease; } + +.reveal a:hover { + color: #6ca0e8; + text-shadow: none; + border: none; } + +.reveal .roll span:after { + color: #fff; + background: #1a53a1; } + +/********************************************* + * IMAGES + *********************************************/ +.reveal section img { + margin: 15px 0px; + background: rgba(255, 255, 255, 0.12); + border: 4px solid #222; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.15); } + +.reveal section img.plain { + border: 0; + box-shadow: none; } + +.reveal a img { + -webkit-transition: all .15s linear; + -moz-transition: all .15s linear; + transition: all .15s linear; } + +.reveal a:hover img { + background: rgba(255, 255, 255, 0.2); + border-color: #2a76dd; + box-shadow: 0 0 20px rgba(0, 0, 0, 0.55); } + +/********************************************* + * NAVIGATION CONTROLS + *********************************************/ +.reveal .controls .navigate-left, +.reveal .controls .navigate-left.enabled { + border-right-color: #2a76dd; } + +.reveal .controls .navigate-right, +.reveal .controls .navigate-right.enabled { + border-left-color: #2a76dd; } + +.reveal .controls .navigate-up, +.reveal .controls .navigate-up.enabled { + border-bottom-color: #2a76dd; } + +.reveal .controls .navigate-down, +.reveal .controls .navigate-down.enabled { + border-top-color: #2a76dd; } + +.reveal .controls .navigate-left.enabled:hover { + border-right-color: #6ca0e8; } + +.reveal .controls .navigate-right.enabled:hover { + border-left-color: #6ca0e8; } + +.reveal .controls .navigate-up.enabled:hover { + border-bottom-color: #6ca0e8; } + +.reveal .controls .navigate-down.enabled:hover { + border-top-color: #6ca0e8; } + +/********************************************* + * PROGRESS BAR + *********************************************/ +.reveal .progress { + background: rgba(0, 0, 0, 0.2); } + +.reveal .progress span { + background: #2a76dd; + -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); + -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); + transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } diff --git a/librerias/slick/style.css b/librerias/slick/style.css index 28685fa..c18715d 100644 --- a/librerias/slick/style.css +++ b/librerias/slick/style.css @@ -3,7 +3,7 @@ } .slider { - width: 50%; + width: 100%; margin: 100px auto; } diff --git a/milfs/funciones/funciones.php b/milfs/funciones/funciones.php index b272e9b..4702adc 100644 --- a/milfs/funciones/funciones.php +++ b/milfs/funciones/funciones.php @@ -644,7 +644,7 @@ function formulario_acciones($id,$tipo) { $geo = buscar_campo_tipo("$id","14"); // $buscador = buscar_datos("*formato*","$id","grid","mostrar_contenido_buscador"); if($geo[0] !='') { - $mapa_aplicacion= "
  • "; + $mapa_aplicacion= "
  • "; $mapa= "
  • Mapa
  • {GEOJson}
  • ";}else {$mapa='';} @@ -679,8 +679,8 @@ $acciones="
  • $mapa_aplicacion -
  • -
  • +
  • +
  • $agregar
  • @@ -6280,17 +6280,25 @@ while( $row = mysqli_fetch_array( $sql ) ) { $privado = $privado[1]; /// PRIVACIDAD if($privado !='1') { - +// $row[id_campo] x$row[campo_nombre] x$row[campo_descripcion] x$estadisticasx x $estadisticas = formulario_estadistica("$formulario","$row[id_campo]","contenido","barras"); -$listado .= " $row[id_campo]$row[campo_nombre]$row[campo_descripcion]$estadisticas"; +$listado .= " + + $row[id_campo]$row[campo_nombre] / $row[campo_descripcion]$estadisticas + +"; }else {$listado.="";} } $resultado = " - - +
    IdNombre campoDescripcion
    + + + + $listado +
    IdNombre campoDescripcionx
    @@ -8654,85 +8662,61 @@ while( $row = mysqli_fetch_array( $sql ) ) { $id_campo = $campo[0]; $imagen = remplacetas('form_datos','control',$row['control'],'contenido',"id_campo = '$id_campo'") ; - $items .= "
    - - + $items .= "
    $contenido_desplegado -
    "; - $indicador .= "
  • "; + $indicadores .= "
    "; $titulo = remplacetas('form_datos','id',$identificador,'contenido',"") ; //$contenido .= "$contenido_desplegado "; $ordenado = ($ordenado +1 ); } + $items .= "
    + + +
    "; -$carrusel = " - - -