[Alba-desarrollo] SVN Alba r4517 - in prosistem/alba/trunk/alba: apps/principal/modules/alumno/templates apps/principal/modules/permiso/templates apps/principal/modules/usuario/templates data/sql

Mie Mar 21 16:27:04 CET 2007

Author: josx
Date: 2007-03-21 12:27:01 -0300 (Wed, 21 Mar 2007)
New Revision: 4517

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php
   prosistem/alba/trunk/alba/apps/principal/modules/permiso/templates/_modulo.php
   prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editSuccess.php
   prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql
Log:
Se modfico los css para usuario, link de creditos, error en listado de permisos

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-20 14:12:39 UTC (rev 4516)
+++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php	2007-03-21 15:27:01 UTC (rev 4517)
@@ -369,4 +369,4 @@
     <?php include_partial('alumno/edit_footer', array('alumno' => $alumno)) ?>
     </div>
     <div id="nueva_cuenta"></div>  
-</div>
+</div>
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/apps/principal/modules/permiso/templates/_modulo.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/permiso/templates/_modulo.php	2007-03-20 14:12:39 UTC (rev 4516)
+++ prosistem/alba/trunk/alba/apps/principal/modules/permiso/templates/_modulo.php	2007-03-21 15:27:01 UTC (rev 4517)
@@ -1 +1 @@
-<? echo link_to($permiso->getModulo()->getNombre(),'modulo/edit?id='.$permiso->getFkModuloId());?>
\ No newline at end of file
+<? echo ($permiso->getModulo())?link_to($permiso->getModulo()->getNombre(),'modulo/edit?id='.$permiso->getFkModuloId()):"";?>
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editSuccess.php	2007-03-20 14:12:39 UTC (rev 4516)
+++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editSuccess.php	2007-03-21 15:27:01 UTC (rev 4517)
@@ -11,7 +11,7 @@
 <?php include_partial('usuario/edit_header', array('usuario' => $usuario)) ?>
 </div>
 
-<div id="sf_admin_content">
+<div id="sf_admin_container">
 
 <?php if ($sf_request->hasErrors()): ?>
 <div class="form-errors">

Modified: prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql
===================================================================
--- prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql	2007-03-20 14:12:39 UTC (rev 4516)
+++ prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql	2007-03-21 15:27:01 UTC (rev 4517)
@@ -191,7 +191,7 @@
 INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (60, 'Constancia Egreso 7mo', 'informes/certificadoPrimariaFormulario?vista=imprimir', 'informes', 9, 0, '_blank');
 INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (65, 'Ayuda', '#', '', 1, 80, '');
 INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (67, 'Indice...', 'ayuda/', '', 65, 0, '');
-INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (68, 'Cr&eacute;ditos', 'creditos/', '', 65, 0, '');
+INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (68, 'Cr&eacute;ditos', 'default', '', 65, 0, '');
 INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (69, 'Generar Horario por secci&oacute;n/divisi&oacute;n', 'calendario', 'calendario', 47, 0, '');
 INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (71, 'Configuraciones Previas', '#', '', 10, 10, '');
 INSERT INTO `menu` (`id`, `nombre`, `link`, `perm`, `fk_padre_menu_id`, `orden`, `target`) VALUES (72, 'Definir tipo de bajas', 'conceptobaja', 'conceptobaja', 84, 10, '');


