h4ckypurpl3
/
tupali_fork
forked from qwerty/tupali
1
0
Fork 0
Code Releases Wiki Activity

merge con cambios de humano

This commit is contained in:
Hacky Purple 2018-07-01 16:38:25 -05:00
parent 42b9937e24 b9f5c74c78
commit ae6f134dbd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.php
View File

@ -1148,6 +1148,9 @@ $uri = $_SERVER['REQUEST_URI'];
<!-- <script src="./librerias/charts/Chart.bundle.js"></script>
<script src="./librerias/charts/utils.js"></script> -->
<script src="./librerias/lazy/jquery.lazy.min.js"></script>
<script src='./librerias/summernote/summernote.js'></script>
<link href='./librerias/summernote/summernote.css' rel='stylesheet'>
<script type='text/javascript'> var edit = function() { $('.wysiwyg').summernote({height: 250, codemirror: { theme: 'default' },dialogsInBody: true, toolbar:[ ['style', ['bold', 'italic', 'underline', 'clear']], ['font', ['strikethrough', 'superscript', 'subscript', 'fontname']], ['fontsize', ['fontsize']], ['color', ['color']], ['para', ['ul', 'ol', 'paragraph', 'style']], ['height', ['height']], ['insert', ['picture', 'link', 'video', 'table', 'hr']], ['misc', ['fullscreen', 'codeview', 'undo', 'redo']] ] }); }; var save = function() { var makrup = $('.wysiwyg').summernote('code'); $('.wysiwyg').summernote('destroy'); }; $(document).ready(function() { $('.wysiwyg_auto').summernote({dialogsInBody: true}); }); </script>
<script>
$(function() {
@ -1300,7 +1303,9 @@ document.oncopy = addLink;
}else{
echo " " ;
}
if(isset($_SESSION['id'])) {$id_empresa_portada='1'; echo "<span style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."</span>"; }
if(isset($_SESSION['id'])) {$id_empresa_portada='1'; echo "
<span style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."</span>"; }
if(isset($_REQUEST['eventos'])) {
//$embebido='1';
$librerias_pie="

1
milfs/funciones/funciones.php
View File

@ -14783,7 +14783,6 @@ $item .= "<!-- <div class='col-sm-$columnas' style=';'> -->
</div>
</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' >