Merge branch 'master' of h4ckypurpl3/tupali_fork into master
This commit is contained in:
commit
605e319e87
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
|||||||
[submodule "milfs"]
|
[submodule "milfs"]
|
||||||
path = milfs
|
path = milfs
|
||||||
url = https://code.tupale.co/qwerty/milfs
|
url = https://code.tupale.co/kleper/milfskleper
|
||||||
|
14
index.php
14
index.php
@ -960,7 +960,7 @@ $aplicacion_pie="
|
|||||||
<a href='#' class='dropdown-toggle ' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
|
<a href='#' class='dropdown-toggle ' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
|
||||||
Secciones<span class='caret'></span>
|
Secciones<span class='caret'></span>
|
||||||
</a>
|
</a>
|
||||||
<ul class='dropdown-menu'>
|
<ul class='dropdown-menu'>
|
||||||
$aplicaciones_listado
|
$aplicaciones_listado
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
@ -1120,14 +1120,12 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
|
|||||||
if(isset($_SESSION['id'])){ $boton_ingresar="
|
if(isset($_SESSION['id'])){ $boton_ingresar="
|
||||||
|
|
||||||
|
|
||||||
<li class='dropdown'>
|
<li id='user_dropdow' class='dropdown'>
|
||||||
<a href='milfs/' class='dropdown-toggle' data-toggle='dropdown'>$_SESSION[username]<b class='caret'></b></a>
|
<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 class='dropdown-menu'>
|
<ul id='menu_administrador' class='dropdown-menu'>
|
||||||
<li>
|
$panel_aplicaciones
|
||||||
$panel_aplicaciones
|
|
||||||
</li>
|
|
||||||
<li class='divider'></li>
|
<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>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
@ -9,3 +9,7 @@ $(window).scroll(function() {
|
|||||||
$(window).scroll(function(){
|
$(window).scroll(function(){
|
||||||
$(".top").css("opacity", 1 - $(window).scrollTop() / 100);
|
$(".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
2
milfs
@ -1 +1 @@
|
|||||||
Subproject commit ade42da280750575989a5cef5b144dc1f54c46b1
|
Subproject commit 3373ee1dd17019a91f63696fdfc00277dd6ad88a
|
Loading…
Reference in New Issue
Block a user