October 2009 - Alba-desarrollo - lists.ourproject.org

SVN Alba r6284 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/templates plugins/albaToolsPlugin/modules/albaTools/actions web/css web/images
by commits＠pressenter.com.ar 06 Oct '09

06 Oct '09

Author: ftoledo Date: 2009-10-06 16:47:37 -0300 (Tue, 06 Oct 2009) New Revision: 6284 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php prosistem/alba/trunk/alba/plugins/albaToolsPlugin/modules/albaTools/actions/actions.class.php prosistem/alba/trunk/alba/web/css/boletin.css prosistem/alba/trunk/alba/web/css/impresion.css prosistem/alba/trunk/alba/web/images/logo.png Log: actulizacion de estilos para la impresion del boletin Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-05 19:19:34 UTC (rev 6283) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-06 19:47:37 UTC (rev 6284) @@ -3,18 +3,28 @@ <div class="save-ok"> <h2><?php echo $sf_user->getFlash('notice')?></h2> </div> + </br> <?php else:?> -<br/> <div id="boletin"> <div class="header"> - <?php echo $establecimiento->getNombre()?><br> - <?php echo $establecimiento->getDireccion()?> - <?php echo $establecimiento->getCiudad()?> - <?php echo $establecimiento->getCodigoPostal()?> - <?php echo $establecimiento->getTelefono()?> - <br/>BOLETÍN Ciclo Lectivo - <br/><br/><b>Alumno: <?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b> - <b>Curso: <?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?> <?php echo $division->getDescripcion()?> </b> + <table border="0" width="100%" cellpadding="1" cellspacing="1"> + <tr> + <td width="33%"> </td> + <td nowrap="nowrap"> + <?php echo $establecimiento->getNombre()?><br> + <?php echo $establecimiento->getDireccion()?> + <?php echo $establecimiento->getCiudad()?> + <?php echo $establecimiento->getCodigoPostal()?> + <?php echo $establecimiento->getTelefono()?> + <br/>BOLETÍN Ciclo Lectivo + <br/><br/><b>Alumno: <?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b> + <b>Curso: <?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?> <?php echo $division->getDescripcion()?> </b> + </td> + <td width="33%" align="left"> + <?php echo image_tag('logo.png' ,array('width'=> 100))?> + </td> + </tr> + </table> </div> <table class="notas" cellpadding="2" cellspacing="2" align="center"> <tbody> @@ -58,34 +68,19 @@ <?php endforeach;?> </tbody> </table> - <br/> -<br/> - -<table width="100%"> +<table width="60%" cellspacing="10" align="center" cellpadding="1"> <tr> <td>Observaciones:</td> <td> </td> <td>Pendientes:</td> </tr> - + <tr><td colspan="3"> </td></tr> <tr> - <td> </td> - <td> </td> - <td> </td> + <td align="center" width="33%" nowrap="nowrap"><hr style="border: 1px dotted"/><?php echo $establecimiento->getRector()?>, Rector</td> + <td align="center"><hr style="border: 1px dotted"/>Alumno</td> + <td align="center" nowrap="nowrap" width="33%"><hr style="border: 1px dotted"/>Padre, Madre o Tutor</td> </tr> - - <tr> - <td><hr width="100px"/></td> - <td><hr width="100px"/></td> - <td><hr width="100px"/></td> - </tr> - - <tr> - <td align="center"><?php echo $establecimiento->getRector()?>, Rector</td> - <td align="center">Alumno</td> - <td align="center">Padre, Madre o Tutor</td> - </tr> </table> </div> Modified: prosistem/alba/trunk/alba/plugins/albaToolsPlugin/modules/albaTools/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/plugins/albaToolsPlugin/modules/albaTools/actions/actions.class.php 2009-10-05 19:19:34 UTC (rev 6283) +++ prosistem/alba/trunk/alba/plugins/albaToolsPlugin/modules/albaTools/actions/actions.class.php 2009-10-06 19:47:37 UTC (rev 6284) @@ -24,7 +24,7 @@ $back_color = ImageColorAllocate ($img_handle, 255, 255,255 ); $txt_color = ImageColorAllocate ($img_handle, 0, 0, 0); ImageFill($img_handle,0,0, $back_color); - ImageStringUp ($img_handle, $this->font, 0,$alto - (imagefontwidth($this->font)/2), $texto, $txt_color); + ImageStringUp ($img_handle, $this->font, 0,$alto - (imagefontwidth($this->font)/2),$texto, $txt_color); ImagePng ($img_handle); ImageDestroy($img_handle); return sfView::NONE; Modified: prosistem/alba/trunk/alba/web/css/boletin.css =================================================================== --- prosistem/alba/trunk/alba/web/css/boletin.css 2009-10-05 19:19:34 UTC (rev 6283) +++ prosistem/alba/trunk/alba/web/css/boletin.css 2009-10-06 19:47:37 UTC (rev 6284) @@ -1,26 +1,21 @@ #boletin { text-align:center; -border: 1px solid; +border: 1px solid; padding: 1px; } #boletin .header { -height: 152px; +height: 100px; text-align:center; -font-size: 12px; +font-size: 12px; font-weight: bold; -text-transform: uppercase; -background-image:url(../images/logo.png); -background-repeat: no-repeat; -background-position: right; +text-transform: uppercase; vertical-align: center; -align: center; } #boletin table.notas { -width: 766px; -height: 143px; -border-collapse: collapse; +width: 766px; +border-collapse: collapse; border-left: 2px solid; border-bottom: 1px solid; } Modified: prosistem/alba/trunk/alba/web/css/impresion.css =================================================================== --- prosistem/alba/trunk/alba/web/css/impresion.css 2009-10-05 19:19:34 UTC (rev 6283) +++ prosistem/alba/trunk/alba/web/css/impresion.css 2009-10-06 19:47:37 UTC (rev 6284) @@ -11,5 +11,27 @@ display : none; } +#boletin { +text-align:center; +padding: 5px; +} +#boletin .header { +text-align:center; +font-size: 12px; +font-weight: bold; +text-transform: uppercase; +vertical-align: center; +} +#boletin table.notas{ +width: 600px; +border-collapse: collapse; +border-left: 2px solid; +border-bottom: 1px solid; +} +#boletin table.notas td{ +border-right: 1px solid; +border-top: 1px solid; +border +} Modified: prosistem/alba/trunk/alba/web/images/logo.png =================================================================== (Binary files differ)

