Merge branch 'master' of kleper/milfskleper into master

This commit is contained in:
Fredy Rivera 2018-07-05 09:08:20 -05:00 committed by Gogs
commit 1ab0f376cb
2 changed files with 18688 additions and 600 deletions

View File

@ -4089,7 +4089,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
aria-controls='collapse_$row[id]' aria-controls='collapse_$row[id]'
class='collapsed btn btn-default' class='collapsed btn btn-default'
>Mostrar últimos $registros</a> >Mostrar últimos $registros</a>
<a class='btn btn-default' target='nuevo' onclick=\"xajax_formulario_embebido_ajax('','$row[id]','','nuevo');\"> <i class='glyphicon glyphicon-plus-sign'></i> Nueva entrada</a> <a class='btn btn-default' target='nuevo' onclick=\"xajax_formulario_embebido_ajax('','$row[id]','','nuevo');\"> <i class='glyphicon glyphicon-plus-sign'></i> Agregar</a>
<div class='btn btn-default btn-default' onclick=\"xajax_consultar_formulario('$row[id]','$registros','','modal'); \"><i class='glyphicon glyphicon-eye-open'></i> Consultar</div> <div class='btn btn-default btn-default' onclick=\"xajax_consultar_formulario('$row[id]','$registros','','modal'); \"><i class='glyphicon glyphicon-eye-open'></i> Consultar</div>
</div> </div>
<div id='collapse_$row[id]' class='panel-collapse collapse' role='tabpanel' aria-labelledby='tab_$row[id]'> <div id='collapse_$row[id]' class='panel-collapse collapse' role='tabpanel' aria-labelledby='tab_$row[id]'>
@ -4708,7 +4708,7 @@ if($tipo =="formato") {
<div id='panel_mover' class='panel panel-collapse collapse in panel-default' role='tabpanel' aria-labelledby='encabezado_mover' > <div id='panel_mover' class='panel panel-collapse collapse in panel-default' role='tabpanel' aria-labelledby='encabezado_mover' >
<div class='panel-heading'> <div class='panel-heading'>
<a data-parent='#accordion_accion_formulario' class='btn btn-primary' role='button' data-toggle='collapse' href='#panel_move' aria-expanded='false' aria-controls='collapseExample'> <a data-parent='#accordion_accion_formulario' class='btn btn-success' role='button' data-toggle='collapse' href='#panel_move' aria-expanded='false' aria-controls='collapseExample'>
<i class='glyphicon glyphicon-arrows'></i> Mover <i class='glyphicon glyphicon-arrows'></i> Mover
</a> </a>
<span class='panel-title'> El formulario y su contenido se moverán al proyecto seleccionado</span> <span class='panel-title'> El formulario y su contenido se moverán al proyecto seleccionado</span>
@ -14831,7 +14831,7 @@ $columnas = intval(12/$divider);
$mover = mover_formulario($formulario,$id_empresa,"formato"); $mover = mover_formulario($formulario,$id_empresa,"formato");
$nuevo_formulario = " $nuevo_formulario = "
<div class='form-group'> <div class='form-group'>
<a class='btn btn-primary btn-block ' href='#' onclick=\"xajax_formulario_nuevo('','contenido'); \"> <a class='btn btn-success btn-block ' href='#' onclick=\"xajax_formulario_nuevo('','contenido'); \">
<i class='glyphicon glyphicon-plus-sign-o'></i> Crear formulario </a> <i class='glyphicon glyphicon-plus-sign-o'></i> Crear formulario </a>
</div>"; </div>";
$resultado = " $resultado = "
@ -14942,21 +14942,35 @@ $item .= "<!-- <div class='col-sm-$columnas' style=';'> -->
<div class='panel panel-default' > <div class='panel panel-default' >
<div class='panel-heading' id= 'encabezado_$row[id]' role='tab'> <div class='panel-heading' id= 'encabezado_$row[id]' role='tab'>
<div class='panel-title container-fluid'> <div class='panel-title container-fluid'>
<div class='col-xs-12 col-sm-2 col-md-2 col-lg-1 alert alert-success' id='form_admin_id'>
<h2 class='text-center '>$row[id]</h2>
</div>
<div class='col-xs-12 col-sm-6' id='form_admin'> <div class='col-xs-12 col-sm-8' id='form_admin'>
<h4>$nombre_formulario[0]</h4> <h4>$nombre_formulario[0]</h4>
<div style='display:none' id='div_mostrar_portal_$row[id]'></div> <div style='display:none' id='div_mostrar_portal_$row[id]'></div>
<ul class='list-group'> <ul class='list-group'>
<li class='list-group-item'> <li class='list-group-item'>
<div class='btn btn-default' onclick=\"xajax_consultar_formulario('$row[id]','10','','modal'); \"><i class='glyphicon glyphicon-eye-open'></i> Consultar</div>
<a class='btn btn-default ' onclick =\" xajax_formulario_importar_subir('$id') \" ><i class='glyphicon glyphicon-upload'></i> Importar</a> <a class='btn btn-default ' onclick =\" xajax_formulario_importar_subir('$id') \" ><i class='glyphicon glyphicon-upload'></i> Importar</a>
<a class='btn btn-default ' href='../g$id' target='formulario'><i class='glyphicon glyphicon-floppy-disk'></i> Llenar</a> <a class='btn btn-default ' href='../g$id' target='formulario'><i class='glyphicon glyphicon-floppy-disk'></i> Llenar</a>
<div class='btn btn-default btn-default' onclick=\"xajax_consultar_formulario('$row[id]','10','','modal'); \"><i class='glyphicon glyphicon-eye-open'></i> Consultar</div>
<a class='btn btn-default btn-default collapsed' role='button' data-toggle='collapse' data-parent='#acordion_grid' href='#collapse$row[id]' aria-expanded='false' aria-controls='collapse$row[id]'> <a class='btn btn-default collapsed' role='button' data-toggle='collapse' data-parent='#acordion_grid' href='#collapse$row[id]' aria-expanded='false' aria-controls='collapse$row[id]'>
<i class='glyphicon glyphicon-edit'></i> Editar <i class='glyphicon glyphicon-edit'></i> Editar
</a> </a>
<a class='btn btn-default collapsed text-right' role='button' data-toggle='collapse' data-parent='#acordion_grid' href='#info_form$row[id]' aria-expanded='false' aria-controls='info_form$row[id]'>
<i class='glyphicon glyphicon-info-sign'></i> Info
</a>
<a class='btn btn-default collapsed text-right' role='button' data-toggle='collapse' data-parent='#acordion_grid' href='#config_form$row[id]' aria-expanded='false' aria-controls='config_form$row[id]'>
<i class='glyphicon glyphicon-cog'></i>
</a>
</li> </li>
<div id='config_form$row[id]' class='panel-collapse collapse' role='tabpanel' aria-labelledby='encabezado_$row[id]'>
<div class='panel-body' >
<div class='container-fluid'>
<li class='list-group-item'> <li class='list-group-item'>
<div class='input-group'> <div class='input-group'>
<span class='input-group-addon'>NO</span> <span class='input-group-addon'>NO</span>
@ -14981,13 +14995,13 @@ $item .= "<!-- <div class='col-sm-$columnas' style=';'> -->
<span class='input-group-addon'>SI</span><span class='input-group-addon alert-success' id= 'div_$name'>Ver data desde el portal</span> <span class='input-group-addon'>SI</span><span class='input-group-addon alert-success' id= 'div_$name'>Ver data desde el portal</span>
</div> </div>
</li> </li>
</ul>
</div> </div>
<div class='col-xs-10 col-sm-5' id='form_admin_data'> </div>
</div>
</ul>
<div id='info_form$row[id]' class='panel-collapse collapse' role='tabpanel' aria-labelledby='info_form_$row[id]'>
<div class='panel-body' >
<div id='form_admin_data'>
<ul class='list-group'> <ul class='list-group'>
<li class='list-group-item'>Creación: $row[creacion] / $propietario[0]</li> <li class='list-group-item'>Creación: $row[creacion] / $propietario[0]</li>
$cantidad $cantidad
@ -14995,10 +15009,11 @@ $item .= "<!-- <div class='col-sm-$columnas' style=';'> -->
$primer $primer
$mapa $mapa
</ul> </ul>
</div>
</div>
</div> </div>
<div class='col-xs-2 col-sm-1 alert alert-info' id='form_admin_id'>
<h2 class='text-center '>$row[id]</h2>
</div> </div>
</div> </div>
@ -15113,7 +15128,7 @@ else{ $resultado .= "<div class='alert alert-warning' ><h2>No hay formularios pa
<div id='panel_administrar' class='panel panel-collapse collapse in panel-default' role='tabpanel' aria-labelledby='encabezado_administrar' > <div id='panel_administrar' class='panel panel-collapse collapse in panel-default' role='tabpanel' aria-labelledby='encabezado_administrar' >
<div class='panel-heading'> <div class='panel-heading'>
<a data-parent='#accordion_accion_formulario' class='btn btn-primary' id='form_btn_admin' role='button' data-toggle='collapse' href='#panel_administrador' aria-expanded='false' aria-controls='collapseExample'> <a data-parent='#accordion_accion_formulario' class='btn btn-success' id='form_btn_admin' role='button' data-toggle='collapse' href='#panel_administrador' aria-expanded='false' aria-controls='collapseExample'>
<i class='glyphicon glyphicon-bars'></i> Administrar <i class='glyphicon glyphicon-bars'></i> Administrar
</a> </a>

18073
kleper@tupale.co Normal file

File diff suppressed because it is too large Load Diff