estandarizo nombre de estilos. listo servicios

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index 9d09a4de8451db7944e94b9bfb601ffb0e284788..78b3c8c44045422008eba949667f07b85df3ac76 100644 (file)
--- a/sistema/local_lib/HTML_Copete.php
+++ b/sistema/local_lib/HTML_Copete.php
@@ -79,31 +79,31 @@ parent::HTML_Table(array('width'  => '760',
     switch($seccion)
     {
       case 'noticias': $fila[] = 'Enlaces útiles:
     switch($seccion)
     {
       case 'noticias': $fila[] = 'Enlaces útiles:

-         <a href="http://www.mecon.gov.ar/" target="_blank" class="TextBlue">
+         <a href="http://www.mecon.gov.ar/" target="_blank" class="copete_TextBlue">

           Ministerio de Econom&iacute;a y Producci&oacute;n
         </a>
         -
           Ministerio de Econom&iacute;a y Producci&oacute;n
         </a>
         -

-         <a href="http://boletinoficial.mecon.ar/" target="_blank" class="TextBlue">
+         <a href="http://boletinoficial.mecon.ar/" target="_blank" class="copete_TextBlue">

           Bolet&iacute;n Oficial
         </a>
         -
           Bolet&iacute;n Oficial
         </a>
         -

-        <a href="http://infoleg.mecon.gov.ar/" target="_blank" class="TextBlue">
+        <a href="http://infoleg.mecon.gov.ar/" target="_blank" class="copete_TextBlue">

           INFOLEG
         </a> 
         -
           INFOLEG
         </a> 
         -

-        <a href="http://cdi.mecon.gov.ar/" target="_blank" class="TextBlue">
+        <a href="http://cdi.mecon.gov.ar/" target="_blank" class="copete_TextBlue">

            CDI
         </a>';
              break;
            CDI
         </a>';
              break;

-     case 'servicios': $fila[] = '<span class="titulo_uno">Servicios</span>';
+     case 'servicios': $fila[] = '<span class="copete_titulo_uno">Servicios</span>';

              break;
              break;

-     case 'sistemas': $fila[] = '<span class="titulo_uno">Sistemas</span>';
+     case 'sistemas': $fila[] = '<span class="copete_titulo_uno">Sistemas</span>';

              break;
     }
     $fila[] = '<img src="images/copete_fin.gif" height="30" border="0">';
              break;
     }
     $fila[] = '<img src="images/copete_fin.gif" height="30" border="0">';

-    $this->addRow($fila, array('class' => 'titulo_vinculos'));        
+    $this->addRow($fila, array('class' => 'copete_titulo_vinculos'));        

     }
     // -X2C
 
 } // -X2C Class :HTML_Copete
     }
     // -X2C
 
 } // -X2C Class :HTML_Copete

-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index 901a5accc655d6a1f0ac1658effe9b76fd7a7979..87ce96fa932a047f04cb4155df54bce680ec2a68 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -67,42 +67,42 @@ class HTML_Noticia extends HTML_Table {
     {
         if($this->completa)
        {
     {
         if($this->completa)
        {

-            $this->addRow(array($this->noticia->getSeccion()), array('class' => 'titulo_uno'));
+            $this->addRow(array($this->noticia->getSeccion()), array('class' => 'noticias_titulo_uno'));

             $this->addRow(array(new HTML_Image('images/noticia_linea_azul.gif')),
                          array('class' => 'ver_mas'));
             $this->addRow(array(new HTML_Image('images/noticia_linea_azul.gif')),
                          array('class' => 'ver_mas'));

-            $this->addRow(array($this->noticia->getTitulo()), array('class' => 'textoazul'));
-            $this->addRow(array($this->noticia->getTitulo2()), array('class' => 'titulo_vinculos'));
-            $this->addRow(array($this->noticia->getTexto()), array('class' => 'titulo_noticia'));
+            $this->addRow(array($this->noticia->getTitulo()), array('class' => 'noticias_textoazul'));
+            $this->addRow(array($this->noticia->getTitulo2()), array('class' => 'noticias_titulo_vinculos'));
+            $this->addRow(array($this->noticia->getTexto()), array('class' => 'noticias_titulo_noticia'));

             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('Fecha de publicación: %d/%m/%Y')),
             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('Fecha de publicación: %d/%m/%Y')),

-                         array('class' => 'ver_mas'));
+                         array('class' => 'noticias_ver_mas'));

             $this->addRow(array(new HTML_Image('images/blanco.gif','', 
                          array('height'=>'15', 'width'=>'1', 'border'=>'0'))),
             $this->addRow(array(new HTML_Image('images/blanco.gif','', 
                          array('height'=>'15', 'width'=>'1', 'border'=>'0'))),

-                         array('class' => 'ver_mas'));
+                         array('class' => 'noticias_ver_mas'));

             $tmp = new HTML_Image('images/noticia_anterior.gif');
             $tmp = new HTML_Image('images/noticia_anterior.gif');

-            $this->addRow(array("<a href='$this->volver' class='ver_mas'>".$tmp->toHTML().
+            $this->addRow(array("<a href='$this->volver' class='noticias_ver_mas'>".$tmp->toHTML().

                                                               'volver</a>'),
                                                               'volver</a>'),

-                         array('class' => 'ver_mas'));
+                         array('class' => 'noticias_ver_mas'));

        }
        else
        {
             $this->addRow(array($this->noticia->getSeccion()),
        }
        else
        {
             $this->addRow(array($this->noticia->getSeccion()),

-                       array('class' => 'subtitulo'));
+                       array('class' => 'noticias_subtitulo'));

            $img_str = null;
            if($this->nuevo)
            {
                $nuevo = new HTML_Image('images/noticia_nuevo.gif');
                $img_str = ' '.$nuevo->toHTML();
            }
            $img_str = null;
            if($this->nuevo)
            {
                $nuevo = new HTML_Image('images/noticia_nuevo.gif');
                $img_str = ' '.$nuevo->toHTML();
            }

-            $this->addRow(array("<a href='$this->link' class='titulo_noticia'>".$this->noticia->getTitulo().$img_str.'<a>'), array('class' => 'titulo_noticia'));
+            $this->addRow(array("<a href='$this->link' class='noticias_titulo_noticia'>".$this->noticia->getTitulo().$img_str.'<a>'), array('class' => 'noticias_titulo_noticia'));

             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),

