(no commit message)

diff --git a/HTML/doc/Doxyfile b/HTML/doc/Doxyfile
new file mode 100644 (file)
index 0000000..106540f
--- /dev/null
+++ b/HTML/doc/Doxyfile
@@ -0,0 +1,201 @@
+# Doxyfile 1.3-rc3
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = "HTML"
+PROJECT_NUMBER         = $Rev$
+OUTPUT_DIRECTORY       = /home/mmarrese/public_html/uml/aspidoc/HTML
+OUTPUT_LANGUAGE        = Spanish
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+SHORT_NAMES            = NO
+HIDE_SCOPE_NAMES       = NO
+VERBATIM_HEADERS       = YES
+SHOW_INCLUDE_FILES     = YES
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = YES
+INHERIT_DOCS           = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 4
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ALIASES                = 
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = doxygen.warnings
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = /home/mmarrese/public_html/HTML/php
+FILE_PATTERNS          = *.php
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 200
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = YES
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = YES
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = YES
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
+CGI_NAME               = search.cgi
+CGI_URL                = 
+DOC_URL                = 
+DOC_ABSPATH            = 
+BIN_ABSPATH            = /usr/local/bin/
+EXT_DOC_PATHS          = 

diff --git a/HTML/php/Tabla.php b/HTML/php/Tabla.php
index ce736c52f4eabd7d17ecfcf92314218c29f24f93..5be0bd8d8aa336ebbf98b3e17ff9f154908971ba 100644 (file)
--- a/HTML/php/Tabla.php
+++ b/HTML/php/Tabla.php
@@ -204,7 +204,7 @@ class Tabla extends HTML_Table {
     * Alinea una columna entera  
     *
     * @param int $columna
     * Alinea una columna entera  
     *
     * @param int $columna

-    * @param strin $valor
+    * @param string $valor

     * 
     * @access public
     */
     * 
     * @access public
     */


@@ -217,7 +217,7 @@ class Tabla extends HTML_Table {
     * Cambia el tamanio de una columna entera  
     *
     * @param int $columna
     * Cambia el tamanio de una columna entera  
     *
     * @param int $columna

-    * @param strin $valor
+    * @param string $valor

     * 
     * @access public
     */
     * 
     * @access public
     */


@@ -231,7 +231,7 @@ class Tabla extends HTML_Table {
     *
     * @param int $fila
     * @param int $columna
     *
     * @param int $fila
     * @param int $columna

-    * @param strin $valor
+    * @param string $valor

     * 
     * @access public
     */
     * 
     * @access public
     */

diff --git a/HTML/php/Tabla/conf_Tabla.php b/HTML/php/Tabla/conf_Tabla.php
index 165b3be0fe5d74173c231a2a311a6a30664093e1..3c7cbbb2de1c2fd7b6a118edd29489a11c1c4cd0 100644 (file)
--- a/HTML/php/Tabla/conf_Tabla.php
+++ b/HTML/php/Tabla/conf_Tabla.php
@@ -23,7 +23,9 @@ return array (
                                         'tabla_comun'   =>  'width="100%" align="center" cellpadding="0" cellspacing="2" border="0" bgcolor="#336699"',
                                         'tabla_contenedora'=> 'width="100%" align="center" cellpadding="0" cellspacing="0" border="0" bgcolor="#336699"',
                                         'celda_cabecera'=>  'align="center" bgcolor="#336699" class="texto11_blanco"',
                                         'tabla_comun'   =>  'width="100%" align="center" cellpadding="0" cellspacing="2" border="0" bgcolor="#336699"',
                                         'tabla_contenedora'=> 'width="100%" align="center" cellpadding="0" cellspacing="0" border="0" bgcolor="#336699"',
                                         'celda_cabecera'=>  'align="center" bgcolor="#336699" class="texto11_blanco"',

+                                        

                                         'celda_comun'   =>  'align="center" bgcolor="#FFFFFF" class="texto11_negro"',
                                         'celda_comun'   =>  'align="center" bgcolor="#FFFFFF" class="texto11_negro"',

+                                        'celda_titulo'  =>  'align="center" bgcolor="#DDEEFF" class="texto11_negro"',

                                 ),
 );
 
                                 ),
 );
 

diff --git a/HTML/test/.htaccess b/HTML/test/.htaccess
new file mode 100644 (file)
index 0000000..e37de1d
--- /dev/null
+++ b/HTML/test/.htaccess
@@ -0,0 +1,4 @@
+php_value include_path   ".:/var/www/intranet:/var/www/intranet/www:/var/www/intranet/www/include/lib/:/usr/share/pear"
+#php_value auto_prepend_file "/var/www/intranet/www/sistemas/prueba/www/include/prepend.php"
+#php_value auto_append_file  "/var/www/intranet/www/sistemas/prueba/www/include/append.php"
+#php_value allow_call_time_pass_reference On                     ~                                             

diff --git a/HTML/test/prueba_tabla.php b/HTML/test/prueba_tabla.php
index 47f06c363ce71c4703756c4055de207f90e86381..2c3bc5fb82dd22faf05d23c4957d2bc503de7d8b 100644 (file)
--- a/HTML/test/prueba_tabla.php
+++ b/HTML/test/prueba_tabla.php
@@ -12,7 +12,7 @@
 
 <?php
 
 
 <?php
 

-    require_once './../php/Tabla.php';
+    require_once 'HTML/Tabla.php';

 
     $TABLA = new Tabla ('width="500" align="right"');
 
 
     $TABLA = new Tabla ('width="500" align="right"');
 


@@ -38,7 +38,8 @@
     $TABLA->colSpan(2, 6,2);
     $TABLA->colSpan(2, 8,2);
 
     $TABLA->colSpan(2, 6,2);
     $TABLA->colSpan(2, 8,2);
 

-    $TABLA->setCeldaTitulo($0);    
+    $TABLA->setColTitulo(2);    
+    

     $tohtml = $TABLA->toHtml();
     
     print $tohtml;
     $tohtml = $TABLA->toHtml();
     
     print $tohtml;

diff --git a/HTML/test/prueba_tabla2.php b/HTML/test/prueba_tabla2.php
new file mode 100644 (file)
index 0000000..69d5cbb
--- /dev/null
+++ b/HTML/test/prueba_tabla2.php
@@ -0,0 +1,18 @@
+<?php
+    require_once 'include/lib/HTML/Tabla.php';
+    require_once 'include/lib/HTML/Page.php';
+
+    $PAGE = HTML_Page(array ('doctype'=>'HTML 4.01 Transitional',
+                             'charset'  => 'iso-8859-1',
+                             'lineend'  => 'unix',
+                             'language' => 'es',
+                             'cache'    => 'false',
+                             'simple'   => 'true'));
+
+    $abm_form = new Tabla();
+    $row = array ('sarasa','sarasa2');
+    $abm_form->agregarFilaCabecera($row);
+    
+    $PAGE->addBody($abm_form);
+    $PAGE->display();
+?>