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 +39 -35
3 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
index.php
View File

@ -7,7 +7,7 @@
//$xajax = new xajax("https://tupale.co/index.php"); //$xajax = new xajax("https://tupale.co/index.php");
require ("milfs/funciones/conex.php"); require ("milfs/funciones/conex.php");
include ('milfs/librerias/parsedown/Parsedown.php'); include ('milfs/librerias/parsedown/Parsedown.php');
require ('milfs/funciones/funciones.php'); require ('milfs/funciones/funciones.php');
include ('milfs/addon/funciones.php'); include ('milfs/addon/funciones.php');
@ -104,7 +104,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'];
} }
@ -133,7 +133,7 @@ if ($v[0] =='e') {
$variable = $vista_favorita;//"e".$_REQUEST['empresa']; $variable = $vista_favorita;//"e".$_REQUEST['empresa'];
}else{ }else{
$variable= "$v[0]$v[1]"; $variable= "$v[0]$v[1]";
} }
} }
} }
@ -336,7 +336,7 @@ if ($variable !=''){
elseif($v[0] =='p') { elseif($v[0] =='p') {
$set =$v[1]; $set =$v[1];
$form =$v[1]; $form =$v[1];
$librerias_cabeza=' $librerias_cabeza='
<link rel="stylesheet" type="text/css" href="librerias/datatables/datatables.css"> <link rel="stylesheet" type="text/css" href="librerias/datatables/datatables.css">
<script type="text/javascript" charset="utf8" src="librerias/datatables/datatables.js"></script> <script type="text/javascript" charset="utf8" src="librerias/datatables/datatables.js"></script>
@ -348,7 +348,7 @@ if ($variable !=''){
/// s= SET DE DATOS /// s= SET DE DATOS
$embebido = "1"; $embebido = "1";
if(isset($_REQUEST['print'])) { $print = "window.print()";} if(isset($_REQUEST['print'])) { $print = "window.print()";}
$onload = "".planilla("$set","$_REQUEST[registros]",'')." <script type=\"text/javascript\">$print</script> $onload = "".planilla("$set","$_REQUEST[registros]",'')." <script type=\"text/javascript\">$print</script>
"; ";
@ -486,8 +486,8 @@ if ($variable !=''){
</script> </script>
"; ";
// $no_mostrar="display:none; "; // $no_mostrar="display:none; ";
@ -500,7 +500,7 @@ if ($variable !=''){
$presentacion = contenido_presentacion("$form"); $presentacion = contenido_presentacion("$form");
$embebido = "1"; $embebido = "1";
//$no_mostrar ="display:none; "; //$no_mostrar ="display:none; ";
$empresa = remplacetas('form_id','id',"$form",'id_empresa',"") ; $empresa = remplacetas('form_id','id',"$form",'id_empresa',"") ;
$id_empresa= $empresa[0]; $id_empresa= $empresa[0];
$logo = remplacetas('empresa','id',$id_empresa,'imagen','') ; $logo = remplacetas('empresa','id',$id_empresa,'imagen','') ;
@ -568,11 +568,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>
@ -676,7 +676,7 @@ if('serviceWorker' in navigator) {
if($form==""){$form='0';} if($form==""){$form='0';}
$embebido = "1"; $embebido = "1";
$no_mostrar ="display:none; "; $no_mostrar ="display:none; ";
$librerias_galeria =" $librerias_galeria ="
<!-- <link rel='manifest' href='manifest.json'> --> <!-- <link rel='manifest' href='manifest.json'> -->
<link rel='stylesheet' type='text/css' href='librerias/slick/slick.css'> <link rel='stylesheet' type='text/css' href='librerias/slick/slick.css'>
@ -690,19 +690,19 @@ if('serviceWorker' in navigator) {
$plantilla="landingpage"; $plantilla="landingpage";
$librerias_cabeza =" $librerias_cabeza ="
<style> <style>
img { display: block; img { display: block;
max-width: 100%; max-width: 100%;
height: auto;} height: auto;}
.control_planilla{ .control_planilla{
display:none display:none
} }
</style> </style>
$librerias_galeria $librerias_galeria
@ -710,14 +710,14 @@ if('serviceWorker' in navigator) {
$librerias_pie =" $librerias_pie ="
<script type = 'text/javascript' > <script type = 'text/javascript' >
$(document).ready(function() { $(document).ready(function() {
loadArticle(1,$form,'galeria',$registros,'scroll-galeria','voyeur'); loadArticle(1,$form,'galeria',$registros,'scroll-galeria','voyeur');
loadArticle(2,$form,'galeria',$registros,'scroll-galeria','voyeur'); loadArticle(2,$form,'galeria',$registros,'scroll-galeria','voyeur');
@ -772,7 +772,7 @@ $librerias_pie ="
<link href='./librerias/summernote/summernote.css' rel='stylesheet'> <link href='./librerias/summernote/summernote.css' rel='stylesheet'>
"; ";
$librerias_pie =" $librerias_pie ="
<script type='text/javascript'> <script type='text/javascript'>
//// wysiwyg //// wysiwyg
var edit = function() { var edit = function() {
@ -995,7 +995,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'>
@ -1023,7 +1023,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>
@ -1192,7 +1192,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=="") {
@ -1286,9 +1286,9 @@ 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'/>
"; ";
echo $librerias_cabeza; echo $librerias_cabeza;
include("temas/$tema/cabecera"); include("temas/$tema/cabecera");
include("temas/$tema/pie"); include("temas/$tema/pie");
$barra=" $barra="
@ -1552,7 +1552,7 @@ echo $css_adicional;
<!-- </div> --> <!-- </div> -->
<!-- Modal --> <!-- Modal -->
<div class='modal fade animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade animated' 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>
@ -1657,7 +1657,7 @@ echo $css_adicional;
</div> </div>
<div class='col-md-9' id='texto_articulo'>" <div class='col-md-9' id='texto_articulo'>"
; ;
}else{ echo "<div class='col-md-12 col-lg-12' id='lo_ultimo'>" ;} }else{ echo "<div class='col-md-12 col-lg-12' id='texto_articulo'>" ;}
?> ?>
<?php echo $eventos; <?php echo $eventos;
if($id_empresa=="") { if($id_empresa=="") {
@ -1714,7 +1714,7 @@ echo $css_adicional;
<?php echo $menu; ?> <?php echo $menu; ?>
<div class='modal fade animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade animated' 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' >
@ -1791,7 +1791,7 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
<script type="text/javascript" src="librerias/landingjs/scripts_landing.js"></script> <script type="text/javascript" src="librerias/landingjs/scripts_landing.js"></script>
<?php <?php
if(isset($_SESSION['id'] )) { if(isset($_SESSION['id'] )) {
echo " echo "
<form name='form_session' class='navbar-form navbar-left'> <form name='form_session' class='navbar-form navbar-left'>
@ -1800,11 +1800,11 @@ if(isset($_SESSION['id'] )) {
<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>";
} }
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$('.navbar-collapse a').click(function(){ $('.navbar-collapse a').click(function(){
$(".navbar-collapse").collapse('hide'); $(".navbar-collapse").collapse('hide');
}); });

10
librerias/landingjs/scripts_landing.js
View File

@ -10,6 +10,10 @@ $(window).scroll(function(){
$(".top").css("opacity", 1 - $(window).scrollTop() / 100); $(".top").css("opacity", 1 - $(window).scrollTop() / 100);
}); });
$('.dropdown-menu').click(function(e) { $(document).ready(function(){
e.stopPropagation(); //This will prevent the event from bubbling up and close the dropdown when you type/click on text boxes. $('#user_dropdow').on("click", function(e){
}); $(this).next('ul').toggle();
e.stopPropagation();
e.preventDefault();
});
});

2
milfs

@ -1 +1 @@
Subproject commit b5146f32e000cf8b8b94d1dea6c738a27f3c5461 Subproject commit ab730fa739789f141914a7503facb8e80f43b981