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

pull del upstream

Browse Source
This commit is contained in:
Hacky Purple 2018-11-02 13:30:55 -05:00
commit 7790efcc38
2 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
index.php
View File

@ -1,8 +1,6 @@
<?php session_start(); <?php session_start();
if(isset($_REQUEST['debug'])) {
print_r( $_SESSION );
ini_set('display_errors', 'On');}
require ('milfs/xajax/xajax.inc.php'); require ('milfs/xajax/xajax.inc.php');
//$xajax = new xajax(); //$xajax = new xajax();
$xajax = new xajax(""); $xajax = new xajax("");
@ -35,8 +33,13 @@ if(isset($_REQUEST['debug'])) {
<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"> <script type="text/javascript">
=======
<link rel='stylesheet' href='./librerias/animate/animate.min.css'>
<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);
@ -134,9 +137,11 @@ if ($v[0] =='e') {
$pagina_inicio_definida = remplacetas('form_parametrizacion','id_empresa',$v[1],'descripcion'," tabla='empresa' AND opcion='pagina_inicio'") ; $pagina_inicio_definida = remplacetas('form_parametrizacion','id_empresa',$v[1],'descripcion'," tabla='empresa' AND opcion='pagina_inicio'") ;
$vista_favorita = vista_favorita($pagina_inicio_definida[0]); $vista_favorita = vista_favorita($pagina_inicio_definida[0]);
// $onload = "<script type=\"text/javascript\">window.location.href='$vista_favorita';</script> "; // $onload = "<script type=\"text/javascript\">window.location.href='$vista_favorita';</script> ";
if($vista_favorita[0] !=""){
$variable = $vista_favorita;//"e".$_REQUEST['empresa']; $variable = $vista_favorita;//"e".$_REQUEST['empresa'];
} }
} }
}
$v = decodifica_parametro($variable); $v = decodifica_parametro($variable);
if(isset($_REQUEST['plantilla'])){ if(isset($_REQUEST['plantilla'])){
@ -709,6 +714,7 @@ if('serviceWorker' in navigator) {
$footer=" $footer="
<<<<<<< HEAD
<nav class='navbar navbar-inverse navbar-fixed-bottom'> <nav class='navbar navbar-inverse navbar-fixed-bottom'>
@ -723,6 +729,32 @@ if('serviceWorker' in navigator) {
</div> </div>
</nav>"; </nav>";
=======
<nav class='navbar navbar-default navbar-fixed-bottom'>
<div class='container-fluid'>
<!-- Brand/logo -->
<div class='navbar-header'>
<button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#example-1' aria-expanded='false'>
<span class='sr-only'>Toggle navigation</span>
<span class='icon-bar'></span>
<span class='icon-bar'></span>
<span class='icon-bar'></span>
</button>
<a class='navbar-brand' href='#'></a>
</div>
<!-- Collapsible Navbar -->
<div class='collapse navbar-collapse' id='example-1'>
<ul class='nav navbar-nav'>
$acciones
</ul>
</div>
</div>
</nav>";
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
@ -1412,7 +1444,13 @@ document.oncopy = addLink;
</head> </head>
<body data-spy="scroll" data-target="#toc" onload="revisarSession()"; > <body data-spy="scroll" data-target="#toc" onload="revisarSession()"; >
<?php
if(isset($_REQUEST['debug'])) {
print_r( $_SESSION );
print_r( $_REQUEST );
echo "$variable ($pagina_inicio_definida[2])";
ini_set('display_errors', 'On');}
?>
<?php <?php
@ -1561,7 +1599,7 @@ echo $css_adicional;
<!-- </div> --> <!-- </div> -->
<!-- Modal --> <!-- Modal -->
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div id="modal_landing" class='modal-dialog modal-lg' > <div id="modal_landing" class='modal-dialog modal-lg' >
<div class='modal-content'> <div class='modal-content'>
<button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i> </button> <button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i> </button>
@ -1723,7 +1761,7 @@ echo $css_adicional;
<?php echo $menu; ?> <?php echo $menu; ?>
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div <div id="modal_landing" class='modal-dialog modal-lg' > <div <div id="modal_landing" class='modal-dialog modal-lg' >
<div class='modal-content'> <div class='modal-content'>
<div class='modal-header' > <div class='modal-header' >
@ -1805,6 +1843,7 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
<span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span> <span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span>
</div> </div>
</form> </form>
</body> </body>
</html> </html>

12
librerias/animate/animate.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long