Skip to content

[Modificaciones] Ortografía #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Modificaciones] Ortografía #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b27d1b3
[Modificaciones] Ortografía
silviacn May 26, 2019
ce8e82a
[Modificación] Solución Redireccionameinto Formularios generales
silviacn May 26, 2019
3e160a3
[Modificación] Solución Espacio de la dirección inadecuado
silviacn May 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion view/administrador/fontaneros.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Nuevo Pass</label>
<label class="col-md-4 control-label" for="textinput">Nueva contraseña</label>
<div class="col-md-4">
<input name="password" type="password" placeholder="Dejar en blanco para mantener" class="form-control input-md"/>
</div>
Expand Down
20 changes: 10 additions & 10 deletions view/administrador/info_asada.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function generarCodigo($longitud) {
<br>
<form method="post" action="?pag=<?php echo $_GET['pag']; ?>&actualizar=1" class="form-horizontal" enctype="multipart/form-data">
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité el nombre:</label>
<label class="col-md-4 control-label" for="textinput">Digite el nombre:</label>
<div class="col-md-4">
<input name="nombre" value="<?php echo $datos['nombre']; ?>" type="text" placeholder="Título" class="form-control input-md" required>
</div>
Expand Down Expand Up @@ -104,19 +104,19 @@ function generarCodigo($longitud) {
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité la dirección exacta:</label>
<label class="col-md-4 control-label" for="textinput">Digite la dirección exacta:</label>
<div class="col-md-4">
<textarea name="direccion" class="form-control"><?php echo $datos['direccion']; ?></textarea>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité la cédula jurídica:</label>
<label class="col-md-4 control-label" for="textinput">Digite la cédula jurídica:</label>
<div class="col-md-4">
<input name="cedulaJuridica" value="<?php echo $datos['cedulaJuridica']; ?>" id="cedula" type="text" placeholder="Cédula jurídica" class="form-control input-md" required>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité el correo:</label>
<label class="col-md-4 control-label" for="textinput">Digite el correo:</label>
<div class="col-md-4">
<input name="email" value="<?php echo $datos['email']; ?>" type="email" placeholder="Correo electrónico" class="form-control input-md" required>
</div>
Expand All @@ -128,37 +128,37 @@ function generarCodigo($longitud) {
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité el número de teléfono:</label>
<label class="col-md-4 control-label" for="textinput">Digite el número de teléfono:</label>
<div class="col-md-4">
<input name="telefono" value="<?php echo $datos['telefono']; ?>" id="numero" type="text" placeholder="Número de teléfono" class="form-control input-md" required>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité el horario:</label>
<label class="col-md-4 control-label" for="textinput">Digite el horario:</label>
<div class="col-md-4">
<textarea name="horario" class="form-control"><?php echo $datos['horario']; ?></textarea>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité el link de la página de Facebook:</label>
<label class="col-md-4 control-label" for="textinput">Digite el link de la página de Facebook:</label>
<div class="col-md-4">
<input name="redes" value="<?php echo $datos['redes']; ?>" type="text" placeholder="Link" class="form-control input-md">
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité la historia:</label>
<label class="col-md-4 control-label" for="textinput">Digite la historia:</label>
<div class="col-md-4">
<textarea name="historia" class="form-control"><?php echo $datos['historia']; ?></textarea>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité la misión:</label>
<label class="col-md-4 control-label" for="textinput">Digite la misión:</label>
<div class="col-md-4">
<textarea name="mision" class="form-control"><?php echo $datos['mision']; ?></textarea>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Digité la visión:</label>
<label class="col-md-4 control-label" for="textinput">Digite la visión:</label>
<div class="col-md-4">
<textarea name="vision" class="form-control"><?php echo $datos['vision']; ?></textarea>

Expand Down
5 changes: 1 addition & 4 deletions view/administrador/noticias.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,7 @@ function generarCodigo($longitud) {
$total_paginas = ceil(mysqli_num_rows($sth) / $TAMANO_PAGINA);
$consulta .= " LIMIT ".$inicio."," . $TAMANO_PAGINA;
$sth = mysqli_query($link,$consulta);






while($r = mysqli_fetch_assoc($sth)) {
echo '
Expand Down
2 changes: 1 addition & 1 deletion view/administrador/ordenes_trabajo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="page-404 padding ptb-xs-40">
<div class="container">
<center><h1>Ordenes de trabajo</h1></center>
<center><h1>Órdenes de trabajo</h1></center>
<table class="table">

<table class="table">
Expand Down
5 changes: 1 addition & 4 deletions view/administrador/productos.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</form>
<?php }else { ?>
<center>
<h1>Administracion de productos de inventario</h1>
<h1>Administración de productos de inventario</h1>
</center>
<center><a href="?pag=<?php echo $_GET['pag']; ?>&nuevo=1" class="btn btn-success" href="#">Nuevo Item</a></center>
<br>
Expand All @@ -67,9 +67,6 @@
$consulta = "SELECT * FROM `producto` WHERE `id_asada` = '".$_SESSION["asada"]."'";
$sth = mysqli_query($link,$consulta);




if (!isset($_GET["pagina"])) {
$inicio = 0;
$pagina = 1;
Expand Down
11 changes: 3 additions & 8 deletions view/administrador/tramites.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="page-404 padding ptb-xs-40">
<div class="container" >
<center><h1>Visualizacion de tramites</h1></center>
<center><h1>Visualización de trámites</h1></center>
<br>
<table class="table table-striped">
<tr class="warning">
Expand All @@ -15,9 +15,7 @@
mysqli_query($link,"UPDATE `tramite` SET `estado_tramite`='".$_GET['estado']."' WHERE `id_tramite`='".$_GET['tramite']."' ");
echo "<script>location.href='?pag=".$_GET['pag']."';</script>";
}
$consulta = "SELECT tramite.id_tramite, tramite.nombre, tramite.descripcion, tramite.plantilla,asada.nombre as asada,tramite.estado_tramite FROM tramite,asada WHERE (tramite.id_asada = '".$_SESSION["asada"]."' or tramite.id_asada = 0) and tramite.estado_tramite = 1 and tramite.id_asada = asada.id_asada ORDER BY tramite.id_asada, tramite.id_tramite ASC


$consulta = "SELECT tramite.id_tramite, tramite.nombre, tramite.descripcion, tramite.plantilla,asada.nombre as asada,tramite.estado_tramite FROM tramite,asada WHERE (tramite.id_asada = '".$_SESSION["asada"]."' or tramite.id_asada = 0) and tramite.estado_tramite = 1 and tramite.id_asada = asada.id_asada ORDER BY tramite.id_asada, tramite.id_tramite ASC
";
$sth = mysqli_query($link,$consulta);

Expand All @@ -34,10 +32,7 @@
$total_paginas = ceil(mysqli_num_rows($sth) / $TAMANO_PAGINA);
$consulta .= " LIMIT ".$inicio."," . $TAMANO_PAGINA;
$sth = mysqli_query($link,$consulta);






while($r = mysqli_fetch_assoc($sth)) {

Expand Down
8 changes: 4 additions & 4 deletions view/administrador/usuarios.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Dirección exacta</label>
<div class="col-md-4">
<input name="direccion" type="text" placeholder="Teléfono" class="form-control input-md" required/>
<input name="direccion" type="text" placeholder="Dirección exacta" class="form-control input-md" required/>
</div>
</div>
<div class="form-group">
Expand Down Expand Up @@ -198,7 +198,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Nuevo Pass</label>
<label class="col-md-4 control-label" for="textinput">Nueva contraseña</label>
<div class="col-md-4">
<input name="password" type="password" placeholder="Dejar en blanco para mantener" class="form-control input-md"/>
</div>
Expand Down Expand Up @@ -250,10 +250,10 @@
<center>
<form action="?pag=<?php echo $_GET['pag']; ?>&tipo=<?php echo $_GET['tipo']; ?>" class="form-horizontal" style="width: 50%;" method="post">
<div class="col-md-3">
Busqueda
Búsqueda
</div>
<div class="col-md-7">
<input name="querry" type="text" placeholder="Busqueda" <?php if(isset($_POST['querry'])){ echo 'value="'.$_POST['querry'].'"';} ?> class="form-control input-md" />
<input name="querry" type="text" placeholder="Búsqueda" <?php if(isset($_POST['querry'])){ echo 'value="'.$_POST['querry'].'"';} ?> class="form-control input-md" />
</div>
<div class="col-md-2">
<button class="btn btn-success" type="submit">Enviar</button>
Expand Down
10 changes: 5 additions & 5 deletions view/administrador/ver_tramite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</td>
<td>
<center>
<b>Autorizo</b>
<b>Autorizó</b>
</center>
</td>
<td>
Expand Down Expand Up @@ -128,19 +128,19 @@
<?php if($datos_orden['estado'] != 1){ ?>
<td>
<center>
<a href="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&actualizar=1" onclick="javascript: return confirm('¿Estas seguro?');" class="btn btn-info">Pendiente</a>
<a href="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&actualizar=1" onclick="javascript: return confirm('¿Estás seguro?');" class="btn btn-info">Pendiente</a>
</center>
</td>
<?php } if($datos_orden['estado'] != 2){ ?>
<td>
<center>
<a href="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&actualizar=2" onclick="javascript: return confirm('¿Estas seguro?');" class="btn btn-success">Abierta</a>
<a href="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&actualizar=2" onclick="javascript: return confirm('¿Estás seguro?');" class="btn btn-success">Abierta</a>
</center>
</td>
<?php } if($datos_orden['estado'] != 3){ ?>
<td>
<center>
<a href="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&actualizar=3" onclick="javascript: return confirm('¿Estas seguro?');" class="btn btn-danger">Cerrada</a>
<a href="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&actualizar=3" onclick="javascript: return confirm('¿Estás seguro?');" class="btn btn-danger">Cerrada</a>
</center>
</td>
<?php } ?>
Expand Down Expand Up @@ -205,7 +205,7 @@
echo '
<td><center>
<a href="?pag='.$_GET['pag'].'&formulario='.$_GET['formulario'].'&actualizar='.$datos['id_estado_solicitud'].'"
onclick="javascript: return confirm('."'".'¿Estas seguro?'."'".');" class="btn btn-'.$clase.'" href="#">'.$datos['nombre'].'</a>
onclick="javascript: return confirm('."'".'¿Estás seguro?'."'".');" class="btn btn-'.$clase.'" href="#">'.$datos['nombre'].'</a>
</center>
</td>';
}
Expand Down
6 changes: 3 additions & 3 deletions view/fontanero/cerrar_orden.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
?>
<!--ANTES-->
<hr>
<h3>Imagenes anteriores</h3>
<h3>Imágenes anteriores</h3>
<?php if (file_exists($destino)){ ?>
<center>
<img src='<?php echo $destino; ?>' style='width: 50%;'>
Expand Down Expand Up @@ -50,7 +50,7 @@
} ?>

<hr>
<h3>Imagenes posteriores</h3>
<h3>Imágenes posteriores</h3>
<?php if (file_exists($destino)){ ?>
<center>
<img src='<?php echo $destino; ?>' style='width: 50%;'>
Expand All @@ -61,7 +61,7 @@
<form class="form-horizontal" action="?pag=<?php echo $_GET['pag']; ?>&formulario=<?php echo $_GET['formulario']; ?>&step=<?php echo $_GET['step']; ?>&anadir=1" method="post" enctype="multipart/form-data">
<center>
<br>
<center><b>Subir Imagen</b></center>
<center><b>Subir imagen</b></center>
<br><br>
<input name="nombre" type="file" class="form-control" style="width: 24%;" required/>
<br><br>
Expand Down
2 changes: 1 addition & 1 deletion view/general/registro.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<div class="form-group">
<label class="col-md-4 control-label" for="textinput">Dirección exacta</label>
<div class="col-md-4">
<input name="direccion" type="text" placeholder="Dirección exacta" class="form-control input-md" required/>
<textarea name="direccion" type="text" placeholder="Dirección exacta" class="form-control input-md" required></textarea>
</div>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion view/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
$menu = "
<li><a href='?pag=inicio'>Inicio</a></li>

<li><a href='?pag=master/tramites'>Formularios Generales</a>
<li><a href='#'>Formularios Generales</a>
<ul class='sub-nav'>
<li><a href='?pag=administrador/crear_tramite'>Crear Formularios</a><li>
<li><a href='?pag=administrador/tramites'>Ver Formularios</a><li>
Expand Down