1 0

SVN Alba r6283 - prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates
by commits＠pressenter.com.ar 05 Oct '09

05 Oct '09

Author: ftoledo Date: 2009-10-05 16:19:34 -0300 (Mon, 05 Oct 2009) New Revision: 6283 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php Log: la tabla del boletin debe quedar centrada Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-01 21:47:19 UTC (rev 6282) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-05 19:19:34 UTC (rev 6283) @@ -16,7 +16,7 @@ <br/><br/><b>Alumno: <?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b> <b>Curso: <?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?> <?php echo $division->getDescripcion()?> </b> </div> - <table class="notas" cellpadding="2" cellspacing="2"> + <table class="notas" cellpadding="2" cellspacing="2" align="center"> <tbody> <tr> <td> </td>

1 0

SVN Alba r6282 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/templates web/css
by commits＠pressenter.com.ar 01 Oct '09

01 Oct '09

Author: hsanchez Date: 2009-10-01 18:47:19 -0300 (Thu, 01 Oct 2009) New Revision: 6282 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php prosistem/alba/trunk/alba/web/css/boletin.css Log: Arreglos de celdas sobrantes Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-01 21:03:24 UTC (rev 6281) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-01 21:47:19 UTC (rev 6282) @@ -5,7 +5,7 @@ </div> <?php else:?> <br/> -<div align="center" id="boletin"> +<div id="boletin"> <div class="header"> <?php echo $establecimiento->getNombre()?><br> <?php echo $establecimiento->getDireccion()?> @@ -16,7 +16,6 @@ <br/><br/><b>Alumno: <?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b> <b>Curso: <?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?> <?php echo $division->getDescripcion()?> </b> </div> - <br/><br/> <table class="notas" cellpadding="2" cellspacing="2"> <tbody> <tr> @@ -55,8 +54,6 @@ <td><div style="text-align: center;"><?php echo $valor?></div></td> <?php endforeach;?> <?php endif;?> - <td> </td> - <td> </td> </tr> <?php endforeach;?> </tbody> Modified: prosistem/alba/trunk/alba/web/css/boletin.css =================================================================== --- prosistem/alba/trunk/alba/web/css/boletin.css 2009-10-01 21:03:24 UTC (rev 6281) +++ prosistem/alba/trunk/alba/web/css/boletin.css 2009-10-01 21:47:19 UTC (rev 6282) @@ -14,10 +14,10 @@ background-repeat: no-repeat; background-position: right; vertical-align: center; +align: center; } #boletin table.notas { -text-align: center; width: 766px; height: 143px; border-collapse: collapse;

