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

Consistencia entre las vistas de empresas y tupale principal #170

Merged
humano merged 3 commits from h4ckypurpl3/tupali_fork:master into master 2018-10-25 15:47:24 +00:00
Conversation 0 Commits 3 Files Changed 2 +13 -11
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ee721887b - Show all commits

22
index.php
View File

@ -22,7 +22,7 @@ if(isset($_REQUEST['debug'])) {
<!DOCTYPE html>
<html lang="en">
<head >
<script src="milfs/js/scripts.js"></script>
<meta http-equiv="Cache-control" content="public">
<meta charset="UTF-8">
<meta name="viewport" content="user-scalable=no, width=device-width, maximum-scale=1, initial-scale=1">
@ -142,6 +142,7 @@ $presentacion_cabeza = "
";
$presentacion_pie="
<script src='librerias/reveal/lib/js/head.min.js'></script>
<script src='librerias/reveal/js/reveal.js'></script>
@ -624,7 +625,7 @@ if('serviceWorker' in navigator) {
$slogan = remplacetas('empresa','id',"$id_empresa",'slogan','') ;
$web = remplacetas('empresa','id',"$id_empresa",'web','');
$logo = remplacetas('empresa','id',"$id_empresa",'imagen','') ;
$campo_imagen = buscar_campo_tipo($id,"15");
$campo_imagen = buscar_campo_tipo($form,"15");
$id_campo = $campo_imagen[0];
if($id_campo[0] =="") {
$galeria="";
@ -1141,12 +1142,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
if(isset($_SESSION['id'])){
$form_tiempo_session = "
<li>
<form name='form_session' class='navbar-form navbar-left'>
<div class='input-group'>
<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 = "";}
if($tema=="") {
@ -1303,7 +1299,7 @@ $menu_lateral = "
?>
<link href="./milfs/css/style.css" rel="stylesheet">
<script src="milfs/js/scripts.js"></script>
@ -1370,7 +1366,7 @@ document.oncopy = addLink;
}
}else{ echo "
<span style=' $no_mostrar '>
<span style=' $no_mostrar '></span>
";
@ -1737,6 +1733,12 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
<script type="text/javascript" src="librerias/landingjs/scripts_landing.js"></script>
<form name='form_session' class='navbar-form navbar-left'>
<div class='input-group'>
<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>
</body>
</html>

2
milfs

@ -1 +1 @@
Subproject commit 2ac524fc501cd3a33f5ef9bdafd364252ce5d626
Subproject commit 38bce65adbb8ea42dcfa2c4e6252a09a20f95f8b