Merge branch 'master' of h4ckypurpl3/tupali_fork into master

This commit is contained in:
kleper 2017-12-17 11:58:07 -05:00 committed by Gogs
commit 47f86d96e1

View File

@ -678,7 +678,7 @@ $aplicacion_pie="
} }
else { else {
$librerias_cabeza =" $librerias_cabeza ="
<script type='text/javascript' src='librerias/notas/script.js'></script> <script type='text/javascript' src='librerias/notas/script.js'></script>
<script type='text/javascript' src='./librerias/jquery/jquery-ui.min.js'></script> <script type='text/javascript' src='./librerias/jquery/jquery-ui.min.js'></script>
<script type='text/javascript' src='./librerias/jquery/jquery.ui.touch-punch.js'></script> <script type='text/javascript' src='./librerias/jquery/jquery.ui.touch-punch.js'></script>
@ -817,8 +817,8 @@ $uri = $_SERVER['REQUEST_URI'];
<ul style=' ' class='nav navbar-nav navbar-center navbar-principal '> <ul style=' ' class='nav navbar-nav navbar-center navbar-principal '>
<li class='dropdown ' > <li class='dropdown ' >
<a style='background-color:#F3F1F0; color:red;' href='#' class='dropdown-toggle menu_tupale img-rounded' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'><i class='fa fa-bars'></i><span class='hidden-xs'> $portal_sigla<span></a> <a style='background-color:#F3F1F0; color:red; border-top-left-radius: 0px; border-bottom-left-radius: 0px;' href='#' class='dropdown-toggle menu_tupale img-rounded' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'><i class='fa fa-bars'></i><span class='hidden-xs'> $portal_sigla<span></a>
<ul class='dropdown-menu' style='background-color: white; width:500px;' > <ul class='dropdown-menu' style='background-color: white; width:300px; height:500px; overflow: scroll; word-wrap: break-word; overflow-x: auto; ' >
<li><a class='' href='$portal_url'><i class='fa fa-home'></i> Portal</a></li> <li><a class='' href='$portal_url'><i class='fa fa-home'></i> Portal</a></li>
<li><a class='' href='$link_empresa'>$sigla[0] Inicio</a></li> <li><a class='' href='$link_empresa'>$sigla[0] Inicio</a></li>
<li><a href='milfs/'>Administrador</a></li> <li><a href='milfs/'>Administrador</a></li>
@ -940,9 +940,9 @@ $menu_lateral = "
<script src="./librerias/bootstrap-toc/bootstrap-toc.min.js"></script> <script src="./librerias/bootstrap-toc/bootstrap-toc.min.js"></script>
<script src="./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js"></script> <script src="./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js"></script>
<link href='librerias/calendar/fullcalendar.min.css' rel='stylesheet' /> <link href='librerias/calendar/fullcalendar.min.css' rel='stylesheet' />
<link href='librerias/calendar/fullcalendar.print.min.css' rel='stylesheet' media='print' /> <link href='librerias/calendar/fullcalendar.print.min.css' rel='stylesheet' media='print' />
<script src='librerias/calendar/lib/moment.min.js'></script> <script src='librerias/calendar/lib/moment.min.js'></script>
<script src='librerias/calendar/fullcalendar.min.js'></script> <script src='librerias/calendar/fullcalendar.min.js'></script>
<script src='librerias/calendar/locale/es.js'></script> <script src='librerias/calendar/locale/es.js'></script>
<script src="librerias/firma/signature_pad.js"></script> <script src="librerias/firma/signature_pad.js"></script>
@ -987,24 +987,24 @@ document.oncopy = addLink;
if(isset($_REQUEST['eventos'])) { if(isset($_REQUEST['eventos'])) {
//$embebido='1'; //$embebido='1';
$titulo = remplacetas('form_id','id',"$_REQUEST[eventos]",'nombre',"") ; $titulo = remplacetas('form_id','id',"$_REQUEST[eventos]",'nombre',"") ;
$eventos= " $eventos= "
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#calendar').fullCalendar({ $('#calendar').fullCalendar({
header: { header: {
left: 'prev,next today', left: 'prev,next today',
center: 'title', center: 'title',
right: 'listMonth,month,agendaWeek,agendaDay,listYear,timeLineYear' right: 'listMonth,month,agendaWeek,agendaDay,listYear,timeLineYear'
}, },
//defaultDate: '2017-10-12', //defaultDate: '2017-10-12',
defaultView: 'listMonth', defaultView: 'listMonth',
themeSystem: 'bootstrap3', themeSystem: 'bootstrap3',
navLinks: true, // can click day/week names to navigate views navLinks: true, // can click day/week names to navigate views
editable: false, editable: false,
eventLimit: true, // allow \"more\" link when too many events eventLimit: true, // allow \"more\" link when too many events
events: { events: {
url: '$_SESSION[url]/api.php', url: '$_SESSION[url]/api.php',
type: 'GET', type: 'GET',
@ -1023,11 +1023,11 @@ $eventos= "
}, },
loading: function(bool) { loading: function(bool) {
$('#loading').toggle(bool); $('#loading').toggle(bool);
} }
}); });
}); });
</script><h1 class='titulo_eventos text-center'>$titulo[0]</h1><div class='container-fluid' id='calendar'></div><br>"; </script><h1 class='titulo_eventos text-center'>$titulo[0]</h1><div class='container-fluid' id='calendar'></div><br>";