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

Implementación diseño landingpage #158

Merged
humano merged 11 commits from h4ckypurpl3/tupali_fork:master into master 2018-10-12 17:02:27 +00:00
Conversation 0 Commits 11 Files Changed 5 +45 -84
3 changed files with 45 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1f6a4814c - Show all commits

105
index.php
View File

@ -1110,36 +1110,47 @@ $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='container' id='cabecera'>
<nav class='navbar navbar-inverse navbar-toggleable-md navbar-fixed-top' id='nav-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<?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 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'>
<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>
<?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>
</ul>
</div>
</nav>
</div>
";
echo $css; ?>
@ -1193,7 +1204,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','')."
@ -1306,17 +1316,17 @@ document.oncopy = addLink;
if(isset($_SESSION['id'] )) {
$id_empresa_portada='1';
if($_SESSION['grupo'] == '3'){
echo "<span 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' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='fa fa-times '></i></a></div></span>";
echo "<li style=' $no_mostrar '><div style='max-width:100%;' class='container-fluid noprint text-center $no_mostrar ' id='cabecera-botonera-admin'>
<a class='' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='fa fa-times '></i></a></div></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></span>";
<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>";
}
@ -1486,61 +1496,10 @@ 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="container" id="cabecera">
<nav class='navbar navbar-inverse navbar-toggleable-md navbar-fixed-top'>
<!-- <a style="color: yellow;" href="#" class="js-fh5co-nav-toggle fh5co-nav-toggle"><i></i></a> -->
<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<?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 id='navbar' class='navbar-collapse collapse'>
<!-- <ul class='nav navbar-nav'>
<li><a href='#proyectos'>Proyectos</a></li>
<li><a href='#servicios'>Servicios</a></li>
<li><a href='#precios'>Precios</a></li>
<li><a href='#patrocinio'>Patrocina</a></li>
</ul> -->
<ul class='nav navbar-nav navbar-right'>
<!-- <li><a href='#equipo'>Nosotros</a></li> -->
<?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> -->
<li class='dropdown'>
<a href='#' class='dropdown-toggle' data-toggle='dropdown'>Ingresar<b class='caret'></b></a>
<!-- <ul class='dropdown-menu'>
<li><a href='#'>Desadministrador</a></li>
<li><a href='#'>Editor</a></li>
<li><a href='#'>Activista</a></li>
<li class='divider'></li>
<li><a href='#'>Registrarse</a></li>
</ul> -->
</li>
</ul>
<!-- <ul class="fh5co-social list-inline intro-social-buttons ">
-->
</div>
</nav>
</div>
<div class="container-fluid" id='principal_superior'>
<div id='formulario_login' class='' ></div>
<div class='container top' id='contenedor_cabecera'>

2
milfs

@ -1 +1 @@
Subproject commit 86f1774b3da588b0f156281e861ce34a581d78db
Subproject commit 28c935e11e9ef038d54860b6117454cb135ef005

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%;