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

Merge branch 'master' of h4ckypurpl3/tupali_fork into master

Browse Source
This commit is contained in:
Fredy Rivera 2018-10-12 12:02:27 -05:00 committed by Gitea
commit 97c97e1b61
5 changed files with 165 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
index.php
View File

@ -195,7 +195,7 @@ if ($variable !=''){
$menu ="
<div class='col-sm-3 col-lg-2 hidden-xs hidden-sm' id='caja_lateral_derecha'>
<div class='container'>
<nav style=' max-height:95% !important ; overflow:auto !important; ' id='toc' data-spy='affix' data-toggle='toc'></nav>
<nav id='toc' data-spy='affix' data-toggle='toc'></nav>
</div>
</div>";
$cols_interior ="10";
@ -1112,39 +1112,53 @@ $uri = $_SERVER['REQUEST_URI'];
if($tema=="") {
$barra="
<div class='noprint nomostrar' style=' $no_mostrar '>
<nav class='navbar navbar-fixed-top topnav navbar-principal ' role='navigation'>
<div style='padding:10px; ' class='container topnav '>
<ul style=' ' class='nav navbar-nav navbar-center navbar-principal '>
<li class='dropdown ' >
<a style='background-color:#F3F1F0; color:red; border-top-left-radius: 0px; border-bottom-left-radius: 0px;' href='#' class='dropdown-toggle menu_tupale img-rounded' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'><i class='fa fa-bars'></i><span class='hidden-xs'> $portal_sigla<span></a>
<ul class='dropdown-menu' >
<div class='noprint nomostrar container' id='cabecera' style=' $no_mostrar '>
<nav class='navbar navbar-fixed-top navbar-inverse navbar-toggleable-sm ' id='navbar-principal'>
<div class='container navegacion'>
<div class='navbar-header'>
<button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#navbar' aria-expanded='false' aria-controls='navbar'>
<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='./e$id_empresa[0]'>
<img id='logo_cabecera' class='center-block img img-responsive' style='' src='milfs/images/secure/?file=300/$logo[0]'>
</a>
</div>
<div id='menu_principal' class='navbar-collapse collapse'>
<ul class='nav navbar-nav'>
<li class='dropdown '>
<a href='#' class='dropdown-toggle menu_tupale img-rounded' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'><i class='fa fa-bars'></i><span class='hidden-xs'> $portal_sigla<span></a>
<ul class='dropdown-menu' id='menu_tupale'>
<li><a class='' href='$portal_url'><i class='fa fa-home'></i> Portal</a></li>
<li><a class='' href='$link_empresa'>$sigla[0] Inicio</a></li>
<li><a href='milfs/'>Ingresar</a></li>
<li><a href='s363'>Blog</a></li>
<li><a href='s133'>Ayuda y documentación</a></li>
<li role='separator' class='divider'></li>
".aplicaciones_listado("$id_empresa",'','nav','')."
</ul>
</li>
</ul>
<ul class='nav navbar-nav navbar-right'>
<li><a href='milfs/'>Ingresar</a></li>
$soporte
<li><a href='https://twitter.com/ $twitter[0]'><i class='fa fa-twitter'></i></a></li>
<li><a href='$facebook[0]'><i class='fa fa-facebook'></i></a></li>
</ul>
</div>
</nav>
</div>
";
echo $css; ?>
echo $css;
?>
<script src="./librerias/jquery/jquery-2.1.4.min.js" ></script>
<script src="./librerias/bootstrap/js/bootstrap.min.js" ></script>
<!-- <script src="./librerias/charts/Chart.bundle.js"></script>
@ -1195,7 +1209,6 @@ $barra="
<ul >
<li><a class='' href='$portal_url'><i class='fa fa-home'></i> Portal</a></li>
<li><a class='' href='$link_empresa'>".@$sigla[0]." Inicio</a></li>
<li><a href='milfs/'>Administrador</a></li>
<li><a href='s363'>Blog</a></li>
<li role='separator' class='divider'></li>
".aplicaciones_listado("$id_empresa",'','nav','')."
@ -1309,16 +1322,17 @@ document.oncopy = addLink;
$id_empresa_portada='1';
if($_SESSION['grupo'] == '3'){
echo " <span style=' $no_mostrar '>".panel_aplicaciones('1',"","")." </span>";
echo " <li style=' $no_mostrar '>".panel_aplicaciones('1',"","")." </li>";
}
else{ $usuario = $_SESSION['username'];
echo " <span style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." </span>";
echo " <li style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." </li>";
}
}else{ echo "
<span style=' $no_mostrar '><div style='max-width:100%;' class='container-fluid noprint text-center $no_mostrar ' id='cabecera-botonera-admin'>
<li style=' $no_mostrar '><div style='max-width:100%; ' class='container-fluid noprint text-center $no_mostrar ' id='cabecera-botonera-admin'>
<a class='btn btn-link' id='ingreso_usuario' href='./milfs'>Ingresar <i class='fa fa-users' aria-hidden='true'></i> Aportar a la inteligencia colectiva</a></div></li>";
<a class='btn btn-link' href='./milfs' >Ingresa, se parte de nuestra comunidad</a></div></span>";
}
@ -1486,43 +1500,18 @@ echo $css_adicional;
<div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
<?php echo $menu_lateral ; ?>
<!-- END #fh5co-offcanvas -->
<header id="fh5co-header">
<div class="row" id="cabecera">
<div class='pull-right redes_index'>
<a href="#" class="js-fh5co-nav-toggle fh5co-nav-toggle"><i></i></a>
<ul class="fh5co-social list-inline intro-social-buttons ">
<?php echo $soporte; ?>
<li><a href="https://twitter.com/<?php echo $twitter[0]; ?>"><i class="fa fa-twitter"></i></a></li>
<li><a href="<?php echo $facebook[0]; ?>"><i class="fa fa-facebook"></i></a></li>
<!-- <li><?php echo milfs_session("$login_formulario","$login_campo_usuario","$login_campo_password","boton",""); ?></li> -->
</ul>
</div>
<div id='meta_cabecera'>
<div class="container-fluid" id='principal_superior'>
<div class="col-md-9">
<div id='formulario_login' class='' ></div>
<div class='container' id='contenedor_cabecera'>
<div class='col-sm-3 col-md-3' id='logo_cabecera'>
<a href="./e<?php echo $id_empresa; ?>">
<img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>">
</a>
</div>
<div class='col-sm-6 col-md-7'>
<h1 id="titulo_cabecera" data-toc-skip ><a href="<?php if($id_form !=""){echo "s".$id_form;} ?>"><?php echo $titulo[0]; ?></a></h1>
<div id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div>
</div>
</div>
<div class='container top' id='contenedor_cabecera'>
<h1 class="text-center" id="titulo_cabecera" data-toc-skip ><a href="<?php if($id_form !=""){echo "s".$id_form;} ?>"><?php echo $titulo[0]; ?></a></h1>
<div class="text-center"id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div>
</div>
<div id="asistento" class="col-md-12 text-center">
@ -1555,8 +1544,6 @@ echo $css_adicional;
</div>
</div>
</div>
</header>
<div class="container-fluid" id='caja'>
@ -1714,6 +1701,7 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
</style>
<script type="text/javascript" src="librerias/landingjs/scripts_landing.js"></script>
</body>
</html>

11
librerias/landingjs/scripts_landing.js Normal file
View File

@ -0,0 +1,11 @@
$(window).scroll(function() {
if ($(document).scrollTop() > 5) {
$('nav').addClass('shrink');
} else {
$('nav').removeClass('shrink');
}
});
$(window).scroll(function(){
$(".top").css("opacity", 1 - $(window).scrollTop() / 100);
});

2
milfs

@ -1 +1 @@
Subproject commit 28db432f8386c34cd78fc9a3aadb75a552efdea7
Subproject commit abe571af6d72b41b9050cfa754a3fffb2c68e561

2
temas/landingpage/css/landingpage.css
View File

@ -79,6 +79,8 @@ ul, ol {
/* USING BOOTSTRAP 3.0.3 */
/*NAVBAR BRAND*/
.navbar-brand {
transform: translateX(-50%);
left: 50%;