-                         array('class' => 'fecha_noticia'));
+                         array('class' => 'noticias_fecha_noticia'));

            $mas = new HTML_Image('images/noticia_mas.gif');
            $mas = new HTML_Image('images/noticia_mas.gif');

-            $this->addRow(array("<a href='$this->vermas' class='ver_mas'>".$mas->toHTML().' ver más</a>'),
-                         array('class' => 'ver_mas'));
+            $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),
+                         array('class' => 'noticias_ver_mas'));

             $this->addRow(array(new HTML_Image('images/noticia_linea_puntos.gif')),
             $this->addRow(array(new HTML_Image('images/noticia_linea_puntos.gif')),

-                         array('class' => 'ver_mas'));
+                         array('class' => 'noticias_ver_mas'));

        }
         return parent::toHTML();    
     }
        }
         return parent::toHTML();    
     }

diff --git a/sistema/local_lib/HTML_Servicio.php b/sistema/local_lib/HTML_Servicio.php
index ea8977faee19cd98c5418bf0a20c463f9d8c0ea5..ee65e0f98508425063b5a257f10e47447054135c 100644 (file)
--- a/sistema/local_lib/HTML_Servicio.php
+++ b/sistema/local_lib/HTML_Servicio.php
@@ -29,6 +29,10 @@
 
 
 require_once 'HTML/Image.php';
 
 
 require_once 'HTML/Image.php';

+require_once 'HTML/Link.php';
+require_once 'DB.php';
+require_once 'AI/Servicio.php';
+//  require_once 'AI/DB.php';

 
 // +X2C includes
 require_once 'HTML/Table.php';
 
 // +X2C includes
 require_once 'HTML/Table.php';


@@ -54,7 +58,12 @@ class HTML_Servicio extends HTML_Table {
                                  'border'      => '0',
                                  'cellspacing' => '0',
                                  'cellpadding' => '0',
                                  'border'      => '0',
                                  'cellspacing' => '0',
                                  'cellpadding' => '0',

-                                 'bgcolor'     => '#FFFFFF'));
+                                 'bgcolor'     => '#FFFFFF',
+                                'class'       => 'servicio_tabla'));
+        $bd = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
+        $this->servicio = new AI_Servicio($seccion);
+        $this->servicio->cargar($bd);
+        $this->servicio->cargarHijos($bd);

     }
     // -X2C
 
     }
     // -X2C
 


