qwerty/tupali
4
1
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

quitando el rebote de los formularios #191

Merged
humano merged 22 commits from h4ckypurpl3/tupali_fork:master into master 2019-03-25 23:20:30 +00:00
Conversation 0 Commits 22 Files Changed 3 +10 -32
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 640e8bf956 - Show all commits

42
index.php
View File

@ -33,13 +33,8 @@
<meta name='apple-mobile-web-app-capable' content='yes'/> <meta name='apple-mobile-web-app-capable' content='yes'/>
<meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/> <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
<!-- Chrome, Firefox OS y Opera --> <!-- Chrome, Firefox OS y Opera -->
<<<<<<< HEAD
<script type="text/javascript">
=======
<link rel='stylesheet' href='./librerias/animate/animate.min.css'> <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
<script type="text/javascript"> <script type="text/javascript">
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
window.addEventListener("load",function() { window.addEventListener("load",function() {
setTimeout(function(){ setTimeout(function(){
window.scrollTo(0, 1); window.scrollTo(0, 1);
@ -112,7 +107,7 @@ $librerias_pie ="";
//if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";} //if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";}
if (isset($_REQUEST['empresa'])) { if (isset($_REQUEST['empresa'])) {
$variable = "e".$_REQUEST['empresa']; $variable = "e".$_REQUEST['empresa'];
} }
@ -567,11 +562,11 @@ if ($variable !=''){
$plantilla="landingpage"; $plantilla="landingpage";
$librerias_cabeza =" $librerias_cabeza ="
<style> <style>
.control_planilla{ .control_planilla{
display:none display:none
} }
</style> </style>
<script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script> <script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script>
<script src='./librerias/charts/Chart.bundle.js'></script> <script src='./librerias/charts/Chart.bundle.js'></script>
@ -689,7 +684,7 @@ if('serviceWorker' in navigator) {
<div class='container-fluid'> <div class='container-fluid'>
<div style='overflow-y: scroll; overflow-x: hidden; max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '> <div style='overflow-y: scroll; overflow-x: hidden; max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
<br> <br>
<table class='table table-bordered table-striped exportable'> <table class='table table-bordered table-striped exportable'>
<thead></thead> <thead></thead>
<tbody style=' ' id='scroll-galeria' > <tbody style=' ' id='scroll-galeria' >
</tbody> </tbody>
@ -711,25 +706,9 @@ if('serviceWorker' in navigator) {
$estadisticas = portal_listado_campos("$form"); $estadisticas = portal_listado_campos("$form");
$acciones= formulario_acciones("$form","aplicacion"); $acciones= formulario_acciones("$form","aplicacion");
$no_mostrar="display:none; "; $no_mostrar="display:none; ";
$footer=" $footer="
<<<<<<< HEAD
<nav class='navbar navbar-inverse navbar-fixed-bottom'>
<div id='navbar' class='' aria-expanded='false' style='height: 1px;'>
<ul class='nav navbar-nav center-block' style='
float:none;
margin:0 auto;
display: block;
text-align: center;'>
$acciones
</ul>
</div>
</nav>";
=======
<nav class='navbar navbar-default navbar-fixed-bottom'> <nav class='navbar navbar-default navbar-fixed-bottom'>
<div class='container-fluid'> <div class='container-fluid'>
@ -754,7 +733,6 @@ $acciones
</div> </div>
</nav>"; </nav>";
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
@ -790,7 +768,7 @@ $acciones
<div style='overflow-y: scroll; overflow-x: hidden; max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); ' > <div style='overflow-y: scroll; overflow-x: hidden; max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); ' >
<br> <br>
<div class=''> <div class=''>
<table class='table table-bordered table-striped exportable'> <table class='table table-bordered table-striped exportable'>
<thead>$titulos</thead> <thead>$titulos</thead>
<tbody style=' ' id='scroll-content' > <tbody style=' ' id='scroll-content' >
</tbody> </tbody>
@ -1043,7 +1021,7 @@ $aplicacion_pie="
$banner $banner
</div> </div>
<div class='barra navbar-collapse collapse ' id='barra_aplicaciones'> <div class='barra navbar-collapse collapse ' id='barra_aplicaciones'>
<div class='navbar-header'> <div class='navbar-header'>
<button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'> <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'>
@ -1071,7 +1049,7 @@ $aplicacion_pie="
</div> </div>
<div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div> <div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div>
$presentacion $presentacion
<script> <script>
@ -1240,7 +1218,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
if(isset($_SESSION['id'])){ if(isset($_SESSION['id'])){
$form_tiempo_session = " $form_tiempo_session = "
<li> <li>
</li> "; } else{ $form_tiempo_session = "";} </li> "; } else{ $form_tiempo_session = "";}
if($tema=="") { if($tema=="") {
@ -1334,7 +1312,7 @@ else {
<!-- iOS Safari --> <!-- iOS Safari -->
<meta name='apple-mobile-web-app-capable' content='yes'/> <meta name='apple-mobile-web-app-capable' content='yes'/>
<meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/> <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
"; ";
include("temas/$tema/cabecera"); include("temas/$tema/cabecera");
include("temas/$tema/pie"); include("temas/$tema/pie");