[phpwebapp-commits] CVS: web_app/parser class.WebPage.php,1.5,1.6 class.Template.php,1.4,1.5

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv5996/parser

Modified Files:
	class.WebPage.php class.Template.php 
Log Message:
changed some styles


Index: class.WebPage.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.WebPage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.WebPage.php	15 Aug 2003 07:03:42 -0000	1.5
--- class.WebPage.php	20 Aug 2003 07:00:49 -0000	1.6
***************
*** 185,189 ****
      }
  
-   /****************** debug functions ***********************/
  
    function print_dbg_messages()
--- 185,188 ----
***************
*** 204,220 ****
      }
  
    /** outputs the data of each template in $this->tpl_collection */
    function template_list()
      {
!       $html = "<hr>\n";
!       $html .= "<a name='top'>&nbsp;</a>\n";
        $html .= "<strong>List of Templates of the Page:</strong>\n";
        $html .= "<ul>\n";
        reset($this->tpl_collection);
!       while ( list($tplID, $tpl) = each($this->tpl_collection) )
          {
!           $html .= "\t<li> <a href='#$tpl->id'> $tpl->id </a>\n";
          }
        $html .= "</ul>\n";
  
        //print each template
--- 203,225 ----
      }
  
+   /*------------------ debug functions --------------------------*/
+ 
    /** outputs the data of each template in $this->tpl_collection */
    function template_list()
      {
!       $html = "<a name='top'>&nbsp;</a>\n";
!       $html .= "<div class='webapp'>\n";
        $html .= "<strong>List of Templates of the Page:</strong>\n";
        $html .= "<ul>\n";
        reset($this->tpl_collection);
!       while ( list($tpl_id, $tpl) = each($this->tpl_collection) )
          {
!           //don't output the appended templates
!           if (ereg("web_app/append/append.html\$", $tpl->id))  break;
! 
!           $html .= "\t<li><a href='#$tpl->id'>$tpl->id</a></li>\n";
          }
        $html .= "</ul>\n";
+       $html .= "</div>\n";
  
        //print each template
***************
*** 222,225 ****
--- 227,233 ----
        while ( list($tplID, $tpl) = each($this->tpl_collection) )
          {
+           //don't output the appended templates
+           if (ereg("web_app/append/append.html\$", $tpl->id))  break;
+ 
            $html .= $tpl->toHtmlTable();
          }
***************
*** 234,242 ****
        $tree = "<hr>\n";
        $tree .= "<a name='top'>&nbsp;</a>\n";
!       $tree .= "<strong>The tree structure of the templates: </strong>\n";
!       $tree .= "<pre>\n";
        $tree .= $this->rootTpl->to_tree("");
        $tree .= "</pre>\n";
-       $tree .= "<hr>\n";
        return $tree;
      }
--- 242,249 ----
        $tree = "<hr>\n";
        $tree .= "<a name='top'>&nbsp;</a>\n";
!       $tree .= "<pre class='webapp'>\n";
!       $tree .= "<strong>The tree structure of the templates:</strong>\n\n";
        $tree .= $this->rootTpl->to_tree("");
        $tree .= "</pre>\n";
        return $tree;
      }

Index: class.Template.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Template.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.Template.php	11 Aug 2003 16:17:51 -0000	1.4
--- class.Template.php	20 Aug 2003 07:00:49 -0000	1.5
***************
*** 47,51 ****
        $htmlTable = "
  <br>
! <a name='$this->id'>&nbsp;</a>[<a href='javascript: back()'>Top</a>]
  <table width='90%' bgcolor='#aaaaaa' border='0' cellspacing='1' cellpadding='2'>
    <tr>
--- 47,51 ----
        $htmlTable = "
  <br>
! <a name='$this->id'>&nbsp;</a>[<a href='javascript: back()'>Back</a>]
  <table width='90%' bgcolor='#aaaaaa' border='0' cellspacing='1' cellpadding='2'>
    <tr>
***************
*** 85,89 ****
    function content2html()
      {
!       $html = "\n<pre>";
        $i = 0;
        while ($i < sizeof($this->content))
--- 85,89 ----
    function content2html()
      {
!       $html = "\n<pre class='webapp'>";
        $i = 0;
        while ($i < sizeof($this->content))
***************
*** 109,112 ****
--- 109,115 ----
    function to_tree($indent)
      {
+       //don't output the appended boxes
+       if (ereg("web_app/append/append.html\$", $this->id))  return;
+ 
        global $webPage;