actualizando submodulo

This commit is contained in:
Hacky Purple 2018-11-02 14:50:23 -05:00
parent f309306e65
commit 71d7de3706

View File

@ -30,40 +30,8 @@ function array_linea($datos,$tipo,$id){
<<<<<<< HEAD
function build_list($group,$tipo) {
$form_id="";
$output = (is_array($group)) ? "<tr>" : "";
foreach($group as $attr => $item) {
if(is_array($item) || is_object($item)) {
$output .= build_list($item,$tipo);
} else {
if( $attr=="identificador") {
if($tipo =='li'){
$output .= formulario_imprimir_linea("","$item","linea_planilla");
}
elseif($tipo =='galeria'){
$output .= formulario_imprimir_linea("","$item","galeria");
}
else{
$output .= "<td>$attr - $item</td>";
}
}
if( $attr=="id_aplicacion") { $form_id= $item;}
}
}
$output .= (is_array($group)) ? "</tr>" : "";
$salida ="$output";
return $salida;
=======
return $output ;
>>>>>>> 491d3f3d52f4349f9ebd4ee7e988af8f6956c16a
}
@ -14126,15 +14094,10 @@ $resultado ="<div class=' div_galeria text-center'>
<div class='thumbnail_imagen_galeria img-thumbnail'>
$imagen
<div class='caption_imagen_galeria caption'><ul class='ul_galeria list-group'>$leyenda</ul></div>
<<<<<<< HEAD
</div>
</div>";
=======
<div>$respuestas</div>
</div>
</div>";
>>>>>>> 491d3f3d52f4349f9ebd4ee7e988af8f6956c16a
return $resultado;
}
elseif($tipo =="array") {