Merge branch 'master' of kleper/milfskleper into master

css/error_log

@@ -1 +0,0 @@
-[18-Oct-2014 15:57:24 America/Chicago] PHP Warning:  mysqli_connect(): Access denied for user 'root'@'localhost' (using password: YES) in /home/iiqwebgd/public_html/milfs/css/estilos.php on line 45

css/milfs.css

@@ -0,0 +1,33 @@
+/*Este archivo tiene los estilos de milfs,
+el otro archivo css style.css que está en la carpeta milfs
+ no está referenciado en index.php de milfs*/
+
+#contenedor_principal{
+	padding-top: 100px;
+}
+
+@media (max-width: 768px) {
+#panel_administrador{
+	padding: 0px !important;
+}
+}
+
+
+
+
+
+/* Switch button */
+.btn-default.btn-on.active{background-color: #5BB75B;color: white;}
+.btn-default.btn-off.active{background-color: #DA4F49;color: white;}
+
+.btn-default.btn-on-1.active{background-color: #006FFC;color: white;}
+.btn-default.btn-off-1.active{background-color: #DA4F49;color: white;}
+
+.btn-default.btn-on-2.active{background-color: #00D590;color: white;}
+.btn-default.btn-off-2.active{background-color: #A7A7A7;color: white;}
+
+.btn-default.btn-on-3.active{color: #5BB75B;font-weight:bolder;}
+.btn-default.btn-off-3.active{color: #DA4F49;font-weight:bolder;}
+
+.btn-default.btn-on-4.active{background-color: #006FFC;color: #5BB75B;}
+.btn-default.btn-off-4.active{background-color: #DA4F49;color: #DA4F49;}

funciones/funciones.php

@@ -4644,7 +4644,7 @@ $empresa ="
 <div id='panel_clonar' class='panel panel-collapse collapse in panel-default' role='tabpanel' aria-labelledby='encabezado_clonar' >
 	<div class='panel-heading'>
 
-	<a  data-parent='#accordion_accion_formulario'  class='btn btn-primary' id='form_btn_clone' role='button' data-toggle='collapse' href='#panel_clone' aria-expanded='false' aria-controls='collapseExample'>
+	<a  data-parent='#accordion_accion_formulario'  class='btn btn-success' id='form_btn_clone' role='button' data-toggle='collapse' href='#panel_clone' aria-expanded='false' aria-controls='collapseExample'>
 	<i class='glyphicon glyphicon-clone'></i> Clonar</a> <span class='panel-title'>Se copiará la estructura del formulario pero no su contenido.</span>
 	</div>
 	<div class='panel-body collapse' id='panel_clone'>
@@ -5987,7 +5987,7 @@ if($ver_data[0] !="0") {$boton_ver_data ="	<a target='datos'class='boton_land bt
 if($publico[0] =='1') {
 	$linea .= "
 
-<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'>
+<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-push-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
     <div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'>
         <a name='formulario_$row[id]'></a>
         <div class='row rp-b '>
@@ -6008,7 +6008,7 @@ if($publico[0] =='1') {
 			}else{
 					if($llenar[0] !="0"){
 			 $linea .="
-<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'>
+<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-push-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
     <div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'>
         <a name='formulario_$row[id]'></a>
         <div class='row rp-b '>
@@ -6160,7 +6160,7 @@ $consulta= " SELECT * FROM form_campos WHERE id = id $w_empresa $w_especialista
 				$row['campo_area']= editar_campo("form_campos","$row[id]","campo_area","","","","");
 				$row['activo']= editar_campo("form_campos","$row[id]","activo","","","","","");
 				$accion = "<a class='btn btn-default' onclick=\"xajax_formulario_crear_campo('','$row[id]','contenido');\"><i class='glyphicon glyphicon-edit'></i></a>";
-				$class='success';
+				$class='info';
 				}else {
 				$class='';
 				$accion ="";
@@ -6475,7 +6475,7 @@ $resultado .= "
 </table>
 <legend>Agregar empresa</legend>
 <div class='row'>
-<form autocomplete='off' role='form' id='agregar' name='agregar'>
+<form autocomplete='off' role='form' id='agregar' class='agregar_area'name='agregar'>
 <input type='hidden' name='estado' id='estado' value='1'>
 
 <div class='col-xs-4'>
@@ -9702,7 +9702,7 @@ function tabla_areas($tabla,$value,$descripcion,$onchange,$where,$nombre,$div){
 	if($div =="") {
 		$div="div_campos";
 		$resultado = "
-		<div class='btn btn-default btn-block' onclick= \"xajax_tabla_areas('$tabla','$value','$descripcion','$onchange','$where','$nombre','$div') \">Modificar areas</a></div>
+		<div class='btn btn-default btn-block btn-warning' onclick= \"xajax_tabla_areas('$tabla','$value','$descripcion','$onchange','$where','$nombre','$div') \">Modificar areas</a></div>
 		<!-- <div id='$div'></div> -->";
 		return $resultado;
 		}
@@ -9722,7 +9722,7 @@ $consulta = "SELECT * FROM $tabla WHERE 1 $w  AND id_empresa='$_SESSION[id_empre
 $sql=mysqli_query($link,$consulta);
 if($nombre==''){$name=$tabla."_".$value;}else{$name = "$nombre";}
 
-$resultado=" <table class='table table-striped table-responsive' >
+$resultado=" <table class='table table-striped table-responsive table-hover' >
 <legend>$name</legend>
 <tr ><th>Id</th><th>$campo1</th><th>$campo2</th><th>$campo3</th><th>$campo4</th><th></th></tr>
 				" ;
@@ -9746,12 +9746,12 @@ $linea++;
 	}
 
 $resultado .= "
-<tr>
+<tr class='warning'>
 <td colspan='4' >
 <form autocomplete='off' role='form' id='agregar' name='agregar'>
 <input type='hidden' name='estado' id='estado' value='1'>
 <input type='hidden' name='orden' id='orden' value='$linea'>
-<div class='col-xs-2'>Agregar área</div>
+<div class='col-xs-2'>Crear Área</div>
 <div class='col-xs-4'>
 <input placeholder='$campo1' class='form-control' type='text' id='$campo1'  name='$campo1' >
 </div>
@@ -11884,10 +11884,10 @@ function empresa_datos($id_empresa,$tipo) {
 
 $resultado ="
 <div class='datos_empresa row ' role='row'>
-	<div class='col-xs-2 '>
+	<div class='col-md-2 '>
-		<img id='logo_empresa' class='img logo_empresa ' src='$_SESSION[site]milfs/images/secure/?file=150/$imagen[0]'><br>
+		<img id='logo_empresa' class='img logo_empresa img-responsive ' src='$_SESSION[site]milfs/images/secure/?file=150/$imagen[0]'><br>
 	</div>
-	<div class='col-xs-10'>
+	<div class='col-xs-10 col-xs-12'>
 		<div class='caption text-center'>
 		<h3>$razon_social[0]</h3>
 		<p class='lead  hidden-xs'>$slogan[0]</p>
@@ -12577,7 +12577,7 @@ if($contenido_original !="") {
 	$resultado .= "
 	<div  id='contenedor_$row[id_campo]' class='contenedor_campo'>
 		<pdata-toc-skip class='campo_contenido' id='contenido_$row[id_campo]'>
-				<span tiple= '$campo_tipo' class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span><span class='pull-right'> $metadatos </span><br>
+				<span type= '$campo_tipo' class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span><span class='pull-right'> $metadatos </span><br>
 				$contenido</p>
 	</div>";
 	
@@ -14062,7 +14062,7 @@ $resultado .= "
 </div>";
 $resultado = "
 <br>
-<div class='alert alert-warning'>
+<div class='alert alert-info'>
 	<legend>Crear un nuevo campo</legend>
 	$resultado
 </div>
@@ -14111,7 +14111,7 @@ $campos_formulario = "
 			$areas
 			</div>
 			<div class='col-sm-6'>
-				<div class='btn btn-block   btn-default'  OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear un nuevo campo</div>
+				<div class='btn btn-block   btn-primary'  OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear un nuevo campo</div>
 			</div>
 			<!-- <div class='col-sm-4'>
 			<div class='input-group'><span class='input-group-addon'>Modificar campo</span> $listado_campos</div>
@@ -14355,7 +14355,7 @@ $crear_nuevo ="
 			<input type='hidden' name='div' id='div' value='atencion'>
 		</form>
 			<div class='form-group'>
-				<div class='btn btn-block   btn-warning'  OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'$id');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear campo</div>
+				<div class='btn btn-block   btn-primary'  OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'$id');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear campo</div>
 			</div>
 	</div>
 
@@ -16985,7 +16985,7 @@ function milfs(){
 	$menu =
 "    <!-- Collect the nav links, forms, and other content for toggling -->
     <div class='collapse navbar-collapse' id='bs-example-navbar-collapse-1'>
-      <ul class='nav navbar-nav'>
+	<ul class='nav navbar-nav' id='menu_milfs'>
 
       <li><a href='https://$url_home' target='web'><i class='glyphicon glyphicon-home'></i></a></li>
         <li>$crear_campos</li>

index.php

@@ -47,10 +47,10 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
 	<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
 <!-- 	<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous"> -->
 	<?php if($form !='') { echo "<link href='css/embebidoXXX.css' rel='stylesheet'>";}else{ echo "<link href='css/estilos.php?dd' rel='stylesheet'>";} ?>
-
+        <link rel="stylesheet" type="text/css" media="screen" href="css/milfs.css">
-	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
+        <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
-	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
+        <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
-	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css">
+        <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css">
 
 
 <style>
@@ -193,7 +193,7 @@ else{}
 <?php echo @$onload; ?>
 <?php 
  if ( isset ( $_SESSION['id'] ) ) {	?>
-<div class="navbar navbar-inverse nav-bar-fixed-top " role="navigation">
+<div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
@@ -215,7 +215,7 @@ else{}
 
 
 <div id='debug'></div>
-	<div class='container'>
+	<div class='container' id='contenedor_principal'>
 		<div id='contenido'>