Author: hsanchez Date: 2007-08-15 15:25:35 -0300 (Wed, 15 Aug 2007) New Revision: 4966 Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/listadoSuccess.php Log: copiando template, despues del conflicto :( Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-08-15 17:43:53 UTC (rev 4965) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-08-15 18:25:35 UTC (rev 4966) @@ -109,7 +109,6 @@ for($i=0, $max = count($aIntervalo); $i < $max ;$i++) { ?> <th id="sf_admin_list_th_sf_actions" <?php echo (date("w",strtotime($aIntervalo[$i])) == 6 || date("w",strtotime($aIntervalo[$i])) == 0)?"style='color:#FF0000'":""?> ><?php echo date("d",strtotime($aIntervalo[$i]))?></th> <?php } ?> - <th id="sf_admin_list_th_sf_actions">            </th> <?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ ?> <th id="sf_admin_list_th_sf_actions" title="<?php echo $Tipoasistencia[1]?>"><?php echo $idx ?></th> @@ -152,7 +151,7 @@ </td> <?php } ?> <td></td> -<?php + <?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ ?> <td><?php echo isset($totalesAlumnos[$idx])?$totalesAlumnos[$idx]:0; ?></td> <?php }?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/listadoSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/listadoSuccess.php 2007-08-15 17:43:53 UTC (rev 4965) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/listadoSuccess.php 2007-08-15 18:25:35 UTC (rev 4966) @@ -25,7 +25,7 @@ * @author José Luis Di Biase <[email protected]> * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> -* @version SVN: $Id: indexSuccess.php 4888 2007-08-01 14:23:49Z hsanchez $ +* @version SVN: $Id: indexSuccess.php 4965 2007-08-15 17:43:53Z josx $ * @filesource * @license GPL */ @@ -82,9 +82,9 @@ </ul> </div> </fieldset> - <? if($alumno_id >= 0) {?> + <?php if($alumno_id >= 0) {?> <?php echo input_hidden_tag('alumno_id', $alumno_id) ?> - <? }?> + <?php }?> </form> <br> <br> @@ -107,13 +107,12 @@ <th id="sf_admin_list_th_alumno"> Alumnos / Días </th> <?php for($i=0, $max = count($aIntervalo); $i < $max ;$i++) { ?> - <th id="sf_admin_list_th_sf_actions" <?=(date("w",strtotime($aIntervalo[$i])) == 6 || date("w",strtotime($aIntervalo[$i])) == 0)?"style='color:#FF0000'":""?> ><?php echo date("d",strtotime($aIntervalo[$i]))?></th> - <?}?> - + <th id="sf_admin_list_th_sf_actions" <?php echo (date("w",strtotime($aIntervalo[$i])) == 6 || date("w",strtotime($aIntervalo[$i])) == 0)?"style='color:#FF0000'":""?> ><?php echo date("d",strtotime($aIntervalo[$i]))?></th> + <?php } ?> <th id="sf_admin_list_th_sf_actions">            </th> <?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ ?> <th id="sf_admin_list_th_sf_actions" title="<?php echo $Tipoasistencia[1]?>"><?php echo $idx ?></th> - <?}?> + <?php } ?> </tr> </thead> <tbody> @@ -152,7 +151,7 @@ </td> <?php } ?> <td></td> -<?php + <?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ ?> <td><?php echo isset($totalesAlumnos[$idx])?$totalesAlumnos[$idx]:0; ?></td> <?php }?> @@ -208,17 +207,17 @@ // Finaliza Feriados ?> </tr> -<? } else { ?> +<?php } else { ?> <h2>NO HAY ALUMNOS</h2> -<? } ?> +<?php } ?> </table> </div> <div class="float-right"> <ul class="sf_admin_actions"> <li><?php echo button_to('Listado de alumnos','alumno/list',array('class' => 'sf_admin_action_list'))?></li> -<? if($alumno_id >= 0) {?> +<?php if($alumno_id >= 0) {?> <li><?php echo button_to('Ir a Cuenta','cuenta/verCompleta?id=' .$cuenta_id,array('class'=>'sf_admin_action_ir_a'))?></li> -<? } ?> +<?php } ?> </ul> </div> </fieldset> @@ -226,7 +225,7 @@ <?php if($bool_tmp) { ?> <?php if($nombre_completo_archivo) { ?> <div align="center"> - <img src="<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot().'/tmp/'.$nombre_completo_archivo?>"> + <img src="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot().'/tmp/'.$nombre_completo_archivo?>"> </div> <?php } else { ?> <?php } ?>