@@ -65,32 +74,68 @@ class HTML_Servicio extends HTML_Table {
      */
     function toHTML() // ~X2C
     {
      */
     function toHTML() // ~X2C
     {

-        $this->addRow(array("Nombre(sin estilo)"),
+        echo '<link rel="stylesheet" href="css/servicio.css">';
+       if($this->servicio->link == '')
+           $this->servicio->link = 'servicios.php?servicios='.$this->servicio->servicio;
+       $l = new HTML_Link($this->servicio->link, $this->servicio->nombre, array(),
+                            array('class' => 'servicio_titulo_tabla'));
+        $this->addRow(array('&nbsp;&nbsp;&nbsp;'.$l->toHTML()),

                          array('align' => 'center',
                                'class' => 'arboltitulo',
                                'background'=>'images/servicio_cabecera.gif',
                          array('align' => 'center',
                                'class' => 'arboltitulo',
                                'background'=>'images/servicio_cabecera.gif',

-                               'height'=>30));
-  $img = new HTML_Image('images/servicio_bullet.gif');
-  $int =& new HTML_Table(array('width'       =>'360',
-                               'border'      => '0',
-                               'cellspacing' => '0',
-                               'cellpadding' => '0',
-                               'bgcolor'     => '#FFFFFF'));
-  $int->addRow(array($img, 'Nombre(sin estilo)',$img,'nombre'),
-                          array('valign' => 'top'));
-  $int->updateColAttributes(0, array('width' => '10%',
-                    'background' => 'images/servicio_borde_sup_izq.gif'));
-  $int->updateColAttributes(1, array('width' => '40%',
-                    'background' => 'images/servicio_borde_sup_cen.gif'));
-  $int->updateColAttributes(2, array('width' => '10%',
-                    'background' => 'images/servicio_borde_sup_cen.gif'));
-  $int->updateColAttributes(3, array('width' => '40%',
-                    'background' => 'images/servicio_borde_sup_der.gif'));
-  $this->addRow(array($int));
-  $this->addRow(array($int));
-  $this->addRow(array($int));
-  $this->addRow(array(new HTML_Image('images/servicio_borde_inf.gif')));
-      return parent::toHTML();
+                               'height'=>30,
+                               'class' => 'servicio_titulo_tabla'));
+        $img = new HTML_Image('images/servicio_bullet.gif');
+        $int =& new HTML_Table(array('width'       =>'360',
+                                     'border'      => '0',
+                                     'cellspacing' => '0',
+                                     'cellpadding' => '0',
+                                     'bgcolor'     => '#FFFFFF'));
+        $int->addRow(array($img, '',$img,''),
+                               array());
+        $int->updateColAttributes(0, array('width' => '10%',
+                          'background' => 'images/servicio_borde_sup_izq.gif',
+                         'valign'     => 'top'));
+        $int->updateColAttributes(1, array('width' => '40%',
+                          'background' => 'images/servicio_borde_sup_cen.gif'));
+        $int->updateColAttributes(2, array('width' => '10%',
+                          'background' => 'images/servicio_borde_sup_cen.gif',
+                         'valign'     => 'top'));
+        $int->updateColAttributes(3, array('width' => '40%',
+                          'background' => 'images/servicio_borde_sup_der.gif'));
+       $par = false;
+        foreach($this->servicio->getHijos() as $s)
+       {
+           if($s->link == '')
+               $s->link = 'servicios.php?servicios='.$s->servicio;
+            if($par)
+           {
+                $int->setCellContents(0, 3, new HTML_Link($s->link, $s->nombre,
+                                      array(), 
+                                       array('class' => 'servicio_tabla')));
+                $this->addRow(array($int));
+               $par = false;
+           }
+           else
+           {
+                $int->setCellContents(0, 1, new HTML_Link($s->link, $s->nombre,
+                                      array(), 
+                                       array('class' => 'servicio_tabla')));
+               $par = true;
+          }
+        }
+        if($par)
+        {
+            $int->setCellContents(0, 1, new HTML_Link($s->link, $s->nombre, 
+                                         array(), 
+                                          array('class' => 'servicio_tabla')));
+            $int->setCellContents(0, 2, '');
+            $int->setCellContents(0, 3, '');
+            $this->addRow(array($int));
+        }
+
+        $this->addRow(array(new HTML_Image('images/servicio_borde_inf.gif')));
+        return parent::toHTML();

     }
     // -X2C
 
     }
     // -X2C
 

diff --git a/sistema/www/css/copete.css b/sistema/www/css/copete.css
index 92ea30722d96904f5e98a8573429f6fdffa4424a..f528a2df7418bd091fc8f5fdf616b2f609d3ac1a 100644 (file)
--- a/sistema/www/css/copete.css
+++ b/sistema/www/css/copete.css
@@ -1,3 +1,3 @@
-.TextBlue { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\r
-.titulo_vinculos { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-WEIGHT: bold ; font-style: normal; line-height: normal; background-position: left centre; text-align: left }\r
-.titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r
+.copete_TextBlue { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\r
+.copete_titulo_vinculos { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-WEIGHT: bold ; font-style: normal; line-height: normal; background-position: left centre; text-align: left }\r
+.copete_titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r

diff --git a/sistema/www/css/noticias.css b/sistema/www/css/noticias.css
index c81c796c76f3a05cf143f6febfbf70535ac18b76..a6eb52a6aaefc29bc57b36ef612e3e644c1b10e2 100644 (file)
--- a/sistema/www/css/noticias.css
+++ b/sistema/www/css/noticias.css
@@ -1,7 +1,7 @@
-.titulo_vinculos { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-WEIGHT: bold ; font-style: normal; line-height: normal; background-position: left centre; text-align: left }\r
-.titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r
-.subtitulo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold}\r
-.titulo_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: top; font-weight: normal}\r
-.fecha_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: left bottom; text-align: left; vertical-align: bottom; font-weight: normal}\r
-.ver_mas { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: right bottom; text-align: right; vertical-align: middle ; font-weight: normal }\r
-.textoazul { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\r
+.noticias_titulo_vinculos { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; FONT-WEIGHT: bold ; font-style: normal; line-height: normal; background-position: left centre; text-align: left }\r
+.noticias_titulo_uno { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 12pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold }\r
+.noticias_subtitulo { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: middle ; font-weight: bold}\r
+.noticias_titulo_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; background-position: left centre; text-align: left; vertical-align: top; font-weight: normal}\r
+.noticias_fecha_noticia { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: left bottom; text-align: left; vertical-align: bottom; font-weight: normal}\r
+.noticias_ver_mas { COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 8pt; font-style: normal; line-height: normal; background-position: right bottom; text-align: right; vertical-align: middle ; font-weight: normal }\r
+.noticias_textoazul { COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 10pt; font-style: normal; line-height: normal; font-weight: normal }\r