1 0

SVN Alba r6279 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/config apps/principal/modules/boletin/templates apps/principal/modules/informes/config web/css web/images
by commits＠pressenter.com.ar 01 Oct '09

01 Oct '09

Author: hsanchez Date: 2009-10-01 17:22:36 -0300 (Thu, 01 Oct 2009) New Revision: 6279 Added: prosistem/alba/trunk/alba/web/css/boletin.css prosistem/alba/trunk/alba/web/images/logo.png Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml Log: Pasando el boletin a css y agregando el logo Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml 2009-09-29 12:20:07 UTC (rev 6278) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml 2009-10-01 20:22:36 UTC (rev 6279) @@ -1,5 +1,5 @@ default: - stylesheets: [..%SF_ADMIN_WEB_DIR%/css/main] + stylesheets: [..%SF_ADMIN_WEB_DIR%/css/main,boletin] mostrarSuccess: - layout: layout_sinmenu \ No newline at end of file + layout: layout_sinmenu Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-09-29 12:20:07 UTC (rev 6278) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/_mostrar.php 2009-10-01 20:22:36 UTC (rev 6279) @@ -5,19 +5,19 @@ </div> <?php else:?> <br/> -<div align="center" style="border: 1px solid; padding: 1px;"> - <div align="center" style="font-size: 12px; font-weight: bold; text-transform: uppercase"> +<div align="center" id="boletin"> + <div class="header"> <?php echo $establecimiento->getNombre()?><br> <?php echo $establecimiento->getDireccion()?> <?php echo $establecimiento->getCiudad()?> <?php echo $establecimiento->getCodigoPostal()?> <?php echo $establecimiento->getTelefono()?> - </div> <br/>BOLETÍN Ciclo Lectivo <br/><br/><b>Alumno: <?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b> <b>Curso: <?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?> <?php echo $division->getDescripcion()?> </b> + </div> <br/><br/> - <table style="text-align: left; width: 766px; height: 143px; border-collapse: collapse; border: solid;" border="1" cellpadding="2" cellspacing="2"> + <table class="notas" cellpadding="2" cellspacing="2"> <tbody> <tr> <td> </td> @@ -55,7 +55,6 @@ <td><div style="text-align: center;"><?php echo $valor?></div></td> <?php endforeach;?> <?php endif;?> - <td> </td> <td> </td> </tr> Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml 2009-09-29 12:20:07 UTC (rev 6278) +++ prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.yml 2009-10-01 20:22:36 UTC (rev 6279) @@ -1,3 +1,3 @@ default: # layout: layout_sinmenu - stylesheets: [informes, %SF_ADMIN_WEB_DIR%/css/main, main ] + stylesheets: [informes, %SF_ADMIN_WEB_DIR%/css/main, main, boletin ] Added: prosistem/alba/trunk/alba/web/css/boletin.css =================================================================== --- prosistem/alba/trunk/alba/web/css/boletin.css (rev 0) +++ prosistem/alba/trunk/alba/web/css/boletin.css 2009-10-01 20:22:36 UTC (rev 6279) @@ -0,0 +1,32 @@ +#boletin { +text-align:center; +border: 1px solid; +padding: 1px; +} + +#boletin .header { +height: 152px; +text-align:center; +font-size: 12px; +font-weight: bold; +text-transform: uppercase; +background-image:url(../images/logo.png); +background-repeat: no-repeat; +background-position: right; +vertical-align: center; +} + +#boletin table.notas { +text-align: center; +width: 766px; +height: 143px; +border-collapse: collapse; +border-left: 2px solid; +border-bottom: 1px solid; +} + +#boletin table.notas td{ +border-right: 1px solid; +border-top: 1px solid; +border +} Added: prosistem/alba/trunk/alba/web/images/logo.png =================================================================== (Binary files differ) Property changes on: prosistem/alba/trunk/alba/web/images/logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0