Author: hsanchez Date: 2007-03-19 15:36:28 -0300 (Mon, 19 Mar 2007) New Revision: 4497 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/concepto/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/_fk_provincia_id.php prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/_fk_provincia_id.php prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/responsable/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/responsable/templates/editSuccess.php Log: Quitando los << de los combos, generaban problemas de html Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml 2007-03-19 18:36:28 UTC (rev 4497) @@ -48,8 +48,8 @@ edit: title: " " fields: - fk_cuenta_id: { params: include_custom=>>Seleccione un Cuenta<<} - fk_provincia_id: { params: include_custom=>>Seleccione una Provincia<<} + fk_cuenta_id: { params: include_custom=--Seleccione un Cuenta--} + fk_provincia_id: { params: include_custom=--Seleccione una Provincia--} display: "Informacion general": [apellido, nombre, _sexo, fk_tipodocumento_id, nro_documento, lugar_nacimiento, fecha_nacimiento, fk_pais_id, email, activo ] "Donde vive": [direccion, ciudad, fk_provincia_id, codigo_postal, telefono] Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -238,7 +238,7 @@ 'related_class' => 'Provincia', 'peer_method' => 'getEnOrden', 'control_name' => 'alumno[fk_provincia_id]', - 'include_custom' => '>>Seleccione una Provincia<<', + 'include_custom' => '--Seleccione una Provincia--', )) ?> </div> Modified: prosistem/alba/trunk/alba/apps/principal/modules/concepto/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/concepto/config/generator.yml 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/concepto/config/generator.yml 2007-03-19 18:36:28 UTC (rev 4497) @@ -21,4 +21,4 @@ edit: title: Editar un ítem conceptual fields: - fk_establecimiento_id: { params: include_custom=>>Seleccione un Establecimiento<<} + fk_establecimiento_id: { params: include_custom=--Seleccione un Establecimiento--} Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/_fk_provincia_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/_fk_provincia_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/_fk_provincia_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -3,5 +3,5 @@ 'related_class' => 'Provincia', 'peer_method' => 'getEnOrden', 'control_name' => 'cuenta[fk_provincia_id]', - 'include_custom' => '>>Seleccione una Provincia<<',)) ?> + 'include_custom' => '--Seleccione una Provincia--',)) ?> </div> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -4,7 +4,7 @@ $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); $anios = AnioPeer::doSelect($c); $optionsAnios = array(); - $optionsAnios[""] = ">>Seleccione un Año<<"; + $optionsAnios[""] = "--Seleccione un Año--"; foreach ($anios as $anio) { $optionsAnios[$anio->getId()] = $anio->getDescripcion(); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -3,7 +3,7 @@ $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); $turnos = TurnosPeer::doSelect($criteriaT); $optionsTurnos = array(); - $optionsTurnos[""] = ">>Seleccione un Turno<<"; + $optionsTurnos[""] = "--Seleccione un Turno--"; foreach ($turnos as $turno) { $optionsTurnos[$turno->getId()] = $turno->getDescripcion(); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/_fk_provincia_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/_fk_provincia_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/_fk_provincia_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -3,6 +3,6 @@ 'related_class' => 'Provincia', 'peer_method' => 'getEnOrden', 'control_name' => 'docente[fk_provincia_id]', - 'include_custom' => '>>Seleccione una Provincia<<', + 'include_custom' => '--Seleccione una Provincia--', )) ?> </div> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml 2007-03-19 18:36:28 UTC (rev 4497) @@ -27,7 +27,7 @@ edit: title: Editar Espacio fields: - fk_tipoespacio_id: { params: include_custom=>>Seleccione un Espacio<<} + fk_tipoespacio_id: { params: include_custom=--Seleccione un Espacio--} display: [ nombre, m2, capacidad, descripcion, estado, fk_tipoespacio_id, _fk_locacion_id ] actions: _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -1,6 +1,6 @@ -<? +<?php $aLocacion = Array(); - $aLocacion[""] = ">>Seleccione una Locación<<"; + $aLocacion[""] = "--Seleccione una Locaci�n--"; $c = new Criteria(); $c->add(RelEstablecimientoLocacionPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); $locaciones = RelEstablecimientoLocacionPeer::doSelect($c); @@ -8,6 +8,5 @@ $aLocacion[$locacion->getFkLocacionId()] = $locacion->getLocacion()->getNombre(); } -// use_helper("Object"); echo select_tag('espacio[fk_locacion_id]', options_for_select($aLocacion, $espacio->getFkLocacionId())); ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -1,6 +1,6 @@ -<? +<?php $aLocacion = Array(); - $aLocacion[""] = ">>Seleccione una Locación<<"; + $aLocacion[""] = "--Seleccione una Locaci�n--"; $c = new Criteria(); $c->add(RelEstablecimientoLocacionPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); $locaciones = RelEstablecimientoLocacionPeer::doSelect($c); @@ -8,6 +8,5 @@ $aLocacion[$locacion->getFkLocacionId()] = $locacion->getLocacion()->getNombre(); } -// use_helper("Object"); echo select_tag('espacio[fk_locacion_id]', options_for_select($aLocacion, $espacio->getFkLocacionId())); ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -153,7 +153,7 @@ $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $ciclolectivo_id); $turnos = TurnosPeer::doSelect($criteriaT); $optionsTurnos = array(); - $optionsTurnos[] = ">>Seleccione<<"; + $optionsTurnos[] = "--Seleccione--"; foreach ($turnos as $turno) { $optionsTurnos[$turno->getId()] = $turno->getDescripcion(); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/config/generator.yml 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/config/generator.yml 2007-03-19 18:36:28 UTC (rev 4497) @@ -9,8 +9,8 @@ edit: title: Editar Actividades del Docente fields: - fk_actividad_id: { params: include_custom=>>Seleccione una Actividad<<} - fk_docente_id: { params: include_custom=>>Seleccione un Docente<<} + fk_actividad_id: { params: include_custom=--Seleccione una Actividad--} + fk_docente_id: { params: include_custom=--Seleccione un Docente--} display: [ fk_docente_id, fk_actividad_id ] list: title: Listado de Actividades del Docente Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -21,7 +21,7 @@ $aDivision = array(); $optionsAlumnos = array(); - $optionsAlumnos[""] = ">>Seleccione un Alumno<<"; + $optionsAlumnos[""] = "--Seleccione un Alumno--"; foreach ($alumnos as $alumno) { if($alumno[3] AND array_key_exists($alumno[0], $aDivision)) { Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -9,7 +9,7 @@ //$c->addAscendingOrderByColumn(AlumnoPeer::NOMBRE); $divisiones = DivisionPeer::doSelect($c); $optionsDivisiones = array(); - $optionsDivisiones[""] = ">>Seleccione una División<<"; + $optionsDivisiones[""] = "--Seleccione una División--"; foreach ($divisiones as $division) { $optionsDivisiones[$division->getId()] = $division->getAnio()->getDescripcion(). " / " . $division->getDescripcion(); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml 2007-03-19 18:36:28 UTC (rev 4497) @@ -11,7 +11,7 @@ edit: title: Editar Actividades del Año fields: - fk_anio_id: { params: include_custom=>>Seleccione un Año<<} + fk_anio_id: { params: include_custom=--Seleccione un Añ--<} fk_actividad_id: { params: include_custom=>>Seleccione una Actividad<<} display: [ fk_anio_id, fk_actividad_id, horas ] list: Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/responsable/config/generator.yml 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/responsable/config/generator.yml 2007-03-19 18:36:28 UTC (rev 4497) @@ -31,8 +31,8 @@ edit: title: Editar Responsable fields: - fk_cuenta_id: { params: include_custom=>>Selecciones un Cuenta<<} - fk_provincia_id: { params: include_custom=>>Selecciones una Provincia<<} + fk_cuenta_id: { params: include_custom=--Selecciones un Cuenta--} + fk_provincia_id: { params: include_custom=--Selecciones una Provincia--} display: "Información general": [apellido, nombre, _sexo, fk_tipodocumento_id, nro_documento] "Donde vive": [direccion, ciudad, fk_provincia_id, codigo_postal ] Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/responsable/templates/editSuccess.php 2007-03-19 18:09:00 UTC (rev 4496) +++ prosistem/alba/trunk/alba/apps/principal/modules/responsable/templates/editSuccess.php 2007-03-19 18:36:28 UTC (rev 4497) @@ -170,7 +170,7 @@ <?php echo object_select_tag($responsable, 'getFkProvinciaId', array ( 'related_class' => 'Provincia', 'control_name' => 'responsable[fk_provincia_id]', - 'include_custom' => '>>Selecciones una Provincia<<', + 'include_custom' => '--Selecciones una Provincia--', )) ?> </div> </div>