diff --git a/sistema/www/css/servicio.css b/sistema/www/css/servicio.css
new file mode 100644 (file)
index 0000000..682efcd
--- /dev/null
+++ b/sistema/www/css/servicio.css
@@ -0,0 +1,6 @@
+.servicio_tabla {\r
+       BACKGROUND-POSITION: left top; COLOR: #000000; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 9pt; FONT-STYLE: normal; FONT-WEIGHT: normal; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle\r
+}\r
+.servicio_titulo_tabla {\r
+       BACKGROUND-POSITION-X: left; COLOR: #003366; FONT-FAMILY: Arial, Helvetica, sans-serif; FONT-SIZE: 11pt; FONT-STYLE: normal; FONT-WEIGHT: bold; LINE-HEIGHT: normal; TEXT-ALIGN: left; VERTICAL-ALIGN: middle;\r
+}\r

diff --git a/sistema/www/servicios.php b/sistema/www/servicios.php
index 9831cf086aef72d7a3f05e45da6a45394864790c..33ec2526c4e38b7c1640c7aaaeff5c05a8fb47ed 100644 (file)
--- a/sistema/www/servicios.php
+++ b/sistema/www/servicios.php
@@ -1,11 +1,41 @@
 <?
   require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/HTML_Servicio.php';
 <?
   require_once '../local_lib/HTML_DietMarco.php';
   require_once '../local_lib/HTML_Servicio.php';

+  require_once 'AI/Servicio.php';
+//  require_once 'AI/DB.php';
+  require_once 'DB.php';

   $m = new HTML_DietMarco('servicios');
   $m->addTitle('Servicios');
   $m = new HTML_DietMarco('servicios');
   $m->addTitle('Servicios');

+ 
+  $n_serv = 0;
+  if(isset($_GET['servicios']))
+      $n_serv = $_GET['servicios'];
+  $serv = new AI_Servicio($n_serv);
+  //$bd = AI_DB::Connect();
+  $bd = DB::Connect('mysql://intranet:intranet@bal747f/intranet');
+  $serv->cargar($bd);
+  $serv->cargarHijos($bd);
+  $col_par = '';
+  $col_impar = '';
+  $impar = true;
+  foreach($serv->getHijos() as $s)
+  {
+      $sh =& new HTML_Servicio($s->servicio);
+      if($impar)
+      {
+        $col_impar .= $sh->toHTML().'<br>';
+       $impar = false;
+      }
+      else
+      {
+        $col_par .= $sh->toHTML().'<br>';
+       $impar = true;
+      }
+  }
+  $tabla =& new HTML_Table(array('width' => 760,
+                                 'cellspacing' => 10));
+  $tabla->addRow(array($col_impar, $col_par), array('valign'=>'top'));
+  $m->addBodyContent($tabla);

 
 

-  $seccion =& new HTML_Servicio(1);
-
-  $m->addBodyContent($seccion);

   $m->display();
 ?>
   $m->display();
 ?>