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-25 08:28:18 -05:00 committed by Gitea
commit 054d8c137e
2 changed files with 57 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
index.php
View File

@ -1143,8 +1143,8 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
<li>
<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>
<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span>
<input type='text' name='tiempo_session' size='18' class='form-control input-sm' readonly>
<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span>
</div>
</form>
</li> "; } else{ $form_tiempo_session = "";}
@ -1541,22 +1541,17 @@ echo $css_adicional;
<div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
<?php echo $menu_lateral ; ?>
<div class="col-sm-<?php echo $cols_interior; ?> col-lg-push-1 col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
<?php echo $menu_lateral ; ?>
<!-- END #fh5co-offcanvas -->
<header id="fh5co-header">
<!-- En el contenedor principal superior está: el nombre de empresa, el eslogan, el asistento -->
<div class="container-fluid" id='principal_superior'>
<div id='formulario_login' class='' ></div>
<div id='div_panel_aplicaciones' class=''>
</div>
<div id='div_panel_aplicaciones' class=''></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>
@ -1566,34 +1561,27 @@ echo $css_adicional;
echo asistente_aplicaciones("",'','','');
}else {
echo "<a href='?asistento' class='btn btn-success'>Quiero crear una aplicación. </a>";
}
?>
</div>
<div class="col-md-11" id='resaltado'>
<div class="col-md-push-1 col-md-10" id='resaltado'>
<div class='center-block'>
<?php
if($id_empresa=="") {
echo identificador_resaltado("1","");
//echo milfs_session("$login_formulario","$login_campo_usuario","$login_campo_password","","");
echo social_login("","","") ;
}else {echo identificador_resaltado($id_empresa,"landingpage");} ?>
}else {echo identificador_resaltado($id_empresa,"landingpage");}
?>
</div>
</div>
</div>
<!-- FIN DEL CONTENEDOR Principal Superior -->
</header>
<!-- FIN DE este <header> asociado a id="fh5co-header que tiene protagonismo en el código -->
<div class="container-fluid" id='caja'>
<?php
$id_campo = campo_titulo($set) ;
$corpus = formulario_corpus("$set","$id_campo","contenido","barras","texto_articulo");
@ -1616,7 +1604,8 @@ echo $css_adicional;
</div>
<div class='col-md-9' id='texto_articulo'>"
;
}else{ echo "<div class='col-md-12' id='texto_articulo'>" ;} ?>
}else{ echo "<div class='col-md-12 col-lg-12' id='lo_ultimo'>" ;}
?>
<?php echo $eventos;
if($id_empresa=="") {
@ -1630,7 +1619,7 @@ echo $css_adicional;
// echo mas_visto("identificador","4","");
//echo "<div class='clearfix visible-lg-block visible-md-block visible-sm-block visible-xs-block'></div>";
//echo mas_visto("formulario","4","");
echo "";
echo "</div>";
}
if($acceso ==1) {
@ -1670,7 +1659,7 @@ echo $css_adicional;
</footer>
</div>
<?php echo $menu; ?>
</div>
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div <div id="modal_landing" class='modal-dialog modal-lg' >

2
milfs

@ -1 +1 @@
Subproject commit 3373ee1dd17019a91f63696fdfc00277dd6ad88a
Subproject commit 098f9d554654bf50ceba239c013897299918a59e