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

Corrección de landingpage #165

Merged
humano merged 16 commits from h4ckypurpl3/tupali_fork:master into master 2018-10-24 14:48:10 +00:00
Conversation 0 Commits 16 Files Changed 4 +18 -16
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "milfs"]
path = milfs
url = https://code.tupale.co/qwerty/milfs
url = https://code.tupale.co/kleper/milfskleper

26
index.php
View File

@ -13,8 +13,8 @@ if(isset($_REQUEST['debug'])) {
require ("milfs/includes/markdown.php");
require ("milfs/includes/parametrizacion.php");
require ("milfs/includes/simple_html_dom.php");
$xajax->processRequests();
$xajax->processRequests();
$timestamp=time();
setcookie("timestamp",$timestamp,($timestamp + 5000));
$_SESSION['timestamp']= $timestamp;
@ -960,7 +960,7 @@ $aplicacion_pie="
<a href='#' class='dropdown-toggle ' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
Secciones<span class='caret'></span>
</a>
<ul class='dropdown-menu'>
<ul class='dropdown-menu'>
$aplicaciones_listado
</ul>
</li>
@ -1120,14 +1120,12 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
if(isset($_SESSION['id'])){ $boton_ingresar="
<li class='dropdown'>
<a href='milfs/' class='dropdown-toggle' data-toggle='dropdown'>$_SESSION[username]<b class='caret'></b></a>
<ul class='dropdown-menu'>
<li>
$panel_aplicaciones
</li>
<li id='user_dropdow' class='dropdown'>
<a href='milfs/' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>$_SESSION[username]<b class='caret'></b></a>
<ul id='menu_administrador' class='dropdown-menu'>
$panel_aplicaciones
<li class='divider'></li>
<li><a onclick=\"xajax_milfs_session('','','','salir') \">SALIR <i class='fa fa-sign-out'></i></a></li>
<li><a onclick=\"xajax_milfs_session('','','','salir') \"><i class='fa fa-sign-out'></i> SALIR</a></li>
</ul>
</li>
@ -1140,12 +1138,12 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
;}
if(isset($_SESSION['id'])){
if(isset($_SESSION['id'])){
$form_tiempo_session = "
<li>
<form name='form_session' class='navbar-form navbar-left'>
<form name='form_session' class='navbar-form navbar-left'>
<div class='input-group'>
<input type='text' name='tiempo_session' size='30' class='form-control input-sm' readonly>
<input type='text' name='tiempo_session' size='30' class='form-control input-sm' readonly>
<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span>
</div>
</form>
@ -1275,7 +1273,7 @@ $menu_lateral = "
$soporte
<li><a href='https://twitter.com/$twitter[0]'><i class='icon-twitter'></i></a></li>
<li><a href='https://www.facebook.com/$facebook[0]'><i class='icon-facebook'></i></a></li>
</ul>
</div>

4
librerias/landingjs/scripts_landing.js
View File

@ -9,3 +9,7 @@ $(window).scroll(function() {
$(window).scroll(function(){
$(".top").css("opacity", 1 - $(window).scrollTop() / 100);
});
$('.dropdown-menu').click(function(e) {
e.stopPropagation(); //This will prevent the event from bubbling up and close the dropdown when you type/click on text boxes.
});

2
milfs

@ -1 +1 @@
Subproject commit ade42da280750575989a5cef5b144dc1f54c46b1
Subproject commit 3373ee1dd17019a91f63696fdfc00277dd6